RPM Packaging: update tdetoys

14 files changed, 2 insertions, 4103 deletions

diff --git a/redhat/main/tdetoys/tdetoys-14.0.0.spec b/redhat/main/tdetoys/tdetoys-14.0.0.spec
index 5f3fa0fc9..8589080cd 100644
--- a/redhat/main/tdetoys/tdetoys-14.0.0.spec
+++ b/redhat/main/tdetoys/tdetoys-14.0.0.spec
@@ -58,6 +58,8 @@ License:	GPLv2+
 Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+
 # Trinity dependencies
 BuildRequires: trinity-tdelibs-devel >= %{tde_version}
 
diff --git a/redhat/main/tdeutils/kdeutils-3.5.12.spec b/redhat/main/tdeutils/kdeutils-3.5.12.spec
deleted file mode 100644
index 5cf187ce2..000000000
--- a/redhat/main/tdeutils/kdeutils-3.5.12.spec
+++ /dev/null
@@ -1,361 +0,0 @@
-# Default version for this component
-%if "%{?version}" == ""
-%define version 3.5.12
-%endif
-%define release 7
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
-%define _variant .opt
-%define _docdir %{_prefix}/share/doc
-%endif
-
-# TDE 3.5.12 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/kde3
-
-
-Name:		trinity-kdeutils
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
-License:	GPL
-Summary:	TDE Utilities
-Group:		Applications/System
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	kdeutils-%{version}.tar.gz
-Source1: klaptop_acpi_helper.pam
-Source2: klaptop_acpi_helper.console
-Source3: kcmlaptoprc
-
-BuildRequires:	tqtinterface
-BuildRequires:	trinity-arts
-BuildRequires:	trinity-kdelibs
-
-# RedHat / Fedora legacy patches
-Patch1: kdf-3.0.2-label.patch
-
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-
-Requires:	tqtinterface
-Requires:	trinity-kdelibs
-
-BuildRequires: gettext
-BuildRequires: net-snmp-devel
-BuildRequires: python-devel
-BuildRequires: gmp-devel
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
-BuildRequires: libXScrnSaver-devel libXtst-devel
-%endif
-BuildRequires: xmms-devel
-
-%define superkaramba_ver 0.39
-Obsoletes: superkaramba < 0:%{superkaramba_ver}
-Provides:  superkaramba = 0:%{superkaramba_ver}
-
-%description
-Utilities for the Trinity Desktop Environment, including:
-  * ark (tar/gzip archive manager)
-  * kcalc (scientific calculator)
-  * kcharselect (character selector)
-  * kdepasswd (change password)
-  * kdessh (ssh front end)
-  * kdf (view disk usage)
-  * kedit (simple text editor)
-  * kfloppy (floppy formatting tool)
-  * kgpg (gpg gui)
-  * khexedit (hex editor)
-  * kjots (note taker)
-  * kregexpeditor (regular expression editor)
-  * ktimer (task scheduler)
-  * kwikdisk (removable media utility)
-
-
-# afaik, nobody BR's it, and it pulls kdeutils into multilib -- Rex
-%package devel
-Summary: Development files for %{name} 
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-extras = %{version}-%{release}
-Requires: trinity-kdelibs-devel
-%description devel
-Development files for %{name}.
-
-%package extras
-Summary: Extras packages from %{name} 
-Group: Applications/Internet
-Requires: %{name} = %{version}-%{release}
-%if 0%{?fedora} > 5 || 0%{?rhel} > 4
-Requires: pm-utils
-%endif
-Requires: usermode
-%description extras
-More Utilities for the K Desktop Environment:
- * kmilo
- * ksim (system information monitor);
- * klaptopdaemon (battery monitoring and management for laptops);
-
-
-%prep
-%setup -q -n kdeutils
-
-%patch1 -p1 -b .label
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-%__make -f admin/Makefile.common
-
-%build
-unset QTDIR || : ; source /etc/profile.d/qt.sh
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
-
-%configure \
-   --enable-new-ldflags \
-   --disable-dependency-tracking \
-   --disable-rpath \
-   --disable-debug --disable-warnings \
-   --enable-final \
-   --includedir=%{tde_includedir} \
-   --with-snmp \
-   --with-xscreensaver \
-   --with-extra-includes=%{_includedir}/tqt \
-   --enable-closure
-
-%__make %{?_smp_mflags}
-
-%install
-export PATH="%{_bindir}:${PATH}"
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot}
-
-# Show only in KDE (really? -- Rex)
-for i in kcalc kregexpeditor Kjots ktimer kdf kcmdf ksim KFloppy KEdit \
-  KCharSelect ark kwalletmanager kwalletconfig \
- irkick kcmlirc laptop pcmcia kvaio thinkpad kwikdisk; do
- if [ -f %{buildroot}%{_datadir}/applications/kde/$i.desktop ] ; then
-   echo "OnlyShowIn=KDE;" >> %{buildroot}%{_datadir}/applications/kde/$i.desktop
- fi
-done
-
-## File lists
-# locale's
-%find_lang %{name} || touch %{name}.lang
-# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-for lang_dir in %{buildroot}$HTML_DIR/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
-      done
-    popd
-    pushd $lang_dir/kcontrol
-      for i in *; do
-        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../../common $i/common
-      done
-    popd
-  fi
-done
-fi
-
-# using pam
-install -p -D -m 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/pam.d/klaptop_acpi_helper
-install -p -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/security/console.apps/klaptop_acpi_helper
-
-pushd %{buildroot}%{_bindir}
-  mkdir -p %{buildroot}%{_sbindir}
-  mv klaptop_acpi_helper ../sbin
-  ln -s consolehelper klaptop_acpi_helper
-popd
-
-# klaptop setting
-install -p -D -m 644 %{SOURCE3} %{buildroot}%{_datadir}/config/kcmlaptoprc
-
-
-%clean
-%__rm -rf %{?buildroot}
-
-
-%post
-/sbin/ldconfig
-for f in crystalsvg hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-
-%postun
-/sbin/ldconfig
-for f in crystalsvg hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null  ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-
-%post extras
-/sbin/ldconfig
-for f in crystalsvg hicolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
-done
-
-%postun extras
-/sbin/ldconfig
-for f in crystalsvg hicolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
-done
-
-
-%files extras
-%defattr(-,root,root,-)
-# kmilo
-%{tde_libdir}/kded_kmilod.*
-%{tde_libdir}/kmilo*
-%{_libdir}/libkmilo.la
-%{_libdir}/libkmilo.so.*
-%{_datadir}/services/kded/kmilod.desktop
-%{_datadir}/services/kmilo
-%{_datadir}/servicetypes/kmilo
-
-# ksim
-%{tde_docdir}/HTML/*/ksim/
-%{tde_libdir}/ksim*
-%{_libdir}/libksimcore.la
-%{_libdir}/libksimcore.so.*
-%{_datadir}/apps/kicker/extensions/ksim.desktop
-%{_datadir}/apps/ksim/
-%config %{_datadir}/config/ksim_panelextensionrc
-%{_datadir}/icons/crystalsvg/??x??/apps/ksim.png
-%{_datadir}/icons/crystalsvg/16x16/devices/ksim_cpu.png
-
-# klaptop
-%{tde_docdir}/HTML/en/kcontrol
-%{_sysconfdir}/pam.d/klaptop_acpi_helper
-%attr(644,root,root) %{_sysconfdir}/security/console.apps/klaptop_acpi_helper
-%{_bindir}/klaptop*
-%{tde_libdir}/kded_klaptopdaemon.*
-%{_sbindir}/klaptop_acpi_helper
-%{_datadir}/apps/klaptopdaemon
-%{_datadir}/services/kded/klaptopdaemon.desktop
-%{tde_libdir}/kcm_laptop.*
-%{_libdir}/libkcmlaptop.*
-%{_datadir}/applications/kde/laptop.desktop
-%config %{_datadir}/config/kcmlaptoprc
-%{_datadir}/icons/crystalsvg/128x128/apps/laptop_battery.png
-%{_datadir}/icons/crystalsvg/??x??/apps/laptop_battery.png
-%{_datadir}/icons/crystalsvg/scalable/apps/laptop_battery.svgz
-
-
-%files -f %{name}.lang
-%defattr(-,root,root,-)
-
-# kmilo
-%exclude %{tde_libdir}/kded_kmilod.*
-%exclude %{tde_libdir}/kmilo*
-%exclude %{_libdir}/libkmilo.la
-%exclude %{_libdir}/libkmilo.so.*
-%exclude %{_datadir}/services/kded/kmilod.desktop
-%exclude %{_datadir}/services/kmilo
-%exclude %{_datadir}/servicetypes/kmilo
-
-# ksim
-%exclude %{tde_docdir}/HTML/*/ksim/
-%exclude %{tde_libdir}/ksim*
-%exclude %{_libdir}/libksimcore.la
-%exclude %{_libdir}/libksimcore.so.*
-%exclude %{_datadir}/apps/kicker/extensions/ksim.desktop
-%exclude %{_datadir}/apps/ksim/
-%exclude %{_datadir}/config/ksim_panelextensionrc
-%exclude %{_datadir}/icons/crystalsvg/??x??/apps/ksim.png
-%exclude %{_datadir}/icons/crystalsvg/16x16/devices/ksim_cpu.png
-
-# klaptop
-%exclude %{_sysconfdir}/pam.d/klaptop_acpi_helper
-%exclude %{_sysconfdir}/security/console.apps/klaptop_acpi_helper
-%exclude %{_bindir}/klaptop*
-%exclude %{tde_libdir}/kded_klaptopdaemon.*
-%exclude %{_sbindir}/klaptop_acpi_helper
-%exclude %{_datadir}/apps/klaptopdaemon
-%exclude %{_datadir}/services/kded/klaptopdaemon.desktop
-%exclude %{tde_libdir}/kcm_laptop.*
-%exclude %{_libdir}/libkcmlaptop.*
-%exclude %{_datadir}/applications/kde/laptop.desktop
-%exclude %{_datadir}/config/kcmlaptoprc
-%exclude %{tde_docdir}/HTML/en/kcontrol/
-%exclude %{_datadir}/icons/crystalsvg/128x128/apps/laptop_battery.png
-%exclude %{_datadir}/icons/crystalsvg/??x??/apps/laptop_battery.png
-%exclude %{_datadir}/icons/crystalsvg/scalable/apps/laptop_battery.svgz
-
-%{tde_docdir}/HTML/en/*
-%attr(644,root,root) %{_sysconfdir}/security/console.apps/*
-%attr(644,root,root) %{_sysconfdir}/pam.d/*
-%{_bindir}/*
-%{_sbindir}/*
-%{tde_libdir}/*
-%{_libdir}/*.la
-%{_libdir}/libkdeinit*.so
-%{_libdir}/lib*.so.*
-%{_datadir}/icons/*/*/*/*
-%{_datadir}/apps/*
-%config %{_datadir}/config/*
-%{_datadir}/config.kcfg/*
-%{_datadir}/services/*
-%{_datadir}/servicetypes/*
-%{_datadir}/applications/kde/*
-%if 0%{?rhel} >= 5
-%{_datadir}/applnk/Utilities/*
-%{_datadir}/mimelnk/application/*
-%endif
-%{_datadir}/autostart/*
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_includedir}/*
-%{_libdir}/libkcmlaptop.so
-%{_libdir}/libkhexeditcommon.so
-%{_libdir}/libkmilo.so
-%{_libdir}/libkregexpeditorcommon.so
-%{_libdir}/libksimcore.so
-
-
-%changelog
-* Sun Sep 18 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-7
-- Add RHEL5 support
-
-* Mon Sep 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-6
-- Merge Spec file from Fedora8 "kdeutils-3.5.10-6"
-
-* Sun Sep 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-5
-- Import to GIT
-
-* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-4
-- Correct (again) macro to install under "/opt", if desired
-
-* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-3
-- Correct macro to install under "/opt", if desired
-
-* Sun Dec 19 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2
-- Rebuilt
-
-* Fri Dec 17 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
-- Add macro _kde3_prefix to define custom installation prefix (ex: /opt/kde3)
-- Add '--with-extra-includes=%{_includedir}/tqt'
-
-* Wed Dec 15 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-0
-- Initial version
-
diff --git a/redhat/main/tdeutils/kdeutils-3.5.13-ark_fix_utf8.patch b/redhat/main/tdeutils/kdeutils-3.5.13-ark_fix_utf8.patch
deleted file mode 100644
index 0fdb61aa6..000000000
--- a/redhat/main/tdeutils/kdeutils-3.5.13-ark_fix_utf8.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- kdeutils/ark/arch.cpp~	2011-08-13 09:25:08.000000000 +0300
-+++ kdeutils/ark/arch.cpp	2012-06-14 16:58:52.417875615 +0300
-@@ -33,6 +33,7 @@
- // QT includes
- #include <tqapplication.h>
- #include <tqfile.h>
-+#include <tqtextcodec.h>
- 
- // KDE includes
- #include <kdebug.h>
-@@ -288,7 +290,7 @@
- 
-     data[ lfChar ] = '\0';
- 
--    m_buffer.append( TQString::fromUtf8(data + startChar).latin1() );
-+    m_buffer.append( data + startChar );
- 
-     data[ lfChar ] = '\n';
-     startChar = lfChar + 1;
-@@ -333,12 +335,15 @@
-   unsigned int pos = 0;
-   int strpos, len;
- 
-+  TQTextCodec *codec = TQTextCodec::codecForLocale();
-+  TQString tqunicode_line = codec->toUnicode( line );
-+
-   // Go through our columns, try to pick out data, return silently on failure
-   for ( TQPtrListIterator <ArchColumns>col( m_archCols ); col.current(); ++col )
-   {
-     ArchColumns *curCol = *col;
- 
--    strpos = curCol->pattern.search( line, pos );
-+    strpos = curCol->pattern.search( tqunicode_line, pos );
-     len = curCol->pattern.matchedLength();
- 
-     if ( ( strpos == -1 ) || ( len > curCol->maxLength ) )
-@@ -354,7 +359,7 @@
- 
-     pos = strpos + len;
- 
--    columns[curCol->colRef] = TQString::fromLocal8Bit( line.mid(strpos, len) );
-+    columns[curCol->colRef] = tqunicode_line.mid(strpos, len).utf8();
-   }
- 
- 
---- kdeutils-3.5.1/ark/arkapp.cpp~	2006-01-19 19:49:29 +0300
-+++ kdeutils-3.5.1/ark/arkapp.cpp	2006-02-20 19:28:23 +0300
-@@ -32,6 +32,7 @@
- #include <unistd.h>
- #include <tqfile.h>
- #include <errno.h>
-+#include <qtextcodec.h>
- 
- 
- #include "arkapp.h"
-@@ -110,6 +111,7 @@ ArkApplication::ArkApplication()
- {
- 	m_mainwidget = new TQWidget;
- 	setMainWidget(m_mainwidget);
-+	QTextCodec::setCodecForCStrings(QTextCodec::codecForLocale());
- }
- 
- int
diff --git a/redhat/main/tdeutils/kdeutils-3.5.13-ark_repairs_and_extensions.patch b/redhat/main/tdeutils/kdeutils-3.5.13-ark_repairs_and_extensions.patch
deleted file mode 100644
index da9f61ee9..000000000
--- a/redhat/main/tdeutils/kdeutils-3.5.13-ark_repairs_and_extensions.patch
+++ /dev/null
@@ -1,1281 +0,0 @@
-commit 1c84948d57c174bcd9732a5a0a51d42d3626d000
-Author: Slávek Banko <slavek.banko@axis.cz>
-Date:   1339952967 +0200
-
-    [Ark] Repairs and extensions
-    Added support for Arj
-    Added support for check archives
-    Added support for password processing
-    Fix show broken filenames into real UTF-8
-    This closes Bug 1030
-
-diff --git a/ark/Makefile.am b/ark/Makefile.am
-index 9761a28..14f33f5 100644
---- a/ark/Makefile.am
-+++ b/ark/Makefile.am
-@@ -9,19 +9,19 @@ tdeinit_LTLIBRARIES = ark.la
- lib_LTLIBRARIES =
- 
- ark_la_SOURCES = main.cpp arkapp.cpp mainwindow.cpp
--ark_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
--ark_la_LIBADD = libark_common.la $(LIB_KPARTS)
-+ark_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(KDE_PLUGIN)
-+ark_la_LIBADD = $(LIB_KDED) -lDCOP $(LIB_KHTML) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)  libark_common.la $(LIB_KPARTS)
- ark_la_COMPILE_FIRST = settings.h
- 
- noinst_LTLIBRARIES = libark_common.la
- 
- libark_common_la_SOURCES = settings.kcfgc archiveformatinfo.cpp
- libark_common_la_LDFLAGS = $(all_libraries) -no-undefined
--libark_common_la_LIBADD  = $(LIB_KFILE)
-+libark_common_la_LIBADD  = $(LIB_KDED) -lDCOP $(LIB_KHTML) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)  $(LIB_KFILE)
- 
- kde_module_LTLIBRARIES = libarkpart.la
- libarkpart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
--libarkpart_la_LIBADD = libark_common.la $(LIB_KPARTS)
-+libarkpart_la_LIBADD = $(LIB_KDED) -lDCOP $(LIB_KHTML) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)  libark_common.la $(LIB_KPARTS)
- libarkpart_la_COMPILE_FIRST = settings.h
- 
- libarkpart_la_SOURCES = ark_part.cpp arkfactory.cpp zip.cpp tar.cpp \
-@@ -31,7 +31,7 @@ libarkpart_la_SOURCES = ark_part.cpp arkfactory.cpp zip.cpp tar.cpp \
-                         arkwidget.cpp searchbar.cpp \
-                         addition.ui extraction.ui general.ui \
-                         arkviewer.cpp sevenzip.cpp extractiondialog.cpp \
--                        ace.cpp tarlistingthread.cpp
-+                        ace.cpp tarlistingthread.cpp arj.cpp
- 
- METASOURCES = AUTO
- 
-diff --git a/ark/addition.ui b/ark/addition.ui
-index 401c146..46541ca 100644
---- a/ark/addition.ui
-+++ b/ark/addition.ui
-@@ -16,6 +16,15 @@
-         <property name="name">
-             <cstring>unnamed</cstring>
-         </property>
-+
-+        <widget class="TQCheckBox">
-+            <property name="name">
-+                <cstring>kcfg_askCreatePassword</cstring>
-+            </property>
-+            <property name="text">
-+                <string>Ask for &amp;password when create archive if possible</string>
-+            </property>
-+        </widget>
-         <widget class="TQCheckBox">
-             <property name="name">
-                 <cstring>kcfg_replaceOnlyWithNewer</cstring>
-diff --git a/ark/arch.cpp b/ark/arch.cpp
-index ee2a23e..b4fc0e8 100644
---- a/ark/arch.cpp
-+++ b/ark/arch.cpp
-@@ -33,6 +33,7 @@
- // QT includes
- #include <tqapplication.h>
- #include <tqfile.h>
-+#include <tqtextcodec.h>
- 
- // KDE includes
- #include <kdebug.h>
-@@ -59,6 +60,7 @@
- #include "ar.h"
- #include "sevenzip.h"
- #include "ace.h"
-+#include "arj.h"
- 
- Arch::ArchColumns::ArchColumns( int col, TQRegExp reg, int length, bool opt )
-   : colRef( col ), pattern( reg ), maxLength( length ), optional( opt )
-@@ -288,7 +290,7 @@ void Arch::slotReceivedTOC( KProcess*, char* data, int length )
- 
-     data[ lfChar ] = '\0';
- 
--    m_buffer.append( TQString::fromUtf8(data + startChar).latin1() );
-+    m_buffer.append( data + startChar );
- 
-     data[ lfChar ] = '\n';
-     startChar = lfChar + 1;
-@@ -333,12 +335,16 @@ bool Arch::processLine( const TQCString &line )
-   unsigned int pos = 0;
-   int strpos, len;
- 
-+  TQTextCodec::setCodecForCStrings(TQTextCodec::codecForLocale());
-+  TQTextCodec *codec = TQTextCodec::codecForLocale();
-+  TQString tqunicode_line = codec->toUnicode( line );
-+
-   // Go through our columns, try to pick out data, return silently on failure
-   for ( TQPtrListIterator <ArchColumns>col( m_archCols ); col.current(); ++col )
-   {
-     ArchColumns *curCol = *col;
- 
--    strpos = curCol->pattern.search( line, pos );
-+    strpos = curCol->pattern.search( tqunicode_line, pos );
-     len = curCol->pattern.matchedLength();
- 
-     if ( ( strpos == -1 ) || ( len > curCol->maxLength ) )
-@@ -354,7 +360,7 @@ bool Arch::processLine( const TQCString &line )
- 
-     pos = strpos + len;
- 
--    columns[curCol->colRef] = TQString::fromLocal8Bit( line.mid(strpos, len) );
-+    columns[curCol->colRef] = tqunicode_line.mid(strpos, len).utf8();
-   }
- 
- 
-@@ -388,6 +394,60 @@ bool Arch::processLine( const TQCString &line )
-   return true;
- }
- 
-+void Arch::test()
-+{
-+    emit sigTest(false);
-+    KMessageBox::information(0, i18n("Not implemented."));
-+}
-+
-+void Arch::slotTestExited( KProcess *_kp )
-+{
-+  bool success = ( _kp->normalExit() && ( _kp->exitStatus() == 0 ) );
-+
-+  if( !success )
-+  {
-+    if ( passwordRequired() )
-+    {
-+        TQString msg;
-+        if ( !m_password.isEmpty() )
-+            msg = i18n("The password was incorrect. ");
-+        if (KPasswordDialog::getPassword( m_password, msg+i18n("You must enter a password to extract the file:") ) == KPasswordDialog::Accepted )
-+        {
-+            delete _kp;
-+            _kp = m_currentProcess = 0;
-+            clearShellOutput();
-+            test(); // try to test the archive again with a password
-+            return;
-+        }
-+        m_password = "";
-+        emit sigTest( false );
-+        delete _kp;
-+        _kp = m_currentProcess = 0;
-+        return;
-+    }
-+    else if ( m_password.isEmpty() || _kp->exitStatus() > 1 )
-+    {
-+        TQApplication::restoreOverrideCursor();
-+
-+        TQString msg = i18n( "The test operation failed." );
-+
-+        if ( !getLastShellOutput().isNull() )
-+        {
-+            //getLastShellOutput() is a TQString. errorList is expecting TQStringLists to show in multiple lines
-+            TQStringList list = TQStringList::split( "\n", getLastShellOutput() );
-+            KMessageBox::errorList( m_gui, msg, list );
-+            clearShellOutput();
-+        }
-+        else
-+        {
-+            KMessageBox::error( m_gui, msg );
-+        }
-+    }
-+  }
-+  delete _kp;
-+  _kp = m_currentProcess = 0;
-+  emit sigTest( success );
-+}
- 
- Arch *Arch::archFactory( ArchType aType,
-                          ArkWidget *parent, const TQString &filename,
-@@ -422,6 +482,9 @@ Arch *Arch::archFactory( ArchType aType,
-     case ACE_FORMAT:
-       return new AceArch( parent, filename );
- 
-+    case ARJ_FORMAT:
-+      return new ArjArch( parent, filename );
-+
-     case UNKNOWN_FORMAT:
-     default:
-       return 0;
-diff --git a/ark/arch.h b/ark/arch.h
-index 7aa18ac..85c6c7d 100644
---- a/ark/arch.h
-+++ b/ark/arch.h
-@@ -65,7 +65,7 @@ class ArkWidget;
- 
- enum ArchType { UNKNOWN_FORMAT, ZIP_FORMAT, TAR_FORMAT, AA_FORMAT,
-                 LHA_FORMAT, RAR_FORMAT, ZOO_FORMAT, COMPRESSED_FORMAT,
--                SEVENZIP_FORMAT, ACE_FORMAT };
-+                SEVENZIP_FORMAT, ACE_FORMAT, ARJ_FORMAT };
- 
- typedef TQValueList< TQPair< TQString, TQt::AlignmentFlags > > ColumnList;
- 
-@@ -101,6 +101,7 @@ class Arch : public TQObject
-     virtual void open() = 0;
-     virtual void create() = 0;
-     virtual void remove( TQStringList * ) = 0;
-+    virtual void test();
- 
-     virtual void addFile( const TQStringList & ) = 0;
-     virtual void addDir( const TQString & ) = 0;
-@@ -150,12 +151,16 @@ class Arch : public TQObject
-     static Arch *archFactory( ArchType aType, ArkWidget *parent,
-                               const TQString &filename,
-                               const TQString &openAsMimeType = TQString() );
-+    TQString password() { return m_password; }
-+    void setPassword(const TQString & pw) { m_password = pw.local8Bit(); }
-+    virtual void createPassword() {}
- 
-   protected slots:
-     void slotOpenExited( KProcess* );
-     void slotExtractExited( KProcess* );
-     void slotDeleteExited( KProcess* );
-     void slotAddExited( KProcess* );
-+    void slotTestExited( KProcess* );
- 
-     void slotReceivedOutput( KProcess *, char*, int );
- 
-@@ -168,6 +173,7 @@ class Arch : public TQObject
-     void sigDelete( bool );
-     void sigExtract( bool );
-     void sigAdd( bool );
-+    void sigTest( bool );
-     void headers( const ColumnList& columns );
- 
-   protected:  // data
-diff --git a/ark/archiveformatinfo.cpp b/ark/archiveformatinfo.cpp
-index 2dcbabb..2f6fded 100644
---- a/ark/archiveformatinfo.cpp
-+++ b/ark/archiveformatinfo.cpp
-@@ -84,6 +84,8 @@ void ArchiveFormatInfo::buildFormatInfos()
- 
-   addFormatInfo( SEVENZIP_FORMAT, "application/x-7z", ".7z" );
- 
-+  addFormatInfo( ARJ_FORMAT, "application/x-arj", ".arj" );
-+
-   if ( ArkSettings::aceSupport() )
-     addFormatInfo( ACE_FORMAT, "application/x-ace", ".ace" );
- }
-diff --git a/ark/arj.cpp b/ark/arj.cpp
-new file mode 100644
-index 0000000..4d94776
---- /dev/null
-+++ b/ark/arj.cpp
-@@ -0,0 +1,326 @@
-+/*
-+
-+ ark -- archiver for the KDE project
-+
-+ Copyright (C)
-+
-+ 1997-1999: Rob Palmbos palm9744@kettering.edu
-+ 1999: Francois-Xavier Duranceau duranceau@kde.org
-+ 1999-2000: Corel Corporation (author: Emily Ezust, emilye@corel.com)
-+ 2001: Corel Corporation (author: Michael Jarrett, michaelj@corel.com)
-+ 2007: ALT Linux (author: Sergey V Turchin, zerg@altlinux.org)
-+
-+ This program is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU General Public License
-+ as published by the Free Software Foundation; either version 2
-+ of the License, or (at your option) any later version.
-+
-+ This program is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ GNU General Public License for more details.
-+
-+ You should have received a copy of the GNU General Public License
-+ along with this program; if not, write to the Free Software
-+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-+
-+*/
-+
-+
-+// Qt includes
-+#include <tqdir.h>
-+#include <tqtextcodec.h>
-+
-+// KDE includes
-+#include <kdebug.h>
-+#include <klocale.h>
-+#include <kmessagebox.h>
-+#include <kprocess.h>
-+#include <kpassdlg.h>
-+
-+// ark includes
-+#include "arj.h"
-+#include "arkwidget.h"
-+#include "settings.h"
-+
-+
-+ArjArch::ArjArch( ArkWidget *_gui, const TQString & _fileName )
-+  : Arch(  _gui, _fileName )
-+{
-+  m_archiver_program = "arj";
-+  m_unarchiver_program = "arj";
-+  verifyCompressUtilityIsAvailable( m_archiver_program );
-+  verifyUncompressUtilityIsAvailable( m_unarchiver_program );
-+
-+  m_headerString = "-----------";
-+  m_numCols = 6;
-+}
-+
-+void ArjArch::setHeaders()
-+{
-+  ColumnList list;
-+  list.append( FILENAME_COLUMN );
-+  list.append( SIZE_COLUMN );
-+  list.append( PACKED_COLUMN );
-+  list.append( RATIO_COLUMN );
-+  list.append( TIMESTAMP_COLUMN );
-+  list.append( PERMISSION_COLUMN );
-+
-+  emit headers( list );
-+}
-+
-+void ArjArch::create()
-+{
-+  emit sigCreate( this, true, m_filename,
-+                  Arch::Extract | Arch::Delete | Arch::Add | Arch::View );
-+}
-+
-+void ArjArch::createPassword()
-+{
-+  if( m_password.isEmpty() && ArkSettings::askCreatePassword() )
-+    KPasswordDialog::getNewPassword( m_password, i18n("Warning!\nUsing KGpg for encryption is more secure.\nCancel this dialog or enter password for %1 archiver:").arg(m_archiver_program) );
-+}
-+
-+
-+void ArjArch::addDir( const TQString & _dirName )
-+{
-+  if ( !_dirName.isEmpty() )
-+  {
-+    TQStringList list;
-+    list.append( _dirName );
-+    addFile( list );
-+  }
-+}
-+
-+void ArjArch::addFile( const TQStringList & urls )
-+{
-+  KProcess *kp = m_currentProcess = new KProcess;
-+
-+  kp->clearArguments();
-+  *kp << m_archiver_program;
-+  *kp << "a";
-+
-+  if ( ArkSettings::replaceOnlyWithNewer() )
-+    *kp << "-u";
-+
-+  if ( ArkSettings::rarRecurseSubdirs() )
-+    *kp << "-r";
-+
-+  if ( !m_password.isEmpty() )
-+    *kp << "-g"+m_password;
-+
-+  *kp << m_filename;
-+
-+  KURL dir( urls.first() );
-+  TQDir::setCurrent( dir.directory() );
-+
-+  TQStringList::ConstIterator iter;
-+  for ( iter = urls.begin(); iter != urls.end(); ++iter )
-+  {
-+    KURL url( *iter );
-+    *kp << url.fileName();
-+  }
-+
-+  connect( kp, SIGNAL( receivedStdout(KProcess*, char*, int) ),
-+           SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
-+  connect( kp, SIGNAL( receivedStderr(KProcess*, char*, int) ),
-+           SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
-+  connect( kp, SIGNAL( processExited(KProcess*) ),
-+           SLOT( slotAddExited(KProcess*) ) );
-+
-+  if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
-+  {
-+    KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
-+    emit sigAdd( false );
-+  }
-+}
-+
-+bool ArjArch::processLine( const TQCString &line )
-+{
-+  TQString unicode_line;
-+
-+  TQTextCodec *codec = TQTextCodec::codecForLocale();
-+  TQTextCodec *codec_alt = TQTextCodec::codecForName("CP1251");
-+  unicode_line = codec->toUnicode( line );
-+
-+  TQStringList list;
-+
-+  TQStringList l2 = TQStringList::split( ' ', line );
-+  if( l2.size() >= 2 && l2[0].endsWith(")") && l2[0].length() == 4 )
-+  {
-+    file_entry = line.mid(4);
-+  }
-+  else if( l2.size() > 3 )
-+  {
-+    if( l2[1] == "UNIX" )
-+	list << codec->toUnicode(file_entry).stripWhiteSpace(); // filename
-+    else
-+	list << codec_alt->toUnicode(file_entry).stripWhiteSpace(); // filename
-+
-+    list << l2[ 2 ]; // size
-+    list << l2[ 3 ]; // packed
-+    double ratio = l2[4].toDouble();
-+    if( ratio == 0 )
-+	ratio = 1;
-+    list << TQString("%1").arg(100-100/ratio); // ratio
-+
-+    TQStringList date =  TQStringList::split( '-', l2[ 5 ] );
-+    list << ArkUtils::fixYear( date[ 0 ].latin1() ) + '-' + date[ 1 ] + '-' + date [ 2 ] + ' ' + l2[6]; // date
-+    list << l2[ 7 ]; // attributes
-+
-+    m_gui->fileList()->addItem( list ); // send to GUI
-+    
-+    file_entry = "";
-+  }
-+
-+  return true;
-+}
-+
-+
-+void ArjArch::open()
-+{
-+  setHeaders();
-+
-+  m_buffer = "";
-+  m_header_removed = false;
-+  m_finished = false;
-+
-+  KProcess *kp = m_currentProcess = new KProcess;
-+
-+  *kp << m_unarchiver_program << "v" << m_filename;
-+
-+  connect( kp, SIGNAL( receivedStdout(KProcess*, char*, int) ),
-+           SLOT( slotReceivedTOC(KProcess*, char*, int) ) );
-+  connect( kp, SIGNAL( receivedStderr(KProcess*, char*, int) ),
-+           SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
-+  connect( kp, SIGNAL( processExited(KProcess*) ),
-+           SLOT( slotOpenExited(KProcess*) ) );
-+
-+  if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
-+  {
-+    KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
-+    emit sigOpen( this, false, TQString::null, 0 );
-+  }
-+}
-+
-+void ArjArch::unarchFileInternal()
-+{
-+  // if fileList is empty, all files are extracted.
-+  // if destDir is empty, abort with error.
-+  if ( m_destDir.isEmpty() || m_destDir.isNull() )
-+  {
-+    kdError( 1601 ) << "There was no extract directory given." << endl;
-+    return;
-+  }
-+
-+  KProcess *kp = m_currentProcess = new KProcess;
-+  kp->clearArguments();
-+
-+  *kp << m_unarchiver_program;
-+  *kp << "x";
-+
-+  if ( !m_password.isEmpty() )
-+    *kp << "-g" + m_password;
-+
-+  if ( ArkSettings::extractOverwrite() )
-+    *kp << "-jyo";
-+
-+  *kp << "-jycv";
-+
-+  *kp << "-w" + m_destDir;
-+  *kp << "-ht" + m_destDir;
-+
-+  TQTextCodec *codec = TQTextCodec::codecForLocale();
-+  *kp << codec->fromUnicode(m_filename);
-+
-+  // if the list is empty, no filenames go on the command line,
-+  // and we then extract everything in the archive.
-+  if ( m_fileList )
-+  {
-+    TQStringList::Iterator it;
-+
-+    for ( it = m_fileList->begin(); it != m_fileList->end(); ++it )
-+    {
-+      *kp << codec->fromUnicode(*it);
-+    }
-+  }
-+
-+  connect( kp, SIGNAL( receivedStdout(KProcess*, char*, int) ),
-+           SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
-+  connect( kp, SIGNAL( receivedStderr(KProcess*, char*, int) ),
-+           SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
-+  connect( kp, SIGNAL( processExited(KProcess*) ),
-+           SLOT( slotExtractExited(KProcess*) ) );
-+
-+  if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
-+  {
-+    KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
-+    emit sigExtract( false );
-+  }
-+}
-+
-+bool ArjArch::passwordRequired()
-+{
-+    return m_lastShellOutput.findRev("File is password encrypted") != -1;
-+}
-+
-+void ArjArch::remove( TQStringList *list )
-+{
-+  if ( !list )
-+    return;
-+
-+  KProcess *kp = m_currentProcess = new KProcess;
-+  kp->clearArguments();
-+
-+  *kp << m_archiver_program << "d" << m_filename;
-+
-+  TQStringList::Iterator it;
-+  for ( it = list->begin(); it != list->end(); ++it )
-+  {
-+    TQString str = *it;
-+    *kp << str;
-+  }
-+
-+  connect( kp, SIGNAL( receivedStdout(KProcess*, char*, int) ),
-+           SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
-+  connect( kp, SIGNAL( receivedStderr(KProcess*, char*, int) ),
-+           SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
-+  connect( kp, SIGNAL( processExited(KProcess*) ),
-+           SLOT( slotDeleteExited(KProcess*) ) );
-+
-+  if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
-+  {
-+    KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
-+    emit sigDelete( false );
-+  }
-+}
-+
-+void ArjArch::test()
-+{
-+  clearShellOutput();
-+
-+  KProcess *kp = m_currentProcess = new KProcess;
-+  kp->clearArguments();
-+
-+  *kp << m_unarchiver_program << "t";
-+
-+  if ( !m_password.isEmpty() )
-+    *kp << "-g" + m_password;
-+
-+  *kp << m_filename;
-+
-+  connect( kp, SIGNAL( receivedStdout(KProcess*, char*, int) ),
-+           SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
-+  connect( kp, SIGNAL( receivedStderr(KProcess*, char*, int) ),
-+           SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
-+  connect( kp, SIGNAL( processExited(KProcess*) ),
-+           SLOT( slotTestExited(KProcess*) ) );
-+
-+  if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
-+  {
-+    KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
-+    emit sigTest( false );
-+  }
-+}
-+
-+#include "arj.moc"
-diff --git a/ark/arj.h b/ark/arj.h
-new file mode 100644
-index 0000000..13d45b4
---- /dev/null
-+++ b/ark/arj.h
-@@ -0,0 +1,65 @@
-+/*
-+
-+  ark -- archiver for the KDE project
-+
-+  Copyright (C)
-+
-+  1997-1999: Rob Palmbos palm9744@kettering.edu
-+  1999: Francois-Xavier Duranceau duranceau@kde.org
-+  1999-2000: Corel Corporation (author: Emily Ezust, emilye@corel.com)
-+  2001: Corel Corporation (author: Michael Jarrett, michaelj@corel.com)
-+  2007: ALT Linux (author: Sergey V Turchin, zerg@altlinux.org)
-+
-+  This program is free software; you can redistribute it and/or
-+  modify it under the terms of the GNU General Public License
-+  as published by the Free Software Foundation; either version 2
-+  of the License, or (at your option) any later version.
-+
-+  This program is distributed in the hope that it will be useful,
-+  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+  GNU General Public License for more details.
-+
-+  You should have received a copy of the GNU General Public License
-+  along with this program; if not, write to the Free Software
-+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-+
-+*/
-+
-+#ifndef ARJARCH_H
-+#define ARJARCH_H
-+
-+#include "arch.h"
-+
-+class TQString;
-+class TQStringList;
-+
-+class ArkWidget;
-+
-+class ArjArch : public Arch
-+{
-+  Q_OBJECT
-+  public:
-+    ArjArch( ArkWidget *_gui, const TQString & _fileName );
-+    virtual ~ArjArch() { }
-+
-+    virtual void open();
-+    virtual void create();
-+    virtual void test();
-+
-+    virtual void remove(TQStringList*);
-+    virtual void addFile(const TQStringList&);
-+    virtual void addDir(const TQString&);
-+
-+    virtual void unarchFileInternal();
-+    virtual bool passwordRequired();
-+    virtual void createPassword();
-+
-+  protected slots:
-+    virtual bool processLine( const TQCString & );
-+  private:
-+    TQCString file_entry;
-+    void setHeaders();
-+};
-+
-+#endif /* ARJARCH_H */
-diff --git a/ark/ark.kcfg b/ark/ark.kcfg
-index 10e7c22..0a20d55 100644
---- a/ark/ark.kcfg
-+++ b/ark/ark.kcfg
-@@ -18,6 +18,11 @@
- 			<whatsthis>Overwrite any files that have matching names on disk with the one from the archive</whatsthis>
- 			<default>false</default>
- 		</entry>
-+		<entry name="askCreatePassword" type="Bool">
-+			<label>Ask for password when create archive if possible</label>
-+			<whatsthis>Ask for password when create archive if possible</whatsthis>
-+			<default>true</default>
-+		</entry>
- 	</group>
- 	<group name="Tar">
- 		<entry name="preservePerms" type="Bool">
-diff --git a/ark/ark.la.cpp b/ark/ark.la.cpp
-new file mode 100644
-index 0000000..3d480c4
---- /dev/null
-+++ b/ark/ark.la.cpp
-@@ -0,0 +1,2 @@
-+extern "C" int kdemain(int argc, char* argv[]);
-+int main(int argc, char* argv[]) { return kdemain(argc,argv); }
-diff --git a/ark/ark_dummy.cpp b/ark/ark_dummy.cpp
-new file mode 100644
-index 0000000..efd89d8
---- /dev/null
-+++ b/ark/ark_dummy.cpp
-@@ -0,0 +1,3 @@
-+#include <kdemacros.h>
-+extern "C" int kdemain(int argc, char* argv[]);
-+extern "C" KDE_EXPORT int tdeinitmain(int argc, char* argv[]) { return kdemain(argc,argv); }
-diff --git a/ark/ark_part.cpp b/ark/ark_part.cpp
-index f52d763..456e397 100644
---- a/ark/ark_part.cpp
-+++ b/ark/ark_part.cpp
-@@ -139,6 +139,9 @@ ArkPart::setupActions()
-     editAction = new KAction(i18n("Edit &With..."), 0, TQT_TQOBJECT(awidget),
-                              TQT_SLOT(action_edit()), actionCollection(), "edit");
- 
-+    testAction = new KAction(i18n("&Test integrity"), 0, awidget,
-+                                TQT_SLOT(action_test()),	actionCollection(), "test");
-+
-     selectAllAction = KStdAction::selectAll(TQT_TQOBJECT(awidget->fileList()), TQT_SLOT(selectAll()), actionCollection(), "select_all");
- 
-     deselectAllAction =  new KAction(i18n("&Unselect All"), 0, TQT_TQOBJECT(awidget->fileList()),TQT_SLOT(unselectAll()), actionCollection(), "deselect_all");
-@@ -189,6 +192,7 @@ void ArkPart::fixEnables()
-     addDirAction->setEnabled(awidget->isArchiveOpen() &&
-                              !bReadOnly && bAddDirSupported);
-     extractAction->setEnabled(bHaveFiles);
-+    testAction->setEnabled(true);
-     awidget->searchBar()->setEnabled(bHaveFiles);
- 
-     bool b = ( bHaveFiles
-@@ -216,6 +220,7 @@ void ArkPart::initialEnables()
-     addDirAction->setEnabled(false);
-     openWithAction->setEnabled(false);
-     editAction->setEnabled(false);
-+    testAction->setEnabled(false);
- 
-     awidget->searchBar()->setEnabled(false);
- }
-@@ -234,6 +239,7 @@ void ArkPart::disableActions()
-     addDirAction->setEnabled(false);
-     openWithAction->setEnabled(false);
-     editAction->setEnabled(false);
-+    testAction->setEnabled(false);
-     awidget->searchBar()->setEnabled(false);
- }
- 
-diff --git a/ark/ark_part.h b/ark/ark_part.h
-index fb136b6..1fa6166 100644
---- a/ark/ark_part.h
-+++ b/ark/ark_part.h
-@@ -139,6 +139,7 @@ private:
-     KAction *deselectAllAction;
-     KAction *invertSelectionAction;
-     KAction *editAction;
-+    KAction *testAction;
- 
-     // the following have different enable rules from the above KActions
-     KAction *popupViewAction;
-diff --git a/ark/ark_part.rc b/ark/ark_part.rc
-index ff0a894..39525e1 100644
---- a/ark/ark_part.rc
-+++ b/ark/ark_part.rc
-@@ -21,6 +21,7 @@
-     <Action name="view"/>
-     <Action name="open_with"/>
-     <Action name="edit"/>
-+    <Action name="test"/>
-   </Menu>
-  <Menu noMerge="1" name="settings">
-     <text>&amp;Settings</text>
-diff --git a/ark/ark_part_readonly.rc b/ark/ark_part_readonly.rc
-index c124aae..84f4f02 100644
---- a/ark/ark_part_readonly.rc
-+++ b/ark/ark_part_readonly.rc
-@@ -17,6 +17,7 @@
-     <Action name="extract"/>
-     <Action name="view"/>
-     <Action name="open_with"/>
-+    <Action name="test"/>
-   </Menu>
-  <Menu noMerge="1" name="settings">
-     <text>&amp;Settings</text>
-diff --git a/ark/arkwidget.cpp b/ark/arkwidget.cpp
-index 80fd413..0935e38 100644
---- a/ark/arkwidget.cpp
-+++ b/ark/arkwidget.cpp
-@@ -739,7 +739,10 @@ ArkWidget::file_open(const KURL& url)
-     m_url = url;
-     //arch->clearShellOutput();
- 
--    openArchive( strFile );
-+    if( url.hasPass() )
-+	openArchive( strFile, url.pass() );
-+    else
-+	openArchive( strFile );
- }
- 
- 
-@@ -1184,6 +1187,8 @@ ArkWidget::slotAddDone(bool _bSuccess)
-         //simulate reload
-         KURL u;
-         u.setPath( arch->fileName() );
-+	if( !arch->password().isEmpty() )
-+    	    u.setPass( arch->password() );
-         file_close();
-         file_open( u );
-         emit setWindowCaption( u.path() );
-@@ -1682,6 +1687,25 @@ ArkWidget::action_view()
- }
- 
- void
-+ArkWidget::action_test()
-+{
-+    connect( arch, TQT_SIGNAL( sigTest( bool ) ), this,
-+             TQT_SLOT( slotTestDone( bool ) ) );
-+    busy( i18n( "Testing..." ) );
-+    arch->test();
-+}
-+
-+void
-+ArkWidget::slotTestDone(bool ok)
-+{
-+    disconnect( arch, TQT_SIGNAL( sigTest( bool ) ), this,
-+             TQT_SLOT( slotTestDone( bool ) ) );
-+    ready();
-+    if( ok )
-+	KMessageBox::information(0, i18n("Test successful."));
-+}
-+
-+void
- ArkWidget::viewSlotExtractDone( bool success )
- {
-     if ( success )
-@@ -2102,6 +2126,7 @@ ArkWidget::slotCreate(Arch * _newarch, bool _success, const TQString & _filename
-         m_bIsSimpleCompressedFile =
-             (m_archType == COMPRESSED_FORMAT);
-         fixEnables();
-+	arch->createPassword();
-     }
-     else
-     {
-@@ -2115,7 +2140,7 @@ ArkWidget::slotCreate(Arch * _newarch, bool _success, const TQString & _filename
- //////////////////////////////////////////////////////////////////////
- 
- void
--ArkWidget::openArchive( const TQString & _filename )
-+ArkWidget::openArchive( const TQString & _filename, const TQString & _password )
- {
-     Arch *newArch = 0;
-     ArchType archtype;
-@@ -2172,6 +2197,7 @@ ArkWidget::openArchive( const TQString & _filename )
-     busy( i18n( "Opening the archive..." ) );
-     m_fileListView->setUpdatesEnabled( false );
-     arch = newArch;
-+    newArch->setPassword(_password);
-     newArch->open();
-     emit addRecentURL( m_url );
- }
-diff --git a/ark/arkwidget.h b/ark/arkwidget.h
-index 67c2f78..fa2b68e 100644
---- a/ark/arkwidget.h
-+++ b/ark/arkwidget.h
-@@ -121,6 +121,7 @@ protected slots:
-     bool action_extract();
-     void slotOpenWith();
-     void action_edit();
-+    void action_test();
- 
-     void doPopup(TQListViewItem *, const TQPoint &, int); // right-click menus
-     void viewFile(TQListViewItem*); // doubleClick view files
-@@ -133,6 +134,7 @@ protected slots:
-     void slotExtractRemoteDone(KIO::Job *job);
-     void slotAddDone(bool);
-     void slotEditFinished(KProcess *);
-+    void slotTestDone(bool);
- signals:
-     void openURLRequest( const KURL & url );
-     void request_file_quit();
-@@ -235,7 +237,7 @@ protected:
-     void createFileListView();
- 
-     bool createArchive(const TQString & name);
--    void openArchive(const TQString & name);
-+    void openArchive(const TQString & name, const TQString & pass = "");
- 
-     void showCurrentFile();
- 
-diff --git a/ark/lha.cpp b/ark/lha.cpp
-index f83e809..14fa68d 100644
---- a/ark/lha.cpp
-+++ b/ark/lha.cpp
-@@ -55,8 +55,10 @@
- LhaArch::LhaArch( ArkWidget *_gui, const TQString & _fileName )
-   : Arch( _gui, _fileName )
- {
--  m_archiver_program = "lha";
-+  m_archiver_program = m_unarchiver_program = "lha";
-+
-   verifyCompressUtilityIsAvailable( m_archiver_program );
-+  verifyUncompressUtilityIsAvailable( m_unarchiver_program );
- 
-   m_headerString = "----";
- }
-diff --git a/ark/rar.cpp b/ark/rar.cpp
-index 5369e89..ac59d74 100644
---- a/ark/rar.cpp
-+++ b/ark/rar.cpp
-@@ -107,6 +107,12 @@ bool RarArch::processLine( const TQCString &line )
- 
-   TQStringList l2 = TQStringList::split( ' ', line );
- 
-+  if( l2[5].startsWith("d") )
-+  {
-+    m_isFirstLine = true;
-+    return true;
-+  }
-+
-   list << m_entryFilename; // filename
-   list << l2[ 0 ]; // size
-   list << l2[ 1 ]; // packed
-@@ -179,6 +185,12 @@ void RarArch::create()
-                   Arch::Extract | Arch::Delete | Arch::Add | Arch::View );
- }
- 
-+void RarArch::createPassword()
-+{
-+  if( m_password.isEmpty() && ArkSettings::askCreatePassword() )
-+    KPasswordDialog::getNewPassword( m_password, i18n("Warning!\nUsing KGpg for encryption is more secure.\nCancel this dialog or enter password for %1 archiver:").arg(m_archiver_program) );
-+}
-+
- void RarArch::addDir( const TQString & _dirName )
- {
-   if ( !_dirName.isEmpty() )
-@@ -206,6 +218,9 @@ void RarArch::addFile( const TQStringList & urls )
-   if ( ArkSettings::rarRecurseSubdirs() )
-     *kp << "-r";
- 
-+  if ( !m_password.isEmpty() )
-+    *kp << "-p"+m_password;
-+
-   *kp << m_filename;
- 
-   KURL dir( urls.first() );
-@@ -291,7 +306,7 @@ void RarArch::unarchFileInternal()
- 
- bool RarArch::passwordRequired()
- {
--    return m_lastShellOutput.findRev("password incorrect ?)")+1;
-+    return m_lastShellOutput.find("Enter password") >= 0;
- }
- 
- void RarArch::remove( TQStringList *list )
-@@ -325,4 +340,32 @@ void RarArch::remove( TQStringList *list )
-   }
- }
- 
-+void RarArch::test()
-+{
-+  clearShellOutput();
-+
-+  KProcess *kp = m_currentProcess = new KProcess;
-+  kp->clearArguments();
-+
-+  *kp << m_unarchiver_program << "t";
-+
-+  if ( !m_password.isEmpty() )
-+    *kp << "-p" + m_password;
-+
-+  *kp << m_filename;
-+
-+  connect( kp, SIGNAL( receivedStdout(KProcess*, char*, int) ),
-+           SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
-+  connect( kp, SIGNAL( receivedStderr(KProcess*, char*, int) ),
-+           SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
-+  connect( kp, SIGNAL( processExited(KProcess*) ),
-+           SLOT( slotTestExited(KProcess*) ) );
-+
-+  if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
-+  {
-+    KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
-+    emit sigTest( false );
-+  }
-+}
-+
- #include "rar.moc"
-diff --git a/ark/rar.h b/ark/rar.h
-index 5b0e183..9bd0aea 100644
---- a/ark/rar.h
-+++ b/ark/rar.h
-@@ -42,6 +42,7 @@ class RarArch : public Arch
-   
-     virtual void open();
-     virtual void create();
-+    virtual void test();
- 
-     virtual void addFile( const TQStringList & );
-     virtual void addDir( const TQString & );
-@@ -49,6 +50,7 @@ class RarArch : public Arch
-     virtual void remove( TQStringList * );
-     virtual void unarchFileInternal();
-     virtual bool passwordRequired();
-+    virtual void createPassword();
- 
-   protected slots:
-     virtual bool processLine( const TQCString & );
-diff --git a/ark/sevenzip.cpp b/ark/sevenzip.cpp
-index 216fb8d..c1dc7a7 100644
---- a/ark/sevenzip.cpp
-+++ b/ark/sevenzip.cpp
-@@ -25,6 +25,7 @@
- */
- 
- #include <tqdir.h>
-+#include <tqtextcodec.h>
- 
- #include <kglobal.h>
- #include <klocale.h>
-@@ -120,6 +121,12 @@ void SevenZipArch::create()
-                   Arch::Extract | Arch::Delete | Arch::Add | Arch::View );
- }
- 
-+void SevenZipArch::createPassword()
-+{
-+  if( m_password.isEmpty() && ArkSettings::askCreatePassword() )
-+    KPasswordDialog::getNewPassword( m_password, i18n("Warning!\nUsing KGpg for encryption is more secure.\nCancel this dialog or enter password for %1 archiver:").arg(m_archiver_program) );
-+}
-+
- void SevenZipArch::addFile( const TQStringList & urls )
- {
-   KProcess *kp = m_currentProcess = new KProcess;
-@@ -127,6 +134,9 @@ void SevenZipArch::addFile( const TQStringList & urls )
-   kp->clearArguments();
-   *kp << m_archiver_program << "a" ;
- 
-+  if ( !m_password.isEmpty() )
-+    *kp << "-p" + m_password;
-+
-   KURL url( urls.first() );
-   TQDir::setCurrent( url.directory() );
- 
-@@ -163,6 +173,11 @@ void SevenZipArch::addDir( const TQString & dirName )
-   }
- }
- 
-+bool SevenZipArch::passwordRequired()
-+{
-+    return m_lastShellOutput.find("Enter password") >= 0;
-+}
-+
- void SevenZipArch::remove( TQStringList *list )
- {
-   if ( !list )
-@@ -212,6 +227,12 @@ void SevenZipArch::unarchFileInternal( )
-     //*kp << "-ao";
-   }
- 
-+  // FIXME overwrite existing files created with wrong password
-+  *kp << "-y";
-+
-+  if ( !m_password.isEmpty() )
-+    *kp << "-p" + m_password;
-+
-   *kp << m_filename;
- 
-   // if the file list is empty, no filenames go on the command line,
-@@ -243,12 +264,15 @@ void SevenZipArch::unarchFileInternal( )
- 
- bool SevenZipArch::processLine( const TQCString& _line )
- {
--  TQCString line( _line );
-+  TQString line;
-   TQString columns[ 11 ];
-   unsigned int pos = 0;
-   int strpos, len;
- 
--  columns[ 0 ] = line.right( line.length() - m_nameColumnPos +1);
-+  TQTextCodec *codec = TQTextCodec::codecForLocale();
-+  line = codec->toUnicode( _line );
-+
-+  columns[ 0 ] = line.right( line.length() - m_nameColumnPos);
-   line.truncate( m_nameColumnPos );
- 
-   // Go through our columns, try to pick out data, return silently on failure
-@@ -275,6 +299,8 @@ bool SevenZipArch::processLine( const TQCString& _line )
-     columns[ curCol->colRef ] = line.mid( strpos, len );
-   }
- 
-+  // Separated directories pass
-+  if(columns[4].length() && columns[4][0] == 'D') return true;
- 
-   if ( m_dateCol >= 0 )
-   {
-@@ -364,4 +390,32 @@ void SevenZipArch::slotReceivedTOC( KProcess*, char* data, int length )
-   data[ length ] = endchar;
- }
- 
-+void SevenZipArch::test()
-+{
-+  clearShellOutput();
-+
-+  KProcess *kp = m_currentProcess = new KProcess;
-+  kp->clearArguments();
-+
-+  *kp << m_unarchiver_program << "t";
-+
-+  if ( !m_password.isEmpty() )
-+    *kp << "-p" + m_password;
-+
-+  *kp << m_filename;
-+
-+  connect( kp, SIGNAL( receivedStdout(KProcess*, char*, int) ),
-+           SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
-+  connect( kp, SIGNAL( receivedStderr(KProcess*, char*, int) ),
-+           SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
-+  connect( kp, SIGNAL( processExited(KProcess*) ),
-+           SLOT( slotTestExited(KProcess*) ) );
-+
-+  if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
-+  {
-+    KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
-+    emit sigTest( false );
-+  }
-+}
-+
- #include "sevenzip.moc"
-diff --git a/ark/sevenzip.h b/ark/sevenzip.h
-index c37708b..de10693 100644
---- a/ark/sevenzip.h
-+++ b/ark/sevenzip.h
-@@ -36,12 +36,15 @@ class SevenZipArch : public Arch
-   
-     virtual void open();
-     virtual void create();
-+    virtual void test();
- 
-     virtual void addFile( const TQStringList & );
-     virtual void addDir( const TQString & );
- 
-     virtual void remove( TQStringList * );
-     virtual void unarchFileInternal( );
-+    virtual bool passwordRequired();
-+    virtual void createPassword();
- 
-   protected slots:
-     virtual bool processLine( const TQCString& line );
-diff --git a/ark/tar.cpp b/ark/tar.cpp
-index 4cdb792..1c1fac9 100644
---- a/ark/tar.cpp
-+++ b/ark/tar.cpp
-@@ -785,5 +785,42 @@ void TarArch::customEvent( TQCustomEvent *ev )
-   }
- }
- 
-+void TarArch::test()
-+{
-+  clearShellOutput();
-+
-+  KProcess *kp = m_currentProcess = new KProcess;
-+  kp->clearArguments();
-+
-+  TQString uncomp = getUnCompressor();
-+
-+  *kp << uncomp;
-+
-+  if( uncomp == "bunzip2" || uncomp == "gunzip" || uncomp == "lzop" )
-+  {
-+    *kp << "-t";
-+  }
-+  else
-+  {
-+    Arch::test();
-+    return;
-+  }
-+
-+  *kp << m_filename;
-+
-+  connect( kp, SIGNAL( receivedStdout(KProcess*, char*, int) ),
-+           SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
-+  connect( kp, SIGNAL( receivedStderr(KProcess*, char*, int) ),
-+           SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
-+  connect( kp, SIGNAL( processExited(KProcess*) ),
-+           SLOT( slotTestExited(KProcess*) ) );
-+
-+  if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
-+  {
-+    KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
-+    emit sigTest( false );
-+  }
-+}
-+
- #include "tar.moc"
- // kate: space-indent on;
-diff --git a/ark/tar.h b/ark/tar.h
-index df0d012..3b75008 100644
---- a/ark/tar.h
-+++ b/ark/tar.h
-@@ -64,6 +64,7 @@ class TarArch : public Arch
- 
- 		virtual void open();
- 		virtual void create();
-+		virtual void test();
- 
- 		virtual void addFile( const TQStringList & );
- 		virtual void addDir( const TQString & );
-diff --git a/ark/zip.cpp b/ark/zip.cpp
-index 4a647b5..1888d50 100644
---- a/ark/zip.cpp
-+++ b/ark/zip.cpp
-@@ -34,6 +34,7 @@
- #include <klocale.h>
- #include <kmessagebox.h>
- #include <kprocess.h>
-+#include <kpassdlg.h>
- 
- // ark includes
- #include "zip.h"
-@@ -114,6 +115,12 @@ void ZipArch::create()
-                  Arch::Extract | Arch::Delete | Arch::Add | Arch::View );
- }
- 
-+void ZipArch::createPassword()
-+{
-+  if( m_password.isEmpty() && ArkSettings::askCreatePassword() )
-+    KPasswordDialog::getNewPassword( m_password, i18n("Warning!\nUsing KGpg for encryption is more secure.\nCancel this dialog or enter password for %1 archiver:").arg(m_archiver_program) );
-+}
-+
- void ZipArch::addDir( const TQString & _dirName )
- {
-   if ( !_dirName.isEmpty() )
-@@ -240,7 +247,7 @@ void ZipArch::unarchFileInternal()
- 
- bool ZipArch::passwordRequired()
- {
--    return m_lastShellOutput.findRev("unable to get password\n")!=-1 || m_lastShellOutput.endsWith("password inflating\n") || m_lastShellOutput.findRev("password incorrect--reenter:")!=-1 || m_lastShellOutput.endsWith("incorrect password\n");
-+    return m_lastShellOutput.findRev("password:") >= 0 || m_lastShellOutput.findRev("unable to get password\n")!=-1 || m_lastShellOutput.endsWith("password inflating\n") || m_lastShellOutput.findRev("password incorrect--reenter:")!=-1 || m_lastShellOutput.endsWith("incorrect password\n");
- }
- 
- void ZipArch::remove( TQStringList *list )
-@@ -248,6 +255,7 @@ void ZipArch::remove( TQStringList *list )
-   if ( !list )
-     return;
- 
-+
-   KProcess *kp = m_currentProcess = new KProcess;
-   kp->clearArguments();
- 
-@@ -274,4 +282,32 @@ void ZipArch::remove( TQStringList *list )
-   }
- }
- 
-+void ZipArch::test()
-+{
-+  clearShellOutput();
-+
-+  KProcess *kp = m_currentProcess = new KProcess;
-+  kp->clearArguments();
-+
-+  *kp << m_unarchiver_program << "-t";
-+
-+  if ( !m_password.isEmpty() )
-+    *kp << "-P" << m_password;
-+
-+  *kp << m_filename;
-+
-+  connect( kp, SIGNAL( receivedStdout(KProcess*, char*, int) ),
-+           SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
-+  connect( kp, SIGNAL( receivedStderr(KProcess*, char*, int) ),
-+           SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
-+  connect( kp, SIGNAL( processExited(KProcess*) ),
-+           SLOT( slotTestExited(KProcess*) ) );
-+
-+  if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
-+  {
-+    KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
-+    emit sigTest( false );
-+  }
-+}
-+
- #include "zip.moc"
-diff --git a/ark/zip.h b/ark/zip.h
-index 28f61bd..1e31f76 100644
---- a/ark/zip.h
-+++ b/ark/zip.h
-@@ -45,6 +45,7 @@ class ZipArch : public Arch
- 
-     virtual void open();
-     virtual void create();
-+    virtual void test();
- 
-     virtual void addFile( const TQStringList & );
-     virtual void addDir( const TQString &  );
-@@ -52,6 +53,7 @@ class ZipArch : public Arch
-     virtual void remove( TQStringList * );
-     virtual void unarchFileInternal();
-     virtual bool passwordRequired();
-+    virtual void createPassword();
-   private:
-     void setHeaders();
- };
diff --git a/redhat/main/tdeutils/kdeutils-3.5.13-fix_ark_embedding.patch b/redhat/main/tdeutils/kdeutils-3.5.13-fix_ark_embedding.patch
deleted file mode 100644
index e54e84850..000000000
--- a/redhat/main/tdeutils/kdeutils-3.5.13-fix_ark_embedding.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-commit 2a1d4a67d148c750266837db16a3e7b34cf13258
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1326326096 -0600
-
-    Allow ark embedding
-    This closes Bug 670
-
-diff --git a/ark/ark_part.desktop b/ark/ark_part.desktop
-index f09a772..e62db26 100644
---- a/ark/ark_part.desktop
-+++ b/ark/ark_part.desktop
-@@ -133,4 +133,3 @@ Icon=ark
- Type=Service
- ServiceTypes=KParts/ReadOnlyPart
- X-KDE-Library=libarkpart
--Hidden=true
diff --git a/redhat/main/tdeutils/kdeutils-3.5.13-further_organise_menu.patch b/redhat/main/tdeutils/kdeutils-3.5.13-further_organise_menu.patch
deleted file mode 100644
index 3cbbe612e..000000000
--- a/redhat/main/tdeutils/kdeutils-3.5.13-further_organise_menu.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-commit b970fc42f21431495c12a97f52e6f0699b173170
-Author: Darrell Anderson <humanreadable@yahoo.com>
-Date:   1331779039 -0500
-
-    Further organize TDE Menu.
-
-diff --git a/kcalc/kcalc.desktop b/kcalc/kcalc.desktop
-index 19ae663..6481922 100644
---- a/kcalc/kcalc.desktop
-+++ b/kcalc/kcalc.desktop
-@@ -85,4 +85,4 @@ GenericName[zu]=Umshini wokubala ezenzululwazi
- Terminal=false
- Type=Application
- X-KDE-StartupNotify=true
--Categories=Qt;KDE;Utility;X-KDE-Utilities-Desktop;
-+Categories=Qt;KDE;Utility;
-diff --git a/kdelirc/irkick/irkick.desktop b/kdelirc/irkick/irkick.desktop
-index 24a17b6..2f85103 100644
---- a/kdelirc/irkick/irkick.desktop
-+++ b/kdelirc/irkick/irkick.desktop
-@@ -58,7 +58,7 @@ X-KDE-autostart-after=panel
- X-KDE-StartupNotify=false
- X-DCOP-ServiceType=Unique
- X-KDE-autostart-condition=irkickrc:General:AutoStart:false
--Categories=Qt;KDE;Utility;X-KDE-Utilities-Peripherals;
-+Categories=Qt;KDE;Utility;
- 
- Exec=irkick
- Icon=irkick
-diff --git a/kedit/KEdit.desktop b/kedit/KEdit.desktop
-index 0170151..f4e3abc 100644
---- a/kedit/KEdit.desktop
-+++ b/kedit/KEdit.desktop
-@@ -79,4 +79,4 @@ Name[xh]=Abahleli Be K
- Name[zh_TW]=KDE 編輯器
- X-KDE-StartupNotify=true
- X-DCOP-ServiceType=Multi
--Categories=Qt;KDE;Utility;TextEditor;
-+Categories=Qt;KDE;TextEditor;
-diff --git a/kfloppy/KFloppy.desktop b/kfloppy/KFloppy.desktop
-index 113a24d..e1f7a59 100644
---- a/kfloppy/KFloppy.desktop
-+++ b/kfloppy/KFloppy.desktop
-@@ -93,4 +93,4 @@ Type=Application
- Terminal=false
- X-KDE-StartupNotify=true
- X-DCOP-ServiceType=Multi
--Categories=Qt;KDE;Utility;X-KDE-Utilities-Peripherals;
-+Categories=Qt;KDE;Utility
diff --git a/redhat/main/tdeutils/kdeutils-3.5.13-klaptopdaemon_dpkg_command.patch b/redhat/main/tdeutils/kdeutils-3.5.13-klaptopdaemon_dpkg_command.patch
deleted file mode 100644
index faff103f4..000000000
--- a/redhat/main/tdeutils/kdeutils-3.5.13-klaptopdaemon_dpkg_command.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- kdeutils/klaptopdaemon/acpi.cpp.ORI	2011-11-11 17:44:28.515033721 +0100
-+++ kdeutils/klaptopdaemon/acpi.cpp	2011-11-11 17:50:52.703492308 +0100
-@@ -178,7 +178,7 @@
- 			proc << kdesu;
- 			proc << "-u";
- 			proc << "root";
--			proc <<  "dpkg-statoverride --update --add root root 6755 "+helper;
-+			proc <<  "chown root "+helper+"; chmod +s "+helper;
- 			proc.start(KProcess::Block);	// run it sync so has_acpi below sees the results
- 		}
- 	} else {
---- kdeutils/klaptopdaemon/apm.cpp.ORI	2011-11-11 17:45:11.515912373 +0100
-+++ kdeutils/klaptopdaemon/apm.cpp	2011-11-11 17:51:07.095195808 +0100
-@@ -166,7 +166,7 @@
- 			proc << kdesu;
- 			proc << "-u";
- 			proc << "root";
--			proc <<  TQString("dpkg-statoverride --update --add root root 6755 ")+apm_name;
-+			proc <<  TQString("chown root ")+apm_name+TQString("; chmod +s ")+apm_name;
- 			proc.start(KProcess::Block);	// run it sync so has_apm below sees the results
- 		}
- 	} else {
-@@ -200,7 +200,7 @@
- 			proc << kdesu;
- 			proc << "-u";
- 			proc << "root";
--			proc <<  "dpkg-statoverride --update --add root root 6755 "+helper;
-+			proc <<  "chown root "+helper+"; chmod +s "+helper;
- 			proc.start(KProcess::Block);	// run it sync so has_acpi below sees the results
- 		}
- 	} else {
diff --git a/redhat/main/tdeutils/kdeutils-3.5.13-missing_ldflags.patch b/redhat/main/tdeutils/kdeutils-3.5.13-missing_ldflags.patch
deleted file mode 100644
index 0abaa228a..000000000
--- a/redhat/main/tdeutils/kdeutils-3.5.13-missing_ldflags.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- kdeutils/kcalc/Makefile.am.ORI	2012-08-01 22:22:16.274750161 +0200
-+++ kdeutils/kcalc/Makefile.am	2012-08-01 22:23:10.181783997 +0200
-@@ -19,7 +19,7 @@
- 			kcalctype.h dlabel.h stats.h
- 
- kcalc_la_LDFLAGS = $(all_libraries) -module -avoid-version
--kcalc_la_LIBADD = $(LIB_KDEUI) knumber/libknumber.la
-+kcalc_la_LIBADD = $(LIB_KDEUI) knumber/libknumber.la $(LIB_QT) $(LIB_KDECORE)
- 
- KDE_ICON = kcalc
- 
---- kdeutils/kedit/Makefile.am.ORI	2012-08-01 22:26:20.127379647 +0200
-+++ kdeutils/kedit/Makefile.am	2012-08-01 22:26:38.144056739 +0200
-@@ -12,7 +12,7 @@
- kdeinit_LTLIBRARIES = kedit.la
- 
- kedit_la_SOURCES = kedit.cpp ktextfiledlg.cpp misc.ui color.ui prefs.kcfgc
--kedit_la_LIBADD = -lkdeprint $(LIB_KFILE)
-+kedit_la_LIBADD = -lkdeprint $(LIB_KFILE) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
- kedit_la_LDFLAGS = -module -avoid-version $(KDE_PLUGIN) $(all_libraries)
- 
- noinst_HEADERS = kedit.h ktextfiledlg.h\
---- kdeutils/khexedit/lib/Makefile.am.ORI	2012-08-01 22:28:26.956106523 +0200
-+++ kdeutils/khexedit/lib/Makefile.am	2012-08-01 22:28:33.941981315 +0200
-@@ -7,7 +7,7 @@
- # this library is used by the kbytesedit part and the khepart part
- lib_LTLIBRARIES =  libkhexeditcommon.la
- libkhexeditcommon_la_LDFLAGS = $(all_libraries) -no-undefined
--libkhexeditcommon_la_LIBADD =  controller/libkcontroller.la codecs/libkhecodecs.la $(LIB_KDECORE)
-+libkhexeditcommon_la_LIBADD =  controller/libkcontroller.la codecs/libkhecodecs.la $(LIB_KDECORE) $(LIB_QT)
- libkhexeditcommon_la_SOURCES = kcolumn.cpp kbordercolumn.cpp koffsetcolumn.cpp \
-                                kbuffercolumn.cpp kvaluecolumn.cpp kcharcolumn.cpp \
-                                kcolumnsview.cpp khexedit.cpp kbytesedit.cpp \
---- kdeutils/kregexpeditor/Makefile.am.ORI	2012-08-01 22:31:33.556720026 +0200
-+++ kdeutils/kregexpeditor/Makefile.am	2012-08-01 22:31:48.203381087 +0200
-@@ -29,7 +29,7 @@
- 
- libkregexpeditorcommon_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined
- libkregexpeditorcommon_la_LIBADD = KMultiFormListBox/libkmultiformlistbox.la \
--	KWidgetStreamer/libkwidgetstreamer.la $(LIB_KIO)
-+	KWidgetStreamer/libkwidgetstreamer.la $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
- 
- METASOURCES = AUTO
- 
---- kdeutils/ksim/library/Makefile.am.ORI	2012-08-01 22:35:30.852281916 +0200
-+++ kdeutils/ksim/library/Makefile.am	2012-08-01 22:35:39.599384576 +0200
-@@ -1,4 +1,4 @@
--lib_LTLIBRARIES = libksimcore.la
-+lib_LTLIBRARIES = libksimcore.la 
- 
- libksimcore_la_SOURCES = common.cpp themeloader.cpp \
-                                         chart.cpp label.cpp \
-@@ -7,7 +7,7 @@
-                                         pluginmodule.cpp ksimconfig.cpp
- 
- libksimcore_la_LDFLAGS = $(all_libraries) -version-info 1:0 -no-undefined
--libksimcore_la_LIBADD = $(LIB_KDEUI)
-+libksimcore_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) -lkdefx
- 
- ksiminclude_HEADERS = common.h themeloader.h \
-                                         chart.h label.h \
diff --git a/redhat/main/tdeutils/kdeutils-3.5.13-remove_more_applications.patch b/redhat/main/tdeutils/kdeutils-3.5.13-remove_more_applications.patch
deleted file mode 100644
index 108876051..000000000
--- a/redhat/main/tdeutils/kdeutils-3.5.13-remove_more_applications.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-commit 803f475286c861cb5e7c9fa4f4dfadc5d0900177
-Author: Darrell Anderson <humanreadable@yahoo.com>
-Date:   1331690354 -0500
-
-    Remove "More Applications" from TDE menu. Add Utility category to KEdit.
-    This partially resolves bug report 653.
-
---- a/kdf/kdf.desktop
-+++ b/kdf/kdf.desktop
-@@ -85,4 +85,4 @@ Terminal=false
- DocPath=kdf/index.html
- X-KDE-StartupNotify=true
- X-DCOP-ServiceType=Multi
--Categories=Qt;KDE;System;X-KDE-More;
-+Categories=Qt;KDE;System;
-diff --git a/kdf/kwikdisk.desktop b/kdf/kwikdisk.desktop
-index 28ca5b5..c723364 100644
---- a/kdf/kwikdisk.desktop
-+++ b/kdf/kwikdisk.desktop
-@@ -74,5 +74,5 @@ GenericName[zh_CN]=可移动介质工具
- GenericName[zh_TW]=可移動媒體公用程式
- GenericName[zu]=Umsebenzi Wonozindaba Ogudluzekayo
- Terminal=false
--Categories=Qt;KDE;System;X-KDE-More;
-+Categories=Qt;KDE;System;
- OnlyShowIn=KDE;
-diff --git a/kedit/KEdit.desktop b/kedit/KEdit.desktop
-index f4e3abc..0170151 100644
---- a/kedit/KEdit.desktop
-+++ b/kedit/KEdit.desktop
-@@ -79,4 +79,4 @@ Name[xh]=Abahleli Be K
- Name[zh_TW]=KDE 編輯器
- X-KDE-StartupNotify=true
- X-DCOP-ServiceType=Multi
--Categories=Qt;KDE;TextEditor;
-+Categories=Qt;KDE;Utility;TextEditor;
-diff --git a/ktimer/ktimer.desktop b/ktimer/ktimer.desktop
-index d34c43b..1d12283 100644
---- a/ktimer/ktimer.desktop
-+++ b/ktimer/ktimer.desktop
-@@ -60,4 +60,4 @@ Name[xh]=Umjongi Wexesha
- Name[zh_TW]=KDE 計時器
- X-KDE-StartupNotify=true
- X-DCOP-ServiceType=Multi
--Categories=Qt;KDE;Utility;X-KDE-More;
-+Categories=Qt;KDE;Utility;
diff --git a/redhat/main/tdeutils/kdeutils-3.5.13-reorganize_kcontrol_menu_tree.patch b/redhat/main/tdeutils/kdeutils-3.5.13-reorganize_kcontrol_menu_tree.patch
deleted file mode 100644
index 96033e314..000000000
--- a/redhat/main/tdeutils/kdeutils-3.5.13-reorganize_kcontrol_menu_tree.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-commit 7780bb7b2050cadc6b77d0adc2b0b9629365379c
-Author: Darrell Anderson <humanreadable@yahoo.com>
-Date:   1331778476 -0500
-
-    Reorganize KControl menu tree.
-    * Move former KInfoCenter items -> Hardware/Information.
-    * Move Laptop Battery -> Hardware.
-
-diff --git a/kdf/kcmdf.desktop b/kdf/kcmdf.desktop
-index 4c2613b..62cc3f6 100644
---- a/kdf/kcmdf.desktop
-+++ b/kdf/kcmdf.desktop
-@@ -2,6 +2,7 @@
- X-KDE-ModuleType=Library
- X-KDE-Library=kdf
- X-KDE-FactoryName=kdf
-+X-KDE-ParentApp=kinfocenter
- X-KDE-LocalUser=false
- Exec=kcmshell kcmdf
- Icon=kcmdf
-@@ -135,4 +136,4 @@ Comment[zh_CN]=显示挂接设备的磁盘使用率
- Comment[zh_TW]=顯示連接的設備的磁碟使用率
- Comment[zu]=Ikhombisa ukusebenziswa kwediski yamathuluzi okunyuka
- 
--Categories=Qt;KDE;X-KDE-settings-hardware;
-+Categories=Qt;KDE;X-KDE-settings-information;
-diff --git a/klaptopdaemon/applnk/laptop.desktop b/klaptopdaemon/applnk/laptop.desktop
-index 5c4101c..5a3ce26 100644
---- a/klaptopdaemon/applnk/laptop.desktop
-+++ b/klaptopdaemon/applnk/laptop.desktop
-@@ -6,7 +6,7 @@ Exec=kcmshell laptop
- Icon=laptop_battery
- Type=Application
- DocPath=kcontrol/laptop/index.html
--Categories=Qt;KDE;X-KDE-settings-power;
-+Categories=Qt;KDE;X-KDE-settings-hardware;
- Comment=Laptop Battery
- Comment[af]=Draagbare rekenaar Batery
- Comment[ar]=بطّاريّة الحاسوب المحمول
-diff --git a/klaptopdaemon/applnk/pcmcia.desktop b/klaptopdaemon/applnk/pcmcia.desktop
-index f139c2a..a519aec 100644
---- a/klaptopdaemon/applnk/pcmcia.desktop
-+++ b/klaptopdaemon/applnk/pcmcia.desktop
-@@ -2,6 +2,7 @@
- X-KDE-ModuleType=Library
- X-KDE-Library=laptop
- X-KDE-FactoryName=pcmcia
-+X-KDE-ParentApp=kinfocenter
- Exec=kcmshell pcmcia
- Icon=laptop_pcmcia
- Type=Application
-@@ -81,4 +82,4 @@ Name[pt_BR]=Cartões PCMCIA
- Name[ta]= PCMCIA
- Name[th]=อุปกรณ์ PCMCIA
- 
--Categories=Qt;KDE;X-KDE-settings-hardware;
-+Categories=Qt;KDE;X-KDE-settings-information;
diff --git a/redhat/main/tdeutils/kdeutils-3.5.13.1.spec b/redhat/main/tdeutils/kdeutils-3.5.13.1.spec
deleted file mode 100644
index 75385a030..000000000
--- a/redhat/main/tdeutils/kdeutils-3.5.13.1.spec
+++ /dev/null
@@ -1,1038 +0,0 @@
-# Avoids relinking, which breaks consolehelper
-%define dont_relink 1
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_sbindir %{tde_prefix}/sbin
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-Name:		trinity-tdeutils
-Version:	3.5.13.1
-Release:	1%{?dist}%{?_variant}
-License:	GPL
-Summary:	TDE Utilities
-Group:		Applications/System
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	kdeutils-3.5.13.1.tar.gz
-Source1:	klaptop_acpi_helper.pam
-Source2:	klaptop_acpi_helper.console
-Source3:	kcmlaptoprc
-
-Obsoletes:	trinity-kdeutils < %{version}-%{release}
-Provides:	trinity-kdeutils = %{version}-%{release}
-Obsoletes:	trinity-kdeutils-extras < %{version}-%{release}
-Provides:	trinity-kdeutils-extras = %{version}-%{release}
-Obsoletes:	tdeutils < %{version}-%{release}
-Provides:	tdeutils = %{version}-%{release}
-
-# RedHat / Fedora legacy patches
-Patch1:		kdf-3.0.2-label.patch
-
-BuildRequires:	trinity-tqtinterface-devel >= %{version}
-BuildRequires:	trinity-arts-devel >= %{version}
-BuildRequires:	trinity-tdelibs-devel >= %{version}
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	gettext
-BuildRequires:	net-snmp-devel
-BuildRequires:	python-devel
-BuildRequires:	gmp-devel
-
-%if 0%{?fedora} >= 5 || 0%{?rhel} >= 5
-BuildRequires:	libXScrnSaver-devel
-BuildRequires:	libXtst-devel
-%endif
-
-%if 0%{?fedora}
-BuildRequires:	xmms-devel
-%endif
-
-Requires: trinity-ark = %{version}-%{release}
-Requires: trinity-kcalc = %{version}-%{release}
-Requires: trinity-kcharselect = %{version}-%{release}
-Requires: trinity-kdelirc = %{version}-%{release}
-Requires: trinity-kdessh = %{version}-%{release}
-Requires: trinity-kdf = %{version}-%{release}
-Requires: trinity-kedit = %{version}-%{release}
-Requires: trinity-kfloppy = %{version}-%{release}
-Requires: trinity-kgpg = %{version}-%{release}
-Requires: trinity-khexedit = %{version}-%{release}
-Requires: trinity-kjots = %{version}-%{release}
-Requires: trinity-klaptopdaemon = %{version}-%{release}
-Requires: trinity-kmilo = %{version}-%{release}
-Requires: trinity-kmilo-legacy = %{version}-%{release}
-Requires: trinity-kregexpeditor = %{version}-%{release}
-Requires: trinity-ksim = %{version}-%{release}
-Requires: trinity-ktimer = %{version}-%{release}
-Requires: trinity-kwalletmanager = %{version}-%{release}
-Requires: trinity-superkaramba = %{version}-%{release}
-
-%files
-
-
-%description
-Utilities for the Trinity Desktop Environment, including:
-  * ark (tar/gzip archive manager)
-  * kcalc (scientific calculator)
-  * kcharselect (character selector)
-  * kdepasswd (change password)
-  * kdessh (ssh front end)
-  * kdf (view disk usage)
-  * kedit (simple text editor)
-  * kfloppy (floppy formatting tool)
-  * kgpg (gpg gui)
-  * khexedit (hex editor)
-  * kjots (note taker)
-  * klaptopdaemon (battery monitoring and management for laptops);
-  * kmilo
-  * kregexpeditor (regular expression editor)
-  * ksim (system information monitor);
-  * ktimer (task scheduler)
-  * kwikdisk (removable media utility)
-
-##########
-
-%package -n trinity-ark
-Summary:	graphical archiving tool for Trinity
-Group:		Applications/Utilities
-#Requires:	ncompress
-Requires:	unzip
-Requires:	zip
-#Requires:	zoo
-Requires:	bzip2
-#Requires:	p7zip
-Requires:	xz
-Requires:	lzma
-#Requires:	rar, unrar
-
-%description -n trinity-ark
-Ark is a graphical program for managing various archive formats within the
-TDE environment. Archives can be viewed, extracted, created and modified
-from within Ark.
- 
-The program can handle various formats such as tar, gzip, bzip2, zip, rar and
-lha (if appropriate command-line programs are installed).
-
-Ark can work closely with Konqueror in the KDE environment to handle archives,
-if you install the Konqueror Integration plugin available in the konq-plugins
-package.
-
-%files -n trinity-ark
-%defattr(-,root,root,-)
-%{tde_bindir}/ark
-%{tde_tdelibdir}/ark.la
-%{tde_tdelibdir}/ark.so
-%{tde_tdelibdir}/libarkpart.la
-%{tde_tdelibdir}/libarkpart.so
-%{tde_libdir}/lib[kt]deinit_ark.so
-%{tde_tdeappdir}/ark.desktop
-%{tde_datadir}/apps/ark/
-%{tde_datadir}/config.kcfg/ark.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/ark.png
-%{tde_datadir}/icons/hicolor/scalable/apps/ark.svgz
-%{tde_datadir}/services/ark_part.desktop
-%{tde_tdedocdir}/HTML/en/ark/
-
-%post -n trinity-ark
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-ark
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kcalc
-Summary:	calculator for Trinity
-Group:		Applications/Utilities
-
-%description -n trinity-kcalc
-KCalc is TDE's scientific calculator.
-
-It provides:
-* trigonometric functions, logic operations, and statistical calculations
-* easy cut and paste of numbers from/into its display
-* a results-stack which lets you conveniently recall previous results
-* configurable precision, and number of digits after the period
-
-%files -n trinity-kcalc
-%defattr(-,root,root,-)
-%{tde_bindir}/kcalc
-%{tde_tdelibdir}/kcalc.la
-%{tde_tdelibdir}/kcalc.so
-%{tde_libdir}/lib[kt]deinit_kcalc.so
-%{tde_tdeappdir}/kcalc.desktop
-%{tde_datadir}/apps/kcalc/
-%{tde_datadir}/apps/kconf_update/kcalcrc.upd
-%{tde_datadir}/config.kcfg/kcalc.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kcalc.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kcalc.svgz
-%{tde_tdedocdir}/HTML/en/kcalc/
-
-%post -n trinity-kcalc
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kcalc
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kcharselect
-Summary:	character selector for Trinity
-Group:		Applications/Utilities
-
-%description -n trinity-kcharselect
-A character set selector for TDE.
-
-%files -n trinity-kcharselect
-%defattr(-,root,root,-)
-%{tde_bindir}/kcharselect
-%{tde_tdelibdir}/kcharselect_panelapplet.la
-%{tde_tdelibdir}/kcharselect_panelapplet.so
-%{tde_tdeappdir}/KCharSelect.desktop
-%{tde_datadir}/apps/kcharselect/
-%{tde_datadir}/apps/kconf_update/kcharselect.upd
-%{tde_datadir}/apps/kicker/applets/kcharselectapplet.desktop
-%{tde_datadir}/icons/hicolor/*/apps/kcharselect.png
-%{tde_tdedocdir}/HTML/en/kcharselect/
-
-%post -n trinity-kcharselect
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kcharselect
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null  ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kdelirc
-Summary:	infrared control for Trinity
-Group:		Applications/Utilities
-
-%description -n trinity-kdelirc
-This is a frontend for the LIRC suite to use infrared devices with TDE.
-
-%files -n trinity-kdelirc
-%defattr(-,root,root,-)
-%{tde_bindir}/irkick
-%{tde_tdelibdir}/irkick.la
-%{tde_tdelibdir}/irkick.so
-%{tde_tdelibdir}/kcm_kcmlirc.la
-%{tde_tdelibdir}/kcm_kcmlirc.so
-%{tde_libdir}/lib[kt]deinit_irkick.so
-%{tde_tdeappdir}/irkick.desktop
-%{tde_tdeappdir}/kcmlirc.desktop
-%{tde_datadir}/apps/irkick/
-%{tde_datadir}/apps/profiles/klauncher.profile.xml
-%{tde_datadir}/apps/profiles/konqueror.profile.xml
-%{tde_datadir}/apps/profiles/noatun.profile.xml
-%{tde_datadir}/apps/profiles/profile.dtd
-%{tde_datadir}/apps/remotes/RM-0010.remote.xml
-%{tde_datadir}/apps/remotes/cimr100.remote.xml
-%{tde_datadir}/apps/remotes/hauppauge.remote.xml
-%{tde_datadir}/apps/remotes/remote.dtd
-%{tde_datadir}/apps/remotes/sherwood.remote.xml
-%{tde_datadir}/apps/remotes/sonytv.remote.xml
-%{tde_datadir}/autostart/irkick.desktop
-%{tde_datadir}/icons/hicolor/*/apps/irkick.png
-%{tde_datadir}/icons/locolor/*/apps/irkick.png
-%{tde_tdedocdir}/HTML/en/irkick/
-%{tde_tdedocdir}/HTML/en/kcmlirc/
-
-%post -n trinity-kdelirc
-/sbin/ldconfig
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kdelirc
-/sbin/ldconfig
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null  ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kdessh
-Summary:	ssh frontend for Trinity
-Group:		Applications/Utilities
-%if 0%{?suse_version}
-Requires:	openssh
-%else
-Requires:	openssh-clients
-%endif
-
-%description -n trinity-kdessh
-This package contains TDE's frontend for ssh.
-
-%files -n trinity-kdessh
-%defattr(-,root,root,-)
-%{tde_bindir}/kdessh
-
-##########
-
-%package -n trinity-kdf
-Summary:	disk space utility for Trinity
-Group:		Applications/Utilities
-
-%description -n trinity-kdf
-KDiskFree displays the available file devices (hard drive partitions, floppy
-and CD drives, etc.) along with information on their capacity, free space, type
-and mount point. It also allows you to mount and unmount drives and view them
-in a file manager.
-
-%files -n trinity-kdf
-%defattr(-,root,root,-)
-%{tde_bindir}/kdf
-%{tde_bindir}/kwikdisk
-%{tde_tdelibdir}/kcm_kdf.la
-%{tde_tdelibdir}/kcm_kdf.so
-%{tde_tdeappdir}/kcmdf.desktop
-%{tde_tdeappdir}/kdf.desktop
-%{tde_tdeappdir}/kwikdisk.desktop
-%{tde_datadir}/apps/kdf/
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmdf.png
-%{tde_datadir}/icons/hicolor/*/apps/kdf.png
-%{tde_datadir}/icons/hicolor/*/apps/kwikdisk.png
-%{tde_tdedocdir}/HTML/en/kdf/
-%{tde_tdedocdir}/HTML/en/kinfocenter/blockdevices/
-
-%post -n trinity-kdf
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kdf
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null  ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kedit
-Summary:	basic text editor for Trinity
-Group:		Applications/Utilities
-
-%description -n trinity-kedit
-A simple text editor for TDE.
-
-It can be used with Konqueror for text and configuration file browsing.
-KEdit also serves well for creating small plain text documents. KEdit's
-functionality will intentionally remain rather limited to ensure a
-reasonably fast start.
-
-%files -n trinity-kedit
-%defattr(-,root,root,-)
-%{tde_bindir}/kedit
-%{tde_tdelibdir}/kedit.la
-%{tde_tdelibdir}/kedit.so
-%{tde_libdir}/lib[kt]deinit_kedit.so
-%{tde_tdeappdir}/KEdit.desktop
-%{tde_datadir}/apps/kedit/keditui.rc
-%{tde_datadir}/config.kcfg/kedit.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kedit.png
-%{tde_tdedocdir}/HTML/en/kedit/
-
-%post -n trinity-kedit
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kedit
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null  ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kfloppy
-Summary:	floppy formatter for Trinity
-Group:		Applications/Utilities
-Requires:	dosfstools
-
-%description -n trinity-kfloppy
-Kfloppy is a utility that provides a straightforward graphical means
-to format 3.5" and 5.25" floppy disks.
-
-%files -n trinity-kfloppy
-%defattr(-,root,root,-)
-%{tde_bindir}/kfloppy
-%{tde_tdeappdir}/KFloppy.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/floppy_format.desktop
-%{tde_datadir}/icons/hicolor/*/apps/kfloppy.png
-%{tde_tdedocdir}/HTML/en/kfloppy/
-
-%post -n trinity-kfloppy
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kfloppy
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null  ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kgpg
-Summary:	GnuPG frontend for Trinity
-Group:		Applications/Utilities
-Requires:	trinity-konsole
-Requires:	gnupg
-
-%description -n trinity-kgpg
-Kgpg is a frontend for GNU Privacy Guard (GnuPG). It provides file
-encryption, file decryption and key management.
-
-Features:
-* an editor mode for easily and quickly encrypting or decrypting a file
-  or message which is typed, copied, pasted or dragged into the editor,
-  or which is double-clicked in the file manager
-* Konqueror integration for encrypting or decrypting files
-* a panel applet for encrypting / decrypting files or the clipboard
-  contents, etc.
-* key management functions (generation, import, export, deletion and
-  signing)
-* decrypting clipboard contents, including integration with Klipper
-
-%files -n trinity-kgpg
-%defattr(-,root,root,-)
-%{tde_bindir}/kgpg
-%{tde_tdeappdir}/kgpg.desktop
-%{tde_datadir}/apps/kgpg/
-%{tde_datadir}/apps/konqueror/servicemenus/encryptfile.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/encryptfolder.desktop
-%{tde_datadir}/autostart/kgpg.desktop
-%{tde_datadir}/config.kcfg/kgpg.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kgpg.png
-%{tde_tdedocdir}/HTML/en/kgpg/
-
-%post -n trinity-kgpg
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kgpg
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null  ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-khexedit
-Summary:	Trinity hex editor
-Group:		Applications/Utilities
-
-%description -n trinity-khexedit
-KHexEdit is an editor for the raw data of binary files.  It includes
-find/replace functions, bookmarks, many configuration options, drag and drop
-support and other powerful features.
-
-%files -n trinity-khexedit
-%defattr(-,root,root,-)
-%{tde_bindir}/khexedit
-%{tde_tdelibdir}/libkbyteseditwidget.la
-%{tde_tdelibdir}/libkbyteseditwidget.so
-%{tde_tdelibdir}/libkhexedit2part.la
-%{tde_tdelibdir}/libkhexedit2part.so
-%{tde_libdir}/libkhexeditcommon.so.*
-%{tde_tdeappdir}/khexedit.desktop
-%{tde_datadir}/apps/khexedit/
-%{tde_datadir}/apps/khexedit2part/khexedit2partui.rc
-%{tde_datadir}/icons/hicolor/*/apps/khexedit.png
-%{tde_datadir}/services/kbyteseditwidget.desktop
-%{tde_datadir}/services/khexedit2part.desktop
-%{tde_tdedocdir}/HTML/en/khexedit/
-
-%post -n trinity-khexedit
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-khexedit
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null  ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kjots
-Summary:	note taking utility for Trinity
-Group:		Applications/Utilities
-
-%description -n trinity-kjots
-Kjots is a small note taker program. Name and idea are taken from the jots
-program included in the tkgoodstuff package.
-
-%files -n trinity-kjots
-%defattr(-,root,root,-)
-%{tde_bindir}/kjots
-%{tde_tdeappdir}/Kjots.desktop
-%{tde_datadir}/apps/kjots/
-%{tde_datadir}/config.kcfg/kjots.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kjots.png
-%{tde_tdedocdir}/HTML/en/kjots/
-
-%post -n trinity-kjots
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kjots
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null  ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-klaptopdaemon
-Summary:	battery monitoring and management for laptops using Trinity
-Group:		Applications/Utilities
-Requires:	pm-utils
-Requires:	usermode
-
-%description -n trinity-klaptopdaemon
-This package contains utilities to monitor batteries and configure
-power management, for laptops, from within TDE.
-
-%files -n trinity-klaptopdaemon
-%defattr(-,root,root,-)
-%{tde_bindir}/klaptop_acpi_helper
-%{tde_bindir}/klaptop_check
-%{tde_tdelibdir}/kcm_laptop.la
-%{tde_tdelibdir}/kcm_laptop.so
-%{tde_tdelibdir}/kded_klaptopdaemon.la
-%{tde_tdelibdir}/kded_klaptopdaemon.so
-%{tde_libdir}/libkcmlaptop.so.*
-%{tde_tdeappdir}/laptop.desktop
-%{tde_tdeappdir}/pcmcia.desktop
-%{tde_datadir}/apps/klaptopdaemon/
-%{tde_datadir}/icons/crystalsvg/*/apps/laptop_battery.png
-%{tde_datadir}/icons/crystalsvg/*/apps/laptop_pcmcia.png
-%{tde_datadir}/icons/crystalsvg/scalable/apps/laptop_battery.svgz
-%{tde_datadir}/services/kded/klaptopdaemon.desktop
-%{tde_tdedocdir}/HTML/en/kcontrol/kcmlowbatcrit/
-%{tde_tdedocdir}/HTML/en/kcontrol/kcmlowbatwarn/
-%{tde_tdedocdir}/HTML/en/kcontrol/laptop/
-%{tde_tdedocdir}/HTML/en/kcontrol/powerctrl/
-
-# RHEL/Fedora specific
-%{_sysconfdir}/pam.d/klaptop_acpi_helper
-%attr(644,root,root) %{_sysconfdir}/security/console.apps/klaptop_acpi_helper
-%{tde_sbindir}/klaptop_acpi_helper
-%{_sbindir}/klaptop_acpi_helper
-%config %{tde_datadir}/config/kcmlaptoprc
-
-%post -n trinity-klaptopdaemon
-/sbin/ldconfig
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-klaptopdaemon
-/sbin/ldconfig
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null  ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kmilo
-Summary:	laptop special keys support for Trinity
-Group:		Applications/Utilities
-
-%description -n trinity-kmilo
-KMilo lets you use the special keys on some keyboards and laptops.
-
-Usually this includes volume keys and other features. Currently, KMilo
-comes with plugins for Powerbooks, Thinkpads, Vaios and generic keyboards
-with special keys.
-
-%files -n trinity-kmilo
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kded_kmilod.la
-%{tde_tdelibdir}/kded_kmilod.so
-%{tde_tdelibdir}/kmilo_generic.la
-%{tde_tdelibdir}/kmilo_generic.so
-%{tde_libdir}/libkmilo.so.*
-%{tde_datadir}/services/kded/kmilod.desktop
-%{tde_datadir}/services/kmilo/kmilo_generic.desktop
-%{tde_datadir}/servicetypes/kmilo/kmilopluginsvc.desktop
-
-%post -n trinity-kmilo
-/sbin/ldconfig
-
-%postun -n trinity-kmilo
-/sbin/ldconfig
-
-##########
-
-%package -n trinity-kmilo-legacy
-Summary:	non-standard plugins for KMilo
-Group:		Applications/Utilities
-Requires:	trinity-kmilo = %{version}-%{release}
-
-%description -n trinity-kmilo-legacy
-KMilo lets you use the special keys on some keyboards and laptops.
-
-Usually this includes volume keys and other features. Currently, KMilo
-comes with plugins for Powerbooks, Thinkpads and Vaios.
-
-The intention is that all laptops work with the generic kmilo
-plugin, if you need this package please file a bug.
-
-%files -n trinity-kmilo-legacy
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kcm_kvaio.la
-%{tde_tdelibdir}/kcm_kvaio.so
-%{tde_tdelibdir}/kcm_thinkpad.la
-%{tde_tdelibdir}/kcm_thinkpad.so
-%{tde_tdelibdir}/kmilo_asus.la
-%{tde_tdelibdir}/kmilo_asus.so
-%{tde_tdelibdir}/kmilo_delli8k.la
-%{tde_tdelibdir}/kmilo_delli8k.so
-%{tde_tdelibdir}/kmilo_kvaio.la
-%{tde_tdelibdir}/kmilo_kvaio.so
-%{tde_tdelibdir}/kmilo_thinkpad.la
-%{tde_tdelibdir}/kmilo_thinkpad.so
-%{tde_tdeappdir}/kvaio.desktop
-%{tde_tdeappdir}/thinkpad.desktop
-%{tde_datadir}/services/kmilo/kmilo_asus.desktop
-%{tde_datadir}/services/kmilo/kmilo_delli8k.desktop
-%{tde_datadir}/services/kmilo/kmilo_kvaio.desktop
-%{tde_datadir}/services/kmilo/kmilo_thinkpad.desktop
-
-##########
-
-%package -n trinity-kregexpeditor
-Summary:	graphical regular expression editor plugin for Trinity
-Group:		Applications/Utilities
-
-%description -n trinity-kregexpeditor
-This package contains a graphical regular expression editor plugin for use
-with TDE. It let you draw your regular expression in an unambiguous way.
-
-%files -n trinity-kregexpeditor
-%defattr(-,root,root,-)
-%{tde_bindir}/kregexpeditor
-%{tde_tdelibdir}/libkregexpeditorgui.la
-%{tde_tdelibdir}/libkregexpeditorgui.so
-%{tde_libdir}/libkregexpeditorcommon.so.*
-%{tde_tdeappdir}/kregexpeditor.desktop
-%{tde_datadir}/apps/kregexpeditor/
-%{tde_datadir}/icons/hicolor/*/apps/kregexpeditor.png
-%{tde_datadir}/services/kregexpeditorgui.desktop
-%{tde_tdedocdir}/HTML/en/KRegExpEditor/
-
-%post -n trinity-kregexpeditor
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kregexpeditor
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null  ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-ksim
-Summary:	system information monitor for Trinity
-Group:		Applications/Utilities
-
-%description -n trinity-ksim
-KSim is a system monitor app which has its own plugin system with support
-for GKrellm skins. It allows users to follow uptime, memory usage, network
-connections, power, etc.
-
-%files -n trinity-ksim
-%defattr(-,root,root,-)
-%config %{tde_datadir}/config/ksim_panelextensionrc
-%{tde_tdelibdir}/ksim_*.la
-%{tde_tdelibdir}/ksim_*.so
-%{tde_libdir}/libksimcore.so.*
-%{tde_datadir}/apps/kicker/extensions/ksim.desktop
-%{tde_datadir}/apps/ksim/
-%{tde_tdedocdir}/HTML/en/ksim/
-%{tde_datadir}/icons/crystalsvg/*/apps/ksim.png
-%{tde_datadir}/icons/crystalsvg/*/devices/ksim_cpu.png
-
-%post -n trinity-ksim
-/sbin/ldconfig
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-
-%postun -n trinity-ksim
-/sbin/ldconfig
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null  ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-
-##########
-
-%package -n trinity-ktimer
-Summary:	timer utility for Trinity
-Group:		Applications/Utilities
-
-%description -n trinity-ktimer
-This is a timer application for TDE. It allows you to execute commands after
-a certain amount of time. It supports looping commands as well as delayed
-command execution.
-
-%files -n trinity-ktimer
-%defattr(-,root,root,-)
-%{tde_bindir}/ktimer
-%{tde_tdeappdir}/ktimer.desktop
-%{tde_datadir}/icons/hicolor/*/apps/ktimer.png
-%{tde_tdedocdir}/HTML/en/ktimer/
-
-%post -n trinity-ktimer
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-ktimer
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kwalletmanager
-Summary:	wallet manager for Trinity
-Group:		Applications/Utilities
-
-%description -n trinity-kwalletmanager
-This program keeps various wallets for any kind of data that the user can
-store encrypted with passwords and can also serve as a password manager that
-keeps a master password to all wallets.
-
-%files -n trinity-kwalletmanager
-%defattr(-,root,root,-)
-%{tde_bindir}/kwalletmanager
-%{tde_tdelibdir}/kcm_kwallet.la
-%{tde_tdelibdir}/kcm_kwallet.so
-%{tde_tdeappdir}/kwalletconfig.desktop
-%{tde_tdeappdir}/kwalletmanager.desktop
-%{tde_tdeappdir}/kwalletmanager-kwalletd.desktop
-%{tde_datadir}/apps/kwalletmanager/
-%{tde_datadir}/icons/hicolor/*/apps/kwalletmanager.png
-%{tde_datadir}/services/kwallet_config.desktop
-%{tde_datadir}/services/kwalletmanager_show.desktop
-%{tde_tdedocdir}/HTML/en/kwallet/
-
-%post -n trinity-kwalletmanager
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kwalletmanager
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-superkaramba
-Summary:	a program based on karamba improving the eyecandy of TDE
-Group:		Applications/Utilities
-
-%description -n trinity-superkaramba
-SuperKaramba is a tool based on karamba that allows anyone to easily create
-and run little interactive widgets on a TDE desktop. Widgets are defined in a
-simple text file and can be augmented with Python code to make them
-interactive.
-
-Here are just some examples of the things that can be done:
-* Display system information such as CPU Usage, MP3 playing, etc.
-* Create cool custom toolbars that work any way imaginable.
-* Create little games or virtual pets that live on your desktop.
-* Display information from the internet, such as weather and headlines.
-
-%files -n trinity-superkaramba
-%defattr(-,root,root,-)
-%{tde_bindir}/superkaramba
-%{tde_datadir}/applnk/Utilities/superkaramba.desktop
-%{tde_datadir}/apps/superkaramba/superkarambaui.rc
-%{tde_datadir}/icons/crystalsvg/*/apps/superkaramba.png
-%{tde_datadir}/icons/crystalsvg/*/mimetypes/superkaramba_theme.png
-%{tde_datadir}/icons/crystalsvg/scalable/apps/superkaramba.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/mimetypes/superkaramba_theme.svgz
-%{tde_datadir}/mimelnk/application/x-superkaramba.desktop
-%{tde_tdedocdir}/HTML/en/superkaramba/
-
-%post -n trinity-superkaramba
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-
-%postun -n trinity-superkaramba
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-
-##########
-
-# afaik, nobody BR's it, and it pulls kdeutils into multilib -- Rex
-%package devel
-Summary:	Development files for %{name} 
-Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	trinity-tdelibs-devel
-
-Obsoletes:	trinity-kdeutils-devel < %{version}-%{release}
-Provides:	trinity-kdeutils-devel = %{version}-%{release}
-Obsoletes:	tdeutils-devel < %{version}-%{release}
-Provides:	tdeutils-devel = %{version}-%{release}
-
-%description devel
-Development files for %{name}.
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/*
-%{tde_libdir}/libkcmlaptop.la
-%{tde_libdir}/libkcmlaptop.so
-%{tde_libdir}/lib[kt]deinit_ark.la
-%{tde_libdir}/lib[kt]deinit_irkick.la
-%{tde_libdir}/lib[kt]deinit_kcalc.la
-%{tde_libdir}/lib[kt]deinit_kedit.la
-%{tde_libdir}/libkmilo.la
-%{tde_libdir}/libkmilo.so
-%{tde_libdir}/libkregexpeditorcommon.la
-%{tde_libdir}/libkregexpeditorcommon.so
-%{tde_libdir}/libksimcore.la
-%{tde_libdir}/libksimcore.so
-%{tde_libdir}/libkhexeditcommon.la
-%{tde_libdir}/libkhexeditcommon.so
-
-%post devel
-/sbin/ldconfig
-
-%postun devel
-/sbin/ldconfig
-
-##########
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n kdeutils-3.5.13.1
-
-%patch1 -p1 -b .label
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i "admin/acinclude.m4.in" \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-%build
-unset QTDIR || : ; source /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-# Do not build against any "/usr" installed KDE
-export KDEDIR=%{tde_prefix}
-
-# Specific path for RHEL4
-if [ -d /usr/X11R6 ]; then
-  export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-%configure \
-   --prefix=%{tde_prefix} \
-   --exec-prefix=%{tde_prefix} \
-   --bindir=%{tde_bindir} \
-   --libdir=%{tde_libdir} \
-   --datadir=%{tde_datadir} \
-   --includedir=%{tde_tdeincludedir} \
-   --enable-new-ldflags \
-   --disable-dependency-tracking \
-   --disable-rpath \
-   --disable-debug --disable-warnings \
-   --enable-final \
-   --includedir=%{tde_tdeincludedir} \
-   --with-snmp \
-%if 0%{?fedora}
-   --with-xmms \
-%else
-   --without-xmms \
-%endif
-   --with-xscreensaver \
-   --with-extra-includes=%{tde_includedir}/tqt \
-   --enable-closure
-   
-%__make %{?_smp_mflags}
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot}
-
-# Show only in KDE (really? -- Rex)
-for i in kcalc kregexpeditor Kjots ktimer kdf kcmdf ksim KFloppy KEdit \
-  KCharSelect ark kwalletmanager kwalletconfig \
- irkick kcmlirc laptop pcmcia kvaio thinkpad kwikdisk; do
- if [ -f %{buildroot}%{tde_datadir}/applications/kde/$i.desktop ] ; then
-   echo "OnlyShowIn=KDE;" >> %{buildroot}%{tde_datadir}/applications/kde/$i.desktop
- fi
-done
-
-## File lists
-# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-for lang_dir in %{buildroot}$HTML_DIR/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
-      done
-    popd
-    pushd $lang_dir/kcontrol
-      for i in *; do
-        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../../common $i/common
-      done
-    popd
-  fi
-done
-fi
-
-# using pam
-%__install -p -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pam.d/klaptop_acpi_helper
-%__install -p -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/security/console.apps/klaptop_acpi_helper
-
-# Use consolehelper for 'klaptop_acpi_helper'
-%__mkdir_p %{buildroot}%{tde_sbindir} %{buildroot}%{_sbindir}
-%__mv %{buildroot}%{tde_bindir}/klaptop_acpi_helper %{buildroot}%{tde_sbindir}
-%__ln_s %{_bindir}/consolehelper %{buildroot}%{tde_bindir}/klaptop_acpi_helper
-%if "%{tde_prefix}" != "/usr"
-%__ln_s %{tde_sbindir}/klaptop_acpi_helper %{?buildroot}%{_sbindir}/klaptop_acpi_helper
-%endif
-
-# klaptop setting
-%__install -p -D -m 644 %{SOURCE3} %{buildroot}%{tde_datadir}/config/kcmlaptoprc
-
-
-%clean
-%__rm -rf %{?buildroot}
-
-
-
-%changelog
-* Sun Sep 30 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial release for TDE 3.5.13.1
diff --git a/redhat/main/tdeutils/kdeutils-3.5.13.2-rhel4.patch b/redhat/main/tdeutils/kdeutils-3.5.13.2-rhel4.patch
deleted file mode 100644
index ddc9c77e4..000000000
--- a/redhat/main/tdeutils/kdeutils-3.5.13.2-rhel4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trinity-tdeutils-3.5.13.2/ConfigureChecks.cmake.rhel4	2013-01-09 02:43:16.000000000 +0100
-+++ trinity-tdeutils-3.5.13.2/ConfigureChecks.cmake	2013-03-10 16:25:27.108634832 +0100
-@@ -109,8 +107,6 @@
-       set( CMAKE_REQUIRED_LIBRARIES )
-       set( HAVE_DPMS 1 )
-     endif( WITH_DPMS )
--  else( XEXT_FOUND )
--    tde_message_fatal( "libXext is requested, but was not found on your system" )
-   endif( XEXT_FOUND )
- endif( )
- 
diff --git a/redhat/main/tdeutils/kdeutils-3.5.13.spec b/redhat/main/tdeutils/kdeutils-3.5.13.spec
deleted file mode 100644
index d85cfc7d4..000000000
--- a/redhat/main/tdeutils/kdeutils-3.5.13.spec
+++ /dev/null
@@ -1,1076 +0,0 @@
-# Avoids relinking, which breaks consolehelper
-%define dont_relink 1
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_sbindir %{tde_prefix}/sbin
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-Name:		trinity-tdeutils
-Version:	3.5.13
-Release:	7%{?dist}%{?_variant}
-License:	GPL
-Summary:	TDE Utilities
-Group:		Applications/System
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	kdeutils-%{version}.tar.gz
-Source1:	klaptop_acpi_helper.pam
-Source2:	klaptop_acpi_helper.console
-Source3:	kcmlaptoprc
-
-Obsoletes:	trinity-kdeutils < %{version}-%{release}
-Provides:	trinity-kdeutils = %{version}-%{release}
-Obsoletes:	trinity-kdeutils-extras < %{version}-%{release}
-Provides:	trinity-kdeutils-extras = %{version}-%{release}
-Obsoletes:	tdeutils < %{version}-%{release}
-Provides:	tdeutils = %{version}-%{release}
-
-# RedHat / Fedora legacy patches
-Patch1:		kdf-3.0.2-label.patch
-
-# TDE 3.5.13 RHEL/Fedora patches
-## [kdeutils/klaptodaemon] removes dpkg commands [Commit #1e1a776f]
-Patch2:		kdeutils-3.5.13-klaptopdaemon_dpkg_command.patch
-## [tdeutils] Allow ark embedding [Bug #670] [Commit #2a1d4a67]
-Patch3:		kdeutils-3.5.13-fix_ark_embedding.patch
-## [tdeutils] Remove "More Applications" from TDE menu. Add Utility category to KEdit. [Bug #653] [Commit #803f4752]
-Patch4:		kdeutils-3.5.13-remove_more_applications.patch
-## [tdeutils] Reorganize KControl menu tree. [Commit #7780bb7b]
-##   * Move former KInfoCenter items -> Hardware/Information.
-##   * Move Laptop Battery -> Hardware.
-Patch5:		kdeutils-3.5.13-reorganize_kcontrol_menu_tree.patch
-## [tdeutils] Further organize TDE Menu. [Commit #b970fc42]
-Patch6:		kdeutils-3.5.13-further_organise_menu.patch
-## [tdeutils] [Ark] Repairs and extensions [Bug #1030] [Commit #1c84948d]
-##  Added support for Arj
-##  Added support for check archives
-##  Added support for password processing
-##  Fix show broken filenames into real UTF-8
-Patch7:		kdeutils-3.5.13-ark_repairs_and_extensions.patch
-# [kdeutils] Missing LDFLAGS cause FTBFS on Mageia 2
-Patch8:		kdeutils-3.5.13-missing_ldflags.patch
-
-BuildRequires:	tqtinterface-devel >= 3.5.13
-BuildRequires:	trinity-arts-devel >= 3.5.13
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	gettext
-BuildRequires:	net-snmp-devel
-BuildRequires:	python-devel
-BuildRequires:	gmp-devel
-
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
-BuildRequires:	libXScrnSaver-devel
-BuildRequires:	libXtst-devel
-%endif
-
-%if 0%{?fedora}
-BuildRequires:	xmms-devel
-%endif
-
-Requires: trinity-ark = %{version}-%{release}
-Requires: trinity-kcalc = %{version}-%{release}
-Requires: trinity-kcharselect = %{version}-%{release}
-Requires: trinity-kdelirc = %{version}-%{release}
-Requires: trinity-kdessh = %{version}-%{release}
-Requires: trinity-kdf = %{version}-%{release}
-Requires: trinity-kedit = %{version}-%{release}
-Requires: trinity-kfloppy = %{version}-%{release}
-Requires: trinity-kgpg = %{version}-%{release}
-Requires: trinity-khexedit = %{version}-%{release}
-Requires: trinity-kjots = %{version}-%{release}
-Requires: trinity-klaptopdaemon = %{version}-%{release}
-Requires: trinity-kmilo = %{version}-%{release}
-Requires: trinity-kmilo-legacy = %{version}-%{release}
-Requires: trinity-kregexpeditor = %{version}-%{release}
-Requires: trinity-ksim = %{version}-%{release}
-Requires: trinity-ktimer = %{version}-%{release}
-Requires: trinity-kwalletmanager = %{version}-%{release}
-Requires: trinity-superkaramba = %{version}-%{release}
-
-%files
-
-
-%description
-Utilities for the Trinity Desktop Environment, including:
-  * ark (tar/gzip archive manager)
-  * kcalc (scientific calculator)
-  * kcharselect (character selector)
-  * kdepasswd (change password)
-  * kdessh (ssh front end)
-  * kdf (view disk usage)
-  * kedit (simple text editor)
-  * kfloppy (floppy formatting tool)
-  * kgpg (gpg gui)
-  * khexedit (hex editor)
-  * kjots (note taker)
-  * klaptopdaemon (battery monitoring and management for laptops);
-  * kmilo
-  * kregexpeditor (regular expression editor)
-  * ksim (system information monitor);
-  * ktimer (task scheduler)
-  * kwikdisk (removable media utility)
-
-##########
-
-%package -n trinity-ark
-Summary:	graphical archiving tool for Trinity
-Group:		Applications/Utilities
-#Requires:	ncompress
-Requires:	unzip
-Requires:	zip
-#Requires:	zoo
-Requires:	bzip2
-#Requires:	p7zip
-Requires:	xz
-Requires:	lzma
-#Requires:	rar, unrar
-
-%description -n trinity-ark
-Ark is a graphical program for managing various archive formats within the
-TDE environment. Archives can be viewed, extracted, created and modified
-from within Ark.
- 
-The program can handle various formats such as tar, gzip, bzip2, zip, rar and
-lha (if appropriate command-line programs are installed).
-
-Ark can work closely with Konqueror in the KDE environment to handle archives,
-if you install the Konqueror Integration plugin available in the konq-plugins
-package.
-
-%files -n trinity-ark
-%defattr(-,root,root,-)
-%{tde_bindir}/ark
-%{tde_tdelibdir}/ark.la
-%{tde_tdelibdir}/ark.so
-%{tde_tdelibdir}/libarkpart.la
-%{tde_tdelibdir}/libarkpart.so
-%{tde_libdir}/lib[kt]deinit_ark.so
-%{tde_tdeappdir}/ark.desktop
-%{tde_datadir}/apps/ark/
-%{tde_datadir}/config.kcfg/ark.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/ark.png
-%{tde_datadir}/icons/hicolor/scalable/apps/ark.svgz
-%{tde_datadir}/services/ark_part.desktop
-%{tde_tdedocdir}/HTML/en/ark/
-
-%post -n trinity-ark
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-ark
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kcalc
-Summary:	calculator for Trinity
-Group:		Applications/Utilities
-
-%description -n trinity-kcalc
-KCalc is TDE's scientific calculator.
-
-It provides:
-* trigonometric functions, logic operations, and statistical calculations
-* easy cut and paste of numbers from/into its display
-* a results-stack which lets you conveniently recall previous results
-* configurable precision, and number of digits after the period
-
-%files -n trinity-kcalc
-%defattr(-,root,root,-)
-%{tde_bindir}/kcalc
-%{tde_tdelibdir}/kcalc.la
-%{tde_tdelibdir}/kcalc.so
-%{tde_libdir}/lib[kt]deinit_kcalc.so
-%{tde_tdeappdir}/kcalc.desktop
-%{tde_datadir}/apps/kcalc/
-%{tde_datadir}/apps/kconf_update/kcalcrc.upd
-%{tde_datadir}/config.kcfg/kcalc.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kcalc.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kcalc.svgz
-%{tde_tdedocdir}/HTML/en/kcalc/
-
-%post -n trinity-kcalc
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kcalc
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kcharselect
-Summary:	character selector for Trinity
-Group:		Applications/Utilities
-
-%description -n trinity-kcharselect
-A character set selector for TDE.
-
-%files -n trinity-kcharselect
-%defattr(-,root,root,-)
-%{tde_bindir}/kcharselect
-%{tde_tdelibdir}/kcharselect_panelapplet.la
-%{tde_tdelibdir}/kcharselect_panelapplet.so
-%{tde_tdeappdir}/KCharSelect.desktop
-%{tde_datadir}/apps/kcharselect/
-%{tde_datadir}/apps/kconf_update/kcharselect.upd
-%{tde_datadir}/apps/kicker/applets/kcharselectapplet.desktop
-%{tde_datadir}/icons/hicolor/*/apps/kcharselect.png
-%{tde_tdedocdir}/HTML/en/kcharselect/
-
-%post -n trinity-kcharselect
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kcharselect
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null  ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kdelirc
-Summary:	infrared control for Trinity
-Group:		Applications/Utilities
-
-%description -n trinity-kdelirc
-This is a frontend for the LIRC suite to use infrared devices with TDE.
-
-%files -n trinity-kdelirc
-%defattr(-,root,root,-)
-%{tde_bindir}/irkick
-%{tde_tdelibdir}/irkick.la
-%{tde_tdelibdir}/irkick.so
-%{tde_tdelibdir}/kcm_kcmlirc.la
-%{tde_tdelibdir}/kcm_kcmlirc.so
-%{tde_libdir}/lib[kt]deinit_irkick.so
-%{tde_tdeappdir}/irkick.desktop
-%{tde_tdeappdir}/kcmlirc.desktop
-%{tde_datadir}/apps/irkick/
-%{tde_datadir}/apps/profiles/klauncher.profile.xml
-%{tde_datadir}/apps/profiles/konqueror.profile.xml
-%{tde_datadir}/apps/profiles/noatun.profile.xml
-%{tde_datadir}/apps/profiles/profile.dtd
-%{tde_datadir}/apps/remotes/RM-0010.remote.xml
-%{tde_datadir}/apps/remotes/cimr100.remote.xml
-%{tde_datadir}/apps/remotes/hauppauge.remote.xml
-%{tde_datadir}/apps/remotes/remote.dtd
-%{tde_datadir}/apps/remotes/sherwood.remote.xml
-%{tde_datadir}/apps/remotes/sonytv.remote.xml
-%{tde_datadir}/autostart/irkick.desktop
-%{tde_datadir}/icons/hicolor/*/apps/irkick.png
-%{tde_datadir}/icons/locolor/*/apps/irkick.png
-%{tde_tdedocdir}/HTML/en/irkick/
-%{tde_tdedocdir}/HTML/en/kcmlirc/
-
-%post -n trinity-kdelirc
-/sbin/ldconfig
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kdelirc
-/sbin/ldconfig
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null  ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kdessh
-Summary:	ssh frontend for Trinity
-Group:		Applications/Utilities
-Requires:	openssh-clients
-
-%description -n trinity-kdessh
-This package contains TDE's frontend for ssh.
-
-%files -n trinity-kdessh
-%defattr(-,root,root,-)
-%{tde_bindir}/kdessh
-
-##########
-
-%package -n trinity-kdf
-Summary:	disk space utility for Trinity
-Group:		Applications/Utilities
-
-%description -n trinity-kdf
-KDiskFree displays the available file devices (hard drive partitions, floppy
-and CD drives, etc.) along with information on their capacity, free space, type
-and mount point. It also allows you to mount and unmount drives and view them
-in a file manager.
-
-%files -n trinity-kdf
-%defattr(-,root,root,-)
-%{tde_bindir}/kdf
-%{tde_bindir}/kwikdisk
-%{tde_tdelibdir}/kcm_kdf.la
-%{tde_tdelibdir}/kcm_kdf.so
-%{tde_tdeappdir}/kcmdf.desktop
-%{tde_tdeappdir}/kdf.desktop
-%{tde_tdeappdir}/kwikdisk.desktop
-%{tde_datadir}/apps/kdf/
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmdf.png
-%{tde_datadir}/icons/hicolor/*/apps/kdf.png
-%{tde_datadir}/icons/hicolor/*/apps/kwikdisk.png
-%{tde_tdedocdir}/HTML/en/kdf/
-%{tde_tdedocdir}/HTML/en/kinfocenter/blockdevices/
-
-%post -n trinity-kdf
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kdf
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null  ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kedit
-Summary:	basic text editor for Trinity
-Group:		Applications/Utilities
-
-%description -n trinity-kedit
-A simple text editor for TDE.
-
-It can be used with Konqueror for text and configuration file browsing.
-KEdit also serves well for creating small plain text documents. KEdit's
-functionality will intentionally remain rather limited to ensure a
-reasonably fast start.
-
-%files -n trinity-kedit
-%defattr(-,root,root,-)
-%{tde_bindir}/kedit
-%{tde_tdelibdir}/kedit.la
-%{tde_tdelibdir}/kedit.so
-%{tde_libdir}/lib[kt]deinit_kedit.so
-%{tde_tdeappdir}/KEdit.desktop
-%{tde_datadir}/apps/kedit/keditui.rc
-%{tde_datadir}/config.kcfg/kedit.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kedit.png
-%{tde_tdedocdir}/HTML/en/kedit/
-
-%post -n trinity-kedit
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kedit
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null  ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kfloppy
-Summary:	floppy formatter for Trinity
-Group:		Applications/Utilities
-Requires:	dosfstools
-
-%description -n trinity-kfloppy
-Kfloppy is a utility that provides a straightforward graphical means
-to format 3.5" and 5.25" floppy disks.
-
-%files -n trinity-kfloppy
-%defattr(-,root,root,-)
-%{tde_bindir}/kfloppy
-%{tde_tdeappdir}/KFloppy.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/floppy_format.desktop
-%{tde_datadir}/icons/hicolor/*/apps/kfloppy.png
-%{tde_tdedocdir}/HTML/en/kfloppy/
-
-%post -n trinity-kfloppy
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kfloppy
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null  ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kgpg
-Summary:	GnuPG frontend for Trinity
-Group:		Applications/Utilities
-Requires:	trinity-konsole
-Requires:	gnupg
-
-%description -n trinity-kgpg
-Kgpg is a frontend for GNU Privacy Guard (GnuPG). It provides file
-encryption, file decryption and key management.
-
-Features:
-* an editor mode for easily and quickly encrypting or decrypting a file
-  or message which is typed, copied, pasted or dragged into the editor,
-  or which is double-clicked in the file manager
-* Konqueror integration for encrypting or decrypting files
-* a panel applet for encrypting / decrypting files or the clipboard
-  contents, etc.
-* key management functions (generation, import, export, deletion and
-  signing)
-* decrypting clipboard contents, including integration with Klipper
-
-%files -n trinity-kgpg
-%defattr(-,root,root,-)
-%{tde_bindir}/kgpg
-%{tde_tdeappdir}/kgpg.desktop
-%{tde_datadir}/apps/kgpg/
-%{tde_datadir}/apps/konqueror/servicemenus/encryptfile.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/encryptfolder.desktop
-%{tde_datadir}/autostart/kgpg.desktop
-%{tde_datadir}/config.kcfg/kgpg.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kgpg.png
-%{tde_tdedocdir}/HTML/en/kgpg/
-
-%post -n trinity-kgpg
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kgpg
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null  ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-khexedit
-Summary:	Trinity hex editor
-Group:		Applications/Utilities
-
-%description -n trinity-khexedit
-KHexEdit is an editor for the raw data of binary files.  It includes
-find/replace functions, bookmarks, many configuration options, drag and drop
-support and other powerful features.
-
-%files -n trinity-khexedit
-%defattr(-,root,root,-)
-%{tde_bindir}/khexedit
-%{tde_tdelibdir}/libkbyteseditwidget.la
-%{tde_tdelibdir}/libkbyteseditwidget.so
-%{tde_tdelibdir}/libkhexedit2part.la
-%{tde_tdelibdir}/libkhexedit2part.so
-%{tde_libdir}/libkhexeditcommon.so.*
-%{tde_tdeappdir}/khexedit.desktop
-%{tde_datadir}/apps/khexedit/
-%{tde_datadir}/apps/khexedit2part/khexedit2partui.rc
-%{tde_datadir}/icons/hicolor/*/apps/khexedit.png
-%{tde_datadir}/services/kbyteseditwidget.desktop
-%{tde_datadir}/services/khexedit2part.desktop
-%{tde_tdedocdir}/HTML/en/khexedit/
-
-%post -n trinity-khexedit
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-khexedit
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null  ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kjots
-Summary:	note taking utility for Trinity
-Group:		Applications/Utilities
-
-%description -n trinity-kjots
-Kjots is a small note taker program. Name and idea are taken from the jots
-program included in the tkgoodstuff package.
-
-%files -n trinity-kjots
-%defattr(-,root,root,-)
-%{tde_bindir}/kjots
-%{tde_tdeappdir}/Kjots.desktop
-%{tde_datadir}/apps/kjots/
-%{tde_datadir}/config.kcfg/kjots.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kjots.png
-%{tde_tdedocdir}/HTML/en/kjots/
-
-%post -n trinity-kjots
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kjots
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null  ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-klaptopdaemon
-Summary:	battery monitoring and management for laptops using Trinity
-Group:		Applications/Utilities
-Requires:	pm-utils
-Requires:	usermode
-
-%description -n trinity-klaptopdaemon
-This package contains utilities to monitor batteries and configure
-power management, for laptops, from within TDE.
-
-%files -n trinity-klaptopdaemon
-%defattr(-,root,root,-)
-%{tde_bindir}/klaptop_acpi_helper
-%{tde_bindir}/klaptop_check
-%{tde_tdelibdir}/kcm_laptop.la
-%{tde_tdelibdir}/kcm_laptop.so
-%{tde_tdelibdir}/kded_klaptopdaemon.la
-%{tde_tdelibdir}/kded_klaptopdaemon.so
-%{tde_libdir}/libkcmlaptop.so.*
-%{tde_tdeappdir}/laptop.desktop
-%{tde_tdeappdir}/pcmcia.desktop
-%{tde_datadir}/apps/klaptopdaemon/
-%{tde_datadir}/icons/crystalsvg/*/apps/laptop_battery.png
-%{tde_datadir}/icons/crystalsvg/*/apps/laptop_pcmcia.png
-%{tde_datadir}/icons/crystalsvg/scalable/apps/laptop_battery.svgz
-%{tde_datadir}/services/kded/klaptopdaemon.desktop
-%{tde_tdedocdir}/HTML/en/kcontrol/kcmlowbatcrit/
-%{tde_tdedocdir}/HTML/en/kcontrol/kcmlowbatwarn/
-%{tde_tdedocdir}/HTML/en/kcontrol/laptop/
-%{tde_tdedocdir}/HTML/en/kcontrol/powerctrl/
-
-# RHEL/Fedora specific
-%{_sysconfdir}/pam.d/klaptop_acpi_helper
-%attr(644,root,root) %{_sysconfdir}/security/console.apps/klaptop_acpi_helper
-%{tde_sbindir}/klaptop_acpi_helper
-%{_sbindir}/klaptop_acpi_helper
-%config %{tde_datadir}/config/kcmlaptoprc
-
-%post -n trinity-klaptopdaemon
-/sbin/ldconfig
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-klaptopdaemon
-/sbin/ldconfig
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null  ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kmilo
-Summary:	laptop special keys support for Trinity
-Group:		Applications/Utilities
-
-%description -n trinity-kmilo
-KMilo lets you use the special keys on some keyboards and laptops.
-
-Usually this includes volume keys and other features. Currently, KMilo
-comes with plugins for Powerbooks, Thinkpads, Vaios and generic keyboards
-with special keys.
-
-%files -n trinity-kmilo
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kded_kmilod.la
-%{tde_tdelibdir}/kded_kmilod.so
-%{tde_tdelibdir}/kmilo_generic.la
-%{tde_tdelibdir}/kmilo_generic.so
-%{tde_libdir}/libkmilo.so.*
-%{tde_datadir}/services/kded/kmilod.desktop
-%{tde_datadir}/services/kmilo/kmilo_generic.desktop
-%{tde_datadir}/servicetypes/kmilo/kmilopluginsvc.desktop
-
-%post -n trinity-kmilo
-/sbin/ldconfig
-
-%postun -n trinity-kmilo
-/sbin/ldconfig
-
-##########
-
-%package -n trinity-kmilo-legacy
-Summary:	non-standard plugins for KMilo
-Group:		Applications/Utilities
-Requires:	trinity-kmilo = %{version}-%{release}
-
-%description -n trinity-kmilo-legacy
-KMilo lets you use the special keys on some keyboards and laptops.
-
-Usually this includes volume keys and other features. Currently, KMilo
-comes with plugins for Powerbooks, Thinkpads and Vaios.
-
-The intention is that all laptops work with the generic kmilo
-plugin, if you need this package please file a bug.
-
-%files -n trinity-kmilo-legacy
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kcm_kvaio.la
-%{tde_tdelibdir}/kcm_kvaio.so
-%{tde_tdelibdir}/kcm_thinkpad.la
-%{tde_tdelibdir}/kcm_thinkpad.so
-%{tde_tdelibdir}/kmilo_asus.la
-%{tde_tdelibdir}/kmilo_asus.so
-%{tde_tdelibdir}/kmilo_delli8k.la
-%{tde_tdelibdir}/kmilo_delli8k.so
-%{tde_tdelibdir}/kmilo_kvaio.la
-%{tde_tdelibdir}/kmilo_kvaio.so
-%{tde_tdelibdir}/kmilo_thinkpad.la
-%{tde_tdelibdir}/kmilo_thinkpad.so
-%{tde_tdeappdir}/kvaio.desktop
-%{tde_tdeappdir}/thinkpad.desktop
-%{tde_datadir}/services/kmilo/kmilo_asus.desktop
-%{tde_datadir}/services/kmilo/kmilo_delli8k.desktop
-%{tde_datadir}/services/kmilo/kmilo_kvaio.desktop
-%{tde_datadir}/services/kmilo/kmilo_thinkpad.desktop
-
-##########
-
-%package -n trinity-kregexpeditor
-Summary:	graphical regular expression editor plugin for Trinity
-Group:		Applications/Utilities
-
-%description -n trinity-kregexpeditor
-This package contains a graphical regular expression editor plugin for use
-with TDE. It let you draw your regular expression in an unambiguous way.
-
-%files -n trinity-kregexpeditor
-%defattr(-,root,root,-)
-%{tde_bindir}/kregexpeditor
-%{tde_tdelibdir}/libkregexpeditorgui.la
-%{tde_tdelibdir}/libkregexpeditorgui.so
-%{tde_libdir}/libkregexpeditorcommon.so.*
-%{tde_tdeappdir}/kregexpeditor.desktop
-%{tde_datadir}/apps/kregexpeditor/
-%{tde_datadir}/icons/hicolor/*/apps/kregexpeditor.png
-%{tde_datadir}/services/kregexpeditorgui.desktop
-%{tde_tdedocdir}/HTML/en/KRegExpEditor/
-
-%post -n trinity-kregexpeditor
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kregexpeditor
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null  ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-ksim
-Summary:	system information monitor for Trinity
-Group:		Applications/Utilities
-
-%description -n trinity-ksim
-KSim is a system monitor app which has its own plugin system with support
-for GKrellm skins. It allows users to follow uptime, memory usage, network
-connections, power, etc.
-
-%files -n trinity-ksim
-%defattr(-,root,root,-)
-%config %{tde_datadir}/config/ksim_panelextensionrc
-%{tde_tdelibdir}/ksim_*.la
-%{tde_tdelibdir}/ksim_*.so
-%{tde_libdir}/libksimcore.so.*
-%{tde_datadir}/apps/kicker/extensions/ksim.desktop
-%{tde_datadir}/apps/ksim/
-%{tde_tdedocdir}/HTML/en/ksim/
-%{tde_datadir}/icons/crystalsvg/*/apps/ksim.png
-%{tde_datadir}/icons/crystalsvg/*/devices/ksim_cpu.png
-
-%post -n trinity-ksim
-/sbin/ldconfig
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-
-%postun -n trinity-ksim
-/sbin/ldconfig
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null  ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-
-##########
-
-%package -n trinity-ktimer
-Summary:	timer utility for Trinity
-Group:		Applications/Utilities
-
-%description -n trinity-ktimer
-This is a timer application for TDE. It allows you to execute commands after
-a certain amount of time. It supports looping commands as well as delayed
-command execution.
-
-%files -n trinity-ktimer
-%defattr(-,root,root,-)
-%{tde_bindir}/ktimer
-%{tde_tdeappdir}/ktimer.desktop
-%{tde_datadir}/icons/hicolor/*/apps/ktimer.png
-%{tde_tdedocdir}/HTML/en/ktimer/
-
-%post -n trinity-ktimer
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-ktimer
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kwalletmanager
-Summary:	wallet manager for Trinity
-Group:		Applications/Utilities
-
-%description -n trinity-kwalletmanager
-This program keeps various wallets for any kind of data that the user can
-store encrypted with passwords and can also serve as a password manager that
-keeps a master password to all wallets.
-
-%files -n trinity-kwalletmanager
-%defattr(-,root,root,-)
-%{tde_bindir}/kwalletmanager
-%{tde_tdelibdir}/kcm_kwallet.la
-%{tde_tdelibdir}/kcm_kwallet.so
-%{tde_tdeappdir}/kwalletconfig.desktop
-%{tde_tdeappdir}/kwalletmanager.desktop
-%{tde_tdeappdir}/kwalletmanager-kwalletd.desktop
-%{tde_datadir}/apps/kwalletmanager/
-%{tde_datadir}/icons/hicolor/*/apps/kwalletmanager.png
-%{tde_datadir}/services/kwallet_config.desktop
-%{tde_datadir}/services/kwalletmanager_show.desktop
-%{tde_tdedocdir}/HTML/en/kwallet/
-
-%post -n trinity-kwalletmanager
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kwalletmanager
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-superkaramba
-Summary:	a program based on karamba improving the eyecandy of TDE
-Group:		Applications/Utilities
-
-%description -n trinity-superkaramba
-SuperKaramba is a tool based on karamba that allows anyone to easily create
-and run little interactive widgets on a TDE desktop. Widgets are defined in a
-simple text file and can be augmented with Python code to make them
-interactive.
-
-Here are just some examples of the things that can be done:
-* Display system information such as CPU Usage, MP3 playing, etc.
-* Create cool custom toolbars that work any way imaginable.
-* Create little games or virtual pets that live on your desktop.
-* Display information from the internet, such as weather and headlines.
-
-%files -n trinity-superkaramba
-%defattr(-,root,root,-)
-%{tde_bindir}/superkaramba
-%{tde_datadir}/applnk/Utilities/superkaramba.desktop
-%{tde_datadir}/apps/superkaramba/superkarambaui.rc
-%{tde_datadir}/icons/crystalsvg/*/apps/superkaramba.png
-%{tde_datadir}/icons/crystalsvg/*/mimetypes/superkaramba_theme.png
-%{tde_datadir}/icons/crystalsvg/scalable/apps/superkaramba.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/mimetypes/superkaramba_theme.svgz
-%{tde_datadir}/mimelnk/application/x-superkaramba.desktop
-%{tde_tdedocdir}/HTML/en/superkaramba/
-
-%post -n trinity-superkaramba
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-
-%postun -n trinity-superkaramba
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-
-##########
-
-# afaik, nobody BR's it, and it pulls kdeutils into multilib -- Rex
-%package devel
-Summary:	Development files for %{name} 
-Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	trinity-tdelibs-devel
-
-Obsoletes:	trinity-kdeutils-devel < %{version}-%{release}
-Provides:	trinity-kdeutils-devel = %{version}-%{release}
-Obsoletes:	tdeutils-devel < %{version}-%{release}
-Provides:	tdeutils-devel = %{version}-%{release}
-
-%description devel
-Development files for %{name}.
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/*
-%{tde_libdir}/libkcmlaptop.la
-%{tde_libdir}/libkcmlaptop.so
-%{tde_libdir}/lib[kt]deinit_ark.la
-%{tde_libdir}/lib[kt]deinit_irkick.la
-%{tde_libdir}/lib[kt]deinit_kcalc.la
-%{tde_libdir}/lib[kt]deinit_kedit.la
-%{tde_libdir}/libkmilo.la
-%{tde_libdir}/libkmilo.so
-%{tde_libdir}/libkregexpeditorcommon.la
-%{tde_libdir}/libkregexpeditorcommon.so
-%{tde_libdir}/libksimcore.la
-%{tde_libdir}/libksimcore.so
-%{tde_libdir}/libkhexeditcommon.la
-%{tde_libdir}/libkhexeditcommon.so
-
-%post devel
-/sbin/ldconfig
-
-%postun devel
-/sbin/ldconfig
-
-##########
-
-%prep
-%setup -q -n kdeutils
-
-%patch1 -p1 -b .label
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1 -b .ftbfs
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i "admin/acinclude.m4.in" \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-%build
-unset QTDIR || : ; source /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-   --prefix=%{tde_prefix} \
-   --exec-prefix=%{tde_prefix} \
-   --bindir=%{tde_bindir} \
-   --libdir=%{tde_libdir} \
-   --datadir=%{tde_datadir} \
-   --includedir=%{tde_tdeincludedir} \
-   --enable-new-ldflags \
-   --disable-dependency-tracking \
-   --disable-rpath \
-   --disable-debug --disable-warnings \
-   --enable-final \
-   --includedir=%{tde_tdeincludedir} \
-   --with-snmp \
-%if 0%{?fedora}
-   --with-xmms \
-%else
-   --without-xmms \
-%endif
-   --with-xscreensaver \
-   --with-extra-includes=%{tde_includedir}/tqt \
-   --enable-closure
-   
-%__make %{?_smp_mflags}
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot}
-
-# Show only in KDE (really? -- Rex)
-for i in kcalc kregexpeditor Kjots ktimer kdf kcmdf ksim KFloppy KEdit \
-  KCharSelect ark kwalletmanager kwalletconfig \
- irkick kcmlirc laptop pcmcia kvaio thinkpad kwikdisk; do
- if [ -f %{buildroot}%{tde_datadir}/applications/kde/$i.desktop ] ; then
-   echo "OnlyShowIn=KDE;" >> %{buildroot}%{tde_datadir}/applications/kde/$i.desktop
- fi
-done
-
-## File lists
-# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-for lang_dir in %{buildroot}$HTML_DIR/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
-      done
-    popd
-    pushd $lang_dir/kcontrol
-      for i in *; do
-        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../../common $i/common
-      done
-    popd
-  fi
-done
-fi
-
-# using pam
-%__install -p -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pam.d/klaptop_acpi_helper
-%__install -p -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/security/console.apps/klaptop_acpi_helper
-
-# Use consolehelper for 'klaptop_acpi_helper'
-%__mkdir_p %{buildroot}%{tde_sbindir} %{buildroot}%{_sbindir}
-%__mv %{buildroot}%{tde_bindir}/klaptop_acpi_helper %{buildroot}%{tde_sbindir}
-%__ln_s %{_bindir}/consolehelper %{buildroot}%{tde_bindir}/klaptop_acpi_helper
-%if "%{tde_prefix}" != "/usr"
-%__ln_s %{tde_sbindir}/klaptop_acpi_helper %{?buildroot}%{_sbindir}/klaptop_acpi_helper
-%endif
-
-# klaptop setting
-%__install -p -D -m 644 %{SOURCE3} %{buildroot}%{tde_datadir}/config/kcmlaptoprc
-
-
-%clean
-%__rm -rf %{?buildroot}
-
-
-
-%changelog
-* Fri Jul 20 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-7
-- Renames 'tdeutils' to 'trinity-tdeutils'
-
-* Fri Jun 22 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-6
-- Split in several packages
-- Allow ark embedding [Bug #670] [Commit #2a1d4a67]
-- Remove "More Applications" from TDE menu. Add Utility category to KEdit. [Bug #653] [Commit #803f4752]
-- [tdeutils] Reorganize KControl menu tree. [Commit #7780bb7b]
-- Further organize TDE Menu. [Commit #b970fc42]
-- [Ark] Repairs and extensions [Bug #1030] [Commit #1c84948d]
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5
-- Fix HTML directory location
-
-* Thu Nov 17 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
-- Fix symbolic link to 'consolehelper'
-
-* Fri Nov 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
-- Removes 'dpkg' commands inside klaptopdaemon
-
-* Fri Nov 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
-- Updates BuildRequires
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
-- Initial release for RHEL 6, RHEL 5 and Fedora 15
-
-* Mon Sep 05 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
-- Import to GIT
-
diff --git a/redhat/main/tdeutils/kdf-3.0.2-label.patch b/redhat/main/tdeutils/kdf-3.0.2-label.patch
deleted file mode 100644
index 6ea620472..000000000
--- a/redhat/main/tdeutils/kdf-3.0.2-label.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- kdeutils-3.0.3/kdf/disklist.cpp.label	2002-08-19 14:36:13.000000000 +0200
-+++ kdeutils-3.0.3/kdf/disklist.cpp	2002-08-19 14:37:34.000000000 +0200
-@@ -163,8 +163,9 @@
-     while (! t.eof()) {
-       s=t.readLine();
-       s=s.simplifyWhiteSpace();
--      if ( (!s.isEmpty() ) && (s.find(DELIMITER)!=0) ) {
-+      if ( (!s.isEmpty() ) && (s.find(DELIMITER)!=0) && (s.find("LABEL")!=0) ) {
-                // not empty or commented out by '#'
-+	       // skip LABEL entries as long as kdf can't handle them properly
- 	//	kdDebug() << "GOT: [" << s << "]" << endl;
- 	disk = new DiskEntry();// Q_CHECK_PTR(disk);
-         disk->setMounted(FALSE);