RPM: merge redhat directory with master branch

3 files changed, 158 insertions, 334 deletions

diff --git a/redhat/main/tdeutils/tdeutils-14.0.0.spec b/redhat/main/tdeutils/tdeutils-14.0.0.spec
index 8186daa2f..51ba2ca49 100644
--- a/redhat/main/tdeutils/tdeutils-14.0.0.spec
+++ b/redhat/main/tdeutils/tdeutils-14.0.0.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package tdeutils (version R14.0.0)
+# spec file for package tdeutils (version R14)
 #
 # Copyright (c) 2014 Trinity Desktop Environment
 #
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 #
-# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
 #
 
 # BUILD WARNING:
@@ -20,10 +20,13 @@
 #  Having KDE libraries may cause FTBFS here !
 
 # TDE variables
+%if "%{?tde_version}" == ""
 %define tde_version 14.0.0
+%endif
 %define tde_pkg tdeutils
 %define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
@@ -34,16 +37,11 @@
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
-# 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
-
 
 Name:		trinity-%{tde_pkg}
 Summary:	TDE Utilities
 Version:	%{tde_version}
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 Group:		Applications/System
 URL:		http://www.trinitydesktop.org/
 
@@ -63,6 +61,7 @@ Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
 Source1:	klaptop_acpi_helper.pam
 Source2:	klaptop_acpi_helper.console
 Source3:	kcmlaptoprc
+Source4:	%{name}-rpmlintrc
 
 Obsoletes:	trinity-kdeutils < %{version}-%{release}
 Provides:	trinity-kdeutils = %{version}-%{release}
@@ -71,7 +70,9 @@ Provides:	trinity-kdeutils-extras = %{version}-%{release}
 Obsoletes:	tdeutils < %{version}-%{release}
 Provides:	tdeutils = %{version}-%{release}
 
+BuildRequires:	trinity-filesystem >= %{tde_version}
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 
 BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
@@ -120,9 +121,9 @@ BuildRequires:	gamin-devel
 BuildRequires:	pcre-devel
 
 # XMMS support
-#%if 0%{?fedora}
+#if 0#{?fedora}
 #BuildRequires:	xmms-devel
-#%endif
+#endif
 
 # KLAPTOPDAEMON
 #  Not for RHEL 4!
@@ -130,8 +131,11 @@ BuildRequires:	pcre-devel
 %define build_klaptopdaemon 1
 %endif
 
+# ACL support
+BuildRequires:	libacl-devel
+
 # XSCREENSAVER support
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} || 0%{?with_xscreensaver}
+%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
 %define with_xscreensaver 1
 %if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version}
 BuildRequires:	libXScrnSaver-devel
@@ -145,6 +149,9 @@ BuildRequires:	%{_lib}xscrnsaver%{?mgaversion:1}-devel
 %endif
 %endif
 
+# OPENSSL support
+BuildRequires:	openssl-devel
+
 # CONSOLEHELPER (usermode) support
 %if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_consolehelper 1
@@ -153,6 +160,9 @@ BuildRequires:	%{_lib}xscrnsaver%{?mgaversion:1}-devel
 %define dont_relink 1
 %endif
 
+%if "%{?tde_version}" == "14.1.0"
+%define build_tdefilereplace 1
+%endif
 
 Requires: trinity-ark = %{version}-%{release}
 Requires: trinity-kcalc = %{version}-%{release}
@@ -173,36 +183,39 @@ Requires: trinity-ksim = %{version}-%{release}
 Requires: trinity-ktimer = %{version}-%{release}
 Requires: trinity-tdewalletmanager = %{version}-%{release}
 Requires: trinity-superkaramba = %{version}-%{release}
-
+%if 0%{?build_tdefilereplace}
+Requires: trinity-tdefilereplace = %{version}-%{release}
+%endif
 
 %description
 Utilities for the Trinity Desktop Environment, including:
-  * ark (tar/gzip archive manager)
-  * kcalc (scientific calculator)
-  * kcharselect (character selector)
-  * tdelirc (infrared control)
-  * tdessh (ssh front end)
-  * kdf (view disk usage)
-  * kedit (simple text editor)
-  * kfloppy (floppy formatting tool)
-  * kgpg (gpg gui)
-  * khexedit (hex editor)
-  * kjots (note taker)
+* ark (tar/gzip archive manager)
+* kcalc (scientific calculator)
+* kcharselect (character selector)
+* tdelirc (infrared control)
+* tdessh (ssh front end)
+* kdf (view disk usage)
+* kedit (simple text editor)
+* kfloppy (floppy formatting tool)
+* kgpg (gpg gui)
+* khexedit (hex editor)
+* kjots (note taker)
 %if 0%{?build_klaptopdaemon}
-  * klaptopdaemon (battery monitoring and management for laptops);
+* klaptopdaemon (battery monitoring and management for laptops);
 %endif
-  * kmilo
-  * kregexpeditor (regular expression editor)
-  * ksim (system information monitor);
-  * ktimer (task scheduler)
-  * kwikdisk (removable media utility)
+* kmilo
+* kregexpeditor (regular expression editor)
+* ksim (system information monitor);
+* ktimer (task scheduler)
+* kwikdisk (removable media utility)
+* tdefilereplace: batch search and replace tool
 
 %files
 
 ##########
 
 %package -n trinity-ark
-Summary:	graphical archiving tool for Trinity
+Summary:	Graphical archiving tool for Trinity
 Group:		Applications/Utilities
 #Requires:	ncompress
 Requires:	unzip
@@ -222,7 +235,7 @@ 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,
+Ark can work closely with Konqueror in the TDE environment to handle archives,
 if you install the Konqueror Integration plugin available in the konq-plugins
 package.
 
@@ -242,26 +255,10 @@ package.
 %{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
+Summary:	Calculator for Trinity
 Group:		Applications/Utilities
 
 %description -n trinity-kcalc
@@ -287,30 +284,15 @@ It provides:
 %{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
+Summary:	Character selector for Trinity
 Group:		Applications/Utilities
+Requires:	trinity-kicker
 
 %description -n trinity-kcharselect
-A character set selector for TDE.
+This package contains kcharselect, a character set selector for TDE.
 
 %files -n trinity-kcharselect
 %defattr(-,root,root,-)
@@ -324,25 +306,12 @@ A character set selector for TDE.
 %{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-tdelirc
-Summary:	infrared control for Trinity
+Summary:	Infrared control for Trinity
 Group:		Applications/Utilities
+Requires:	trinity-filesystem
 
 Obsoletes:	trinity-kdelirc < %{version}-%{release}
 Provides:	trinity-kdelirc = %{version}-%{release}
@@ -365,6 +334,7 @@ This is a frontend for the LIRC suite to use infrared devices with TDE.
 %{tde_datadir}/apps/profiles/konqueror.profile.xml
 %{tde_datadir}/apps/profiles/noatun.profile.xml
 %{tde_datadir}/apps/profiles/profile.dtd
+%dir %{tde_datadir}/apps/remotes
 %{tde_datadir}/apps/remotes/RM-0010.remote.xml
 %{tde_datadir}/apps/remotes/cimr100.remote.xml
 %{tde_datadir}/apps/remotes/hauppauge.remote.xml
@@ -377,26 +347,10 @@ This is a frontend for the LIRC suite to use infrared devices with TDE.
 %{tde_tdedocdir}/HTML/en/irkick/
 %{tde_tdedocdir}/HTML/en/kcmlirc/
 
-%post -n trinity-tdelirc
-/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-tdelirc
-/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-tdessh
-Summary:	ssh frontend for Trinity
+Summary:	Ssh frontend for Trinity
 Group:		Applications/Utilities
 %if 0%{?suse_version}
 Requires:	openssh
@@ -417,8 +371,9 @@ This package contains TDE's frontend for ssh.
 ##########
 
 %package -n trinity-kdf
-Summary:	disk space utility for Trinity
+Summary:	Disk space utility for Trinity
 Group:		Applications/Utilities
+Requires:	trinity-kcontrol
 
 %description -n trinity-kdf
 KDiskFree displays the available file devices (hard drive partitions, floppy
@@ -442,24 +397,10 @@ in a file manager.
 %{tde_tdedocdir}/HTML/en/kdf/
 %{tde_tdedocdir}/HTML/en/kcontrol/storagedevices/
 
-%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
+Summary:	Basic text editor for Trinity
 Group:		Applications/Utilities
 
 %description -n trinity-kedit
@@ -477,31 +418,15 @@ reasonably fast start.
 %{tde_tdelibdir}/kedit.so
 %{tde_libdir}/libtdeinit_kedit.so
 %{tde_tdeappdir}/KEdit.desktop
-%{tde_datadir}/apps/kedit/keditui.rc
+%{tde_datadir}/apps/kedit/
 %{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
+Summary:	Floppy formatter for Trinity
 Group:		Applications/Utilities
 Requires:	dosfstools
 
@@ -517,20 +442,6 @@ to format 3.5" and 5.25" floppy disks.
 %{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
@@ -566,20 +477,6 @@ Features:
 %{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
@@ -601,32 +498,16 @@ support and other powerful features.
 %{tde_libdir}/libkhexeditcommon.so.*
 %{tde_tdeappdir}/khexedit.desktop
 %{tde_datadir}/apps/khexedit/
-%{tde_datadir}/apps/khexedit2part/khexedit2partui.rc
+%{tde_datadir}/apps/khexedit2part/
 %{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
+Summary:	Note taking utility for Trinity
 Group:		Applications/Utilities
 
 %description -n trinity-kjots
@@ -642,28 +523,14 @@ program included in the tkgoodstuff package.
 %{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 || :
-
 ##########
 
 %if 0%{?build_klaptopdaemon}
 
 %package -n trinity-klaptopdaemon
-Summary:	battery monitoring and management for laptops using Trinity
+Summary:	Battery monitoring and management for laptops using Trinity
 Group:		Applications/Utilities
-Requires:	pm-utils
+Requires:	trinity-kcontrol
 
 %if 0%{?with_consolehelper}
 # package 'usermode' provides '/usr/bin/consolehelper-gtk'
@@ -708,30 +575,14 @@ power management, for laptops, from within TDE.
 %{_sbindir}/klaptop_acpi_helper
 %endif
 
-%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 || :
+%config %{tde_confdir}/kcmlaptoprc
 
 %endif
 
 ##########
 
 %package -n trinity-kmilo
-Summary:	laptop special keys support for Trinity
+Summary:	Laptop special keys support for Trinity
 Group:		Applications/Utilities
 
 %description -n trinity-kmilo
@@ -749,21 +600,18 @@ with special keys.
 %{tde_tdelibdir}/kmilo_generic.so
 %{tde_libdir}/libkmilo.so.*
 %{tde_datadir}/services/kded/kmilod.desktop
+%dir %{tde_datadir}/services/kmilo
 %{tde_datadir}/services/kmilo/kmilo_generic.desktop
+%dir %{tde_datadir}/servicetypes/kmilo
 %{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
+Summary:	Non-standard plugins for KMilo
 Group:		Applications/Utilities
 Requires:	trinity-kmilo = %{version}-%{release}
+Requires:	trinity-kcontrol
 
 %description -n trinity-kmilo-legacy
 KMilo lets you use the special keys on some keyboards and laptops.
@@ -800,7 +648,7 @@ plugin, if you need this package please file a bug.
 ##########
 
 %package -n trinity-kregexpeditor
-Summary:	graphical regular expression editor plugin for Trinity
+Summary:	Graphical regular expression editor plugin for Trinity
 Group:		Applications/Utilities
 
 %description -n trinity-kregexpeditor
@@ -819,27 +667,12 @@ with TDE. It let you draw your regular expression in an unambiguous way.
 %{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
+Summary:	System information monitor for Trinity
 Group:		Applications/Utilities
+Requires:	trinity-kicker
 
 %description -n trinity-ksim
 KSim is a system monitor app which has its own plugin system with support
@@ -848,7 +681,7 @@ connections, power, etc.
 
 %files -n trinity-ksim
 %defattr(-,root,root,-)
-%config %{tde_datadir}/config/ksim_panelextensionrc
+%config %{tde_confdir}/ksim_panelextensionrc
 %{tde_tdelibdir}/ksim_*.la
 %{tde_tdelibdir}/ksim_*.so
 %{tde_libdir}/libksimcore.so.*
@@ -858,24 +691,10 @@ connections, power, etc.
 %{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
+Summary:	Timer utility for Trinity
 Group:		Applications/Utilities
 
 %description -n trinity-ktimer
@@ -890,24 +709,10 @@ command execution.
 %{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-tdewalletmanager
-Summary:	wallet manager for Trinity
+Summary:	Wallet manager for Trinity
 Group:		Applications/Utilities
 
 Obsoletes:	trinity-kwalletmanager < %{version}-%{release}
@@ -932,24 +737,10 @@ keeps a master password to all wallets.
 %{tde_datadir}/services/tdewalletmanager_show.desktop
 %{tde_tdedocdir}/HTML/en/tdewallet/
 
-%post -n trinity-tdewalletmanager
-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-tdewalletmanager
-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
+Summary:	A program based on karamba improving the eyecandy of TDE
 Group:		Applications/Utilities
 
 %description -n trinity-superkaramba
@@ -967,8 +758,8 @@ Here are just some examples of the things that can be done:
 %files -n trinity-superkaramba
 %defattr(-,root,root,-)
 %{tde_bindir}/superkaramba
-%{tde_datadir}/applnk/Utilities/superkaramba.desktop
-%{tde_datadir}/apps/superkaramba/superkarambaui.rc
+%{tde_tdeappdir}/superkaramba.desktop
+%{tde_datadir}/apps/superkaramba/
 %{tde_datadir}/icons/crystalsvg/*/apps/superkaramba.png
 %{tde_datadir}/icons/crystalsvg/*/mimetypes/superkaramba_theme.png
 %{tde_datadir}/icons/crystalsvg/scalable/apps/superkaramba.svgz
@@ -976,17 +767,40 @@ Here are just some examples of the things that can be done:
 %{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
+%if 0%{?build_tdefilereplace}
+
+%package -n trinity-tdefilereplace
+Summary:	Batch search-and-replace component for TDE
+Group:		Applications/Utilities
+
+Obsoletes:	trinity-kfilereplace < %{version}-%{release}
+Provides:	trinity-kfilereplace = %{version}-%{release}
+
+%description -n trinity-tdefilereplace
+TDEFileReplace is an embedded component for TDE that acts as a batch
+search-and-replace tool. It allows you to replace one expression with
+another in many files at once.
+
+Note that at the moment TDEFileReplace does not come as a standalone
+application.
+
+This package is part of Trinity, as a component of the TDE utilities module.
+
+%files -n trinity-tdefilereplace
+%defattr(-,root,root,-)
+%{tde_bindir}/tdefilereplace
+%{tde_tdelibdir}/libtdefilereplacepart.la
+%{tde_tdelibdir}/libtdefilereplacepart.so
+%{tde_tdeappdir}/tdefilereplace.desktop
+%{tde_datadir}/apps/tdefilereplace/
+%{tde_datadir}/apps/tdefilereplacepart/
+%{tde_tdedocdir}/HTML/en/tdefilereplace/
+%{tde_datadir}/icons/hicolor/*/apps/tdefilereplace.png
+%{tde_datadir}/services/tdefilereplacepart.desktop
+
+%endif
 
 ##########
 
@@ -1003,7 +817,7 @@ Obsoletes:	tdeutils-devel < %{version}-%{release}
 Provides:	tdeutils-devel = %{version}-%{release}
 
 %description devel
-Development files for %{name}.
+This package contains the development files for tdeutils.
 
 %files devel
 %defattr(-,root,root,-)
@@ -1026,12 +840,6 @@ Development files for %{name}.
 %{tde_libdir}/libkhexeditcommon.so
 %{tde_datadir}/cmake/libksimcore.cmake
 
-%post devel
-/sbin/ldconfig
-
-%postun devel
-/sbin/ldconfig
-
 ##########
 
 %if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
@@ -1043,6 +851,14 @@ Development files for %{name}.
 %prep
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
 
+%if 0%{?rhel} == 5
+# Reverts some older Python stuff
+%__sed -i "superkaramba/src/"*".cpp" \
+       -e "s|PyBytes_CheckExact|PyString_CheckExact|g" \
+       -e "s|PyBytes_AsString|PyString_AsString|g" \
+       -e "s|PyBytes_FromString|PyString_FromString|g" \
+%endif
+
 
 %build
 unset QTDIR QTINC QTLIB
@@ -1071,6 +887,7 @@ fi
   \
   -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
   -DBIN_INSTALL_DIR="%{tde_bindir}" \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
   -DDOC_INSTALL_DIR="%{tde_docdir}" \
   -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
   -DLIB_INSTALL_DIR="%{tde_libdir}" \
@@ -1119,7 +936,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %endif
 
 # klaptop settings file
-%__install -p -D -m 644 "%{SOURCE3}" "%{buildroot}%{tde_datadir}/config/kcmlaptoprc"
+%__install -p -D -m 644 "%{SOURCE3}" "%{buildroot}%{tde_confdir}/kcmlaptoprc"
 
 %else
 
@@ -1131,28 +948,34 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %endif
 
+# Fix desktop shortcut location
+%__mv "%{?buildroot}%{tde_datadir}/applnk/Utilities/superkaramba.desktop" "%{?buildroot}%{tde_tdeappdir}/superkaramba.desktop"
+
 # Updates applications categories for openSUSE
 %if 0%{?suse_version}
-%suse_update_desktop_file KEdit       Utility TextEditor
-%suse_update_desktop_file superkaramba Utility DesktopUtility
-%suse_update_desktop_file KCharSelect Utility Accessibility
-%suse_update_desktop_file khexedit    Utility Editor
-%suse_update_desktop_file Kjots       Utility TimeUtility
-%suse_update_desktop_file ktimer      Utility TimeUtility
-%suse_update_desktop_file kwikdisk    System  Applet
-%suse_update_desktop_file kdf         System  Filesystem
-%suse_update_desktop_file ark         System  Archiving
-%suse_update_desktop_file kcalc       Utility Calculator
-%suse_update_desktop_file kgpg        Utility Security
-%suse_update_desktop_file irkick      Applet
-%suse_update_desktop_file tdewalletmanager Applet
-%suse_update_desktop_file kregexpeditor  Utility Editor
+%suse_update_desktop_file KEdit              Utility TextEditor
+%suse_update_desktop_file superkaramba       Utility DesktopUtility
+%suse_update_desktop_file KCharSelect        Utility Accessibility
+%suse_update_desktop_file khexedit           Utility Editor
+%suse_update_desktop_file Kjots              Utility TimeUtility
+%suse_update_desktop_file ktimer             Utility TimeUtility
+%suse_update_desktop_file kwikdisk           System  Applet
+%suse_update_desktop_file kdf                System  Filesystem
+%suse_update_desktop_file ark                System  Archiving
+%suse_update_desktop_file kcalc              Utility Calculator
+%suse_update_desktop_file kgpg               Utility Security
+%suse_update_desktop_file irkick             Applet
+%suse_update_desktop_file tdewalletmanager   Applet
+%suse_update_desktop_file kregexpeditor      Utility Editor
 %suse_update_desktop_file kcmdf
 %suse_update_desktop_file kcmlirc
 %suse_update_desktop_file tdewalletconfig
 %suse_update_desktop_file thinkpad
 %suse_update_desktop_file kvaio
-%suse_update_desktop_file KFloppy     System  Filesystem
+%suse_update_desktop_file KFloppy            System  Filesystem
+%if 0%{?build_tdefilereplace}
+%suse_update_desktop_file -r tdefilereplace   System      FileManager
+%endif
 %endif
 
 # Icons from TDE Control Center should only be displayed in TDE
@@ -1164,11 +987,23 @@ for i in %{?buildroot}%{tde_tdeappdir}/*.desktop ; do
   fi
 done
 
+# Other TDE-only apps
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/thinkpad.desktop"
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kcmlirc.desktop"
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kvaio.desktop"
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kcmdf.desktop"
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/tdewalletconfig.desktop"
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/khexedit.desktop"
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kregexpeditor.desktop"
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kgpg.desktop"
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/Kjots.desktop"
+
+# Links duplicate files
+%fdupes "%{?buildroot}%{tde_datadir}"
+
 
 %clean
 %__rm -rf "%{?buildroot}"
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial release for TDE 14.0.0
diff --git a/redhat/main/tdeutils/tdeutils-3.5.13.2.spec b/redhat/main/tdeutils/tdeutils-3.5.13.2.spec
index b8ed9aa9f..13f1e9c46 100644
--- a/redhat/main/tdeutils/tdeutils-3.5.13.2.spec
+++ b/redhat/main/tdeutils/tdeutils-3.5.13.2.spec
@@ -1,8 +1,3 @@
-# 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
-
 %define tde_version 3.5.13.2
 
 # TDE specific building variables
@@ -22,7 +17,7 @@
 
 Name:		trinity-tdeutils
 Version:	%{tde_version}
-Release:	%{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant}
+Release:	%{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}
 License:	GPL
 Summary:	TDE Utilities
 Group:		Applications/System
@@ -1066,11 +1061,3 @@ export PATH="%{tde_bindir}:${PATH}"
 
 
 %changelog
-* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-3
-- Build for Fedora 19
-
-* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2
-- Rebuild with NDEBUG option
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial release for TDE 3.5.13.2
diff --git a/redhat/main/tdeutils/trinity-tdeutils-rpmlintrc b/redhat/main/tdeutils/trinity-tdeutils-rpmlintrc
new file mode 100644
index 000000000..529351884
--- /dev/null
+++ b/redhat/main/tdeutils/trinity-tdeutils-rpmlintrc
@@ -0,0 +1,2 @@
+setBadness('library-without-ldconfig-postun', 0)
+setBadness('library-without-ldconfig-postin', 0)