RHEL/Fedora: add support for MGA2/MDV2011 in many applications

99 files changed, 5326 insertions, 4056 deletions

diff --git a/redhat/applications/digikam/trinity-digikam-3.5.13.spec b/redhat/applications/digikam/trinity-digikam-3.5.13.spec
index 6af36fa79..f1ff6d1ab 100644
--- a/redhat/applications/digikam/trinity-digikam-3.5.13.spec
+++ b/redhat/applications/digikam/trinity-digikam-3.5.13.spec
@@ -86,6 +86,10 @@ BuildRequires:	%{_lib}exiv2-devel
 BuildRequires:	exiv2-devel
 %endif
 
+Requires:	trinity-libkexiv2
+Requires:	trinity-libkdcraw
+Requires:	trinity-libkipi
+
 %description
 An easy to use and powerful digital photo management
 application, which makes importing, organizing and manipulating
@@ -147,16 +151,16 @@ export PATH="%{tde_bindir}:${PATH}"
 export LDFLAGS="-L%{tde_libdir} -I%{tde_tdeincludedir}"
 
 %configure \
-	--prefix=%{tde_prefix} \
-	--exec-prefix=%{tde_prefix} \
-	--bindir=%{tde_bindir} \
-	--libdir=%{tde_libdir} \
-	--datadir=%{tde_datadir} \
-	--mandir=%{tde_mandir} \
-	--includedir=%{tde_tdeincludedir} \
-	--disable-rpath \
-    --with-extra-includes=%{tde_tdeincludedir}/tqt \
-    --enable-closure
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --libdir=%{tde_libdir} \
+  --datadir=%{tde_datadir} \
+  --mandir=%{tde_mandir} \
+  --includedir=%{tde_tdeincludedir} \
+  --disable-rpath \
+  --with-extra-includes=%{tde_tdeincludedir}/tqt \
+  --enable-closure
 
 %__make %{?_smp_mflags}
 
@@ -187,10 +191,10 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 update-desktop-database %{tde_appdir} 2> /dev/null || : 
 
 %post devel
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 %postun devel
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 
 %files -f %{kdecomp}.lang
diff --git a/redhat/applications/fusion-icon/trinity-fusion-icon.spec b/redhat/applications/fusion-icon/trinity-fusion-icon.spec
index 3b430508a..276c357c5 100644
--- a/redhat/applications/fusion-icon/trinity-fusion-icon.spec
+++ b/redhat/applications/fusion-icon/trinity-fusion-icon.spec
@@ -53,6 +53,7 @@ BuildRequires:	trinity-tdebase-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	python
 Requires:		python
+Requires:		trinity-compizconfig-backend-kconfig
 
 %description
 The OpenCompositing Project brings 3D desktop visual effects that
diff --git a/redhat/applications/k3b/trinity-k3b-3.5.12.spec b/redhat/applications/k3b/trinity-k3b-3.5.12.spec
index a1b9f0d60..0d17f7958 100644
--- a/redhat/applications/k3b/trinity-k3b-3.5.12.spec
+++ b/redhat/applications/k3b/trinity-k3b-3.5.12.spec
@@ -197,9 +197,11 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/kde/k3b.desktop
 %__rm -rf %{buildroot}
 
 
-%post libs -p /sbin/ldconfig
+%post libs
+/sbin/ldconfig
 
-%postun libs -p /sbin/ldconfig
+%postun libs
+/sbin/ldconfig
 
 %post common
 touch --no-create %{_datadir}/icons/hicolor ||:
diff --git a/redhat/applications/k3b/trinity-k3b-3.5.13.spec b/redhat/applications/k3b/trinity-k3b-3.5.13.spec
index d33cfb2fe..aca04f95e 100644
--- a/redhat/applications/k3b/trinity-k3b-3.5.13.spec
+++ b/redhat/applications/k3b/trinity-k3b-3.5.13.spec
@@ -32,10 +32,6 @@ URL:		http://www.trinitydesktop.org/
 Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if "%{?_prefix}" == "/usr"
-Obsoletes: k3b
-%endif
-
 Group:		Applications/Archiving
 License:	GPLv2+
 
diff --git a/redhat/applications/k9copy/trinity-k9copy.spec b/redhat/applications/k9copy/trinity-k9copy.spec
index ad0f6f317..cf6993ed6 100644
--- a/redhat/applications/k9copy/trinity-k9copy.spec
+++ b/redhat/applications/k9copy/trinity-k9copy.spec
@@ -60,11 +60,12 @@ Patch7:		k9copy-3.5.13-fix_format_string_error.patch
 BuildRequires: tqtinterface-devel
 BuildRequires: trinity-tdelibs-devel
 BuildRequires: trinity-tdebase-devel
+BuildRequires: trinity-arts-devel
 BuildRequires: desktop-file-utils
 
 # Warning: the target distribution must have ffmpeg !
 BuildRequires: ffmpeg-devel
-Requires:	ffmpeg
+#Requires:	ffmpeg
 
 %description
 k9copy is a tabbed tool that allows to copy of one or more titles from a DVD9
diff --git a/redhat/applications/katapult/trinity-katapult-3.5.13.spec b/redhat/applications/katapult/trinity-katapult-3.5.13.spec
index 28cc907bd..8f31e7360 100644
--- a/redhat/applications/katapult/trinity-katapult-3.5.13.spec
+++ b/redhat/applications/katapult/trinity-katapult-3.5.13.spec
@@ -151,7 +151,6 @@ update-desktop-database %{tde_appdir} &> /dev/null
 %{tde_datadir}/icons/crystalsvg/scalable/actions/katapultspellcheck.svgz
 %{tde_datadir}/icons/hicolor/128x128/actions/checkmark.png
 %{tde_datadir}/icons/hicolor/128x128/actions/no.png
-%{tde_datadir}/icons/hicolor/128x128/apps/katapult.png
 %{tde_datadir}/icons/hicolor/128x128/apps/xcalc.png
 %{tde_datadir}/icons/hicolor/*/apps/katapult.png
 %{tde_datadir}/icons/hicolor/scalable/apps/katapult.svgz
diff --git a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13-ftbfs_qt_ldlflags.patch b/redhat/applications/kdbusnotification/kdbusnotification-3.5.13-missing_ldlflags.patch
index 06e1d455e..06e1d455e 100644
--- a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13-ftbfs_qt_ldlflags.patch
+++ b/redhat/applications/kdbusnotification/kdbusnotification-3.5.13-missing_ldlflags.patch
diff --git a/redhat/applications/kdbusnotification/trinity-kdbusnotification-3.5.13.spec b/redhat/applications/kdbusnotification/trinity-kdbusnotification-3.5.13.spec
index 83aa3617a..597505ee4 100644
--- a/redhat/applications/kdbusnotification/trinity-kdbusnotification-3.5.13.spec
+++ b/redhat/applications/kdbusnotification/trinity-kdbusnotification-3.5.13.spec
@@ -1,26 +1,33 @@
 # Default version for this component
 %define kdecomp kdbusnotification
-%define version 0.1
-%define release 2
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_prefix}/share/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/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-%{kdecomp}
 Summary:	a DBUS notification service [Trinity]
 
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	0.1
+Release:	2%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -29,18 +36,18 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org/
 
-Prefix:    %{_prefix}
+Prefix:    %{tde_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
 
 # [kdbusnotification/src/daemon] Missing QT LDFLAGS
-Patch0:		kdbusnotification-3.5.13-ftbfs_qt_ldlflags.patch
+Patch1:		kdbusnotification-3.5.13-missing_ldlflags.patch
 
 BuildRequires: tqtinterface-devel
 BuildRequires: trinity-arts-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
+BuildRequires: trinity-tdelibs-devel
+BuildRequires: trinity-tdebase-devel
 BuildRequires: desktop-file-utils
 BuildRequires: dbus-glib-devel
 BuildRequires: gtk2-devel
@@ -52,13 +59,13 @@ DBUS notifications via unobtrusive, easily dismissed passive popups.
 
 %prep
 %setup -q -n applications/%{kdecomp}
-%patch0 -p1
+%patch1 -p1 -b .ldflags
 
 # 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|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+  -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"
@@ -66,19 +73,25 @@ DBUS notifications via unobtrusive, easily dismissed passive popups.
 
 
 %build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+unset QTDIR || : ; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt \
-    --enable-closure
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --libdir=%{tde_libdir} \
+  --datadir=%{tde_datadir} \
+  --disable-rpath \
+  --with-extra-includes=%{tde_includedir}/tqt \
+  --enable-closure
 
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
@@ -91,8 +104,8 @@ export PATH="%{_bindir}:${PATH}"
 
 %files
 %defattr(-,root,root,-)
-%{_bindir}/notification-daemon-tde
-%{_datadir}/autostart/kdbusnotification-autostart.desktop
+%{tde_bindir}/notification-daemon-tde
+%{tde_datadir}/autostart/kdbusnotification-autostart.desktop
 
 
 
diff --git a/redhat/applications/kde-guidance/trinity-guidance-3.5.13.spec b/redhat/applications/kde-guidance/trinity-guidance-3.5.13.spec
index 4f5062344..d592fda62 100644
--- a/redhat/applications/kde-guidance/trinity-guidance-3.5.13.spec
+++ b/redhat/applications/kde-guidance/trinity-guidance-3.5.13.spec
@@ -1,16 +1,25 @@
 %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_datadir}/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/kde
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_docdir}
 
 %define __arch_install_post %{nil}
 
@@ -26,14 +35,14 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.simonzone.com/software/guidance
 
-Prefix:    %{_prefix}
+Prefix:    %{tde_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	kde-guidance-3.5.13.tar.gz
 
 BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-kdelibs-devel
-BuildRequires:	trinity-kdebase-devel
+BuildRequires:	trinity-tdelibs-devel
+BuildRequires:	trinity-tdebase-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
@@ -43,6 +52,11 @@ BuildRequires:	python-trinity
 BuildRequires:	chrpath
 BuildRequires:	gcc-c++
 
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	python-sip
+BuildRequires:	python-qt
+Requires:	python-qt
+%else
 %if 0%{?rhel} == 5
 BuildRequires:	trinity-PyQt-devel
 BuildRequires:	trinity-sip-devel
@@ -52,13 +66,15 @@ BuildRequires:	PyQt-devel
 BuildRequires:	sip-devel
 Requires:		PyQt
 %endif
+%endif
+
 
 Requires:		python-trinity
 Requires:		%{name}-backends
 Requires:		hwdata
 Requires:		python
 
-%if "%{_prefix}" == "/usr"
+%if "%{tde_prefix}" == "/usr"
 Conflicts:	guidance-power-manager
 Conflicts:	kde-guidance-powermanager
 %endif
@@ -103,97 +119,105 @@ suspend using HAL.
 
 %build
 unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt
-
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 export EXTRA_MODULE_DIR="%{python_sitearch}/%{name}"
 
+# Avoids 'error: byte-compiling is disabled.' on Mandriva/Mageia
+export PYTHONDONTWRITEBYTECODE=
+
 ./setup.py build
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
 export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt
-
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 export EXTRA_MODULE_DIR="%{python_sitearch}/%{name}"
+
+# Avoids 'error: byte-compiling is disabled.' on Mandriva/Mageia
+export PYTHONDONTWRITEBYTECODE=
+
 %__rm -rf %{buildroot}
 ./setup.py install \
-	--prefix=%{_prefix} \
+	--prefix=%{tde_prefix} \
 	--root=%{buildroot}
 
 # Fix building directories stored inside .py files
-for f in %{buildroot}%{_datadir}/apps/guidance/*.py; do
+for f in %{buildroot}%{tde_datadir}/apps/guidance/*.py; do
 	%__sed -i "${f}" -e "s|%{buildroot}||g"
 done
 
 ##### MAIN PACKAGE INSTALLATION 
 # install icons to right place
-%__mkdir_p %{buildroot}%{_datadir}/icons/crystalsvg/32x32/apps
-%__mv -f %{buildroot}%{_datadir}/apps/guidance/pics/hi32-app-daemons.png \
-	%{buildroot}%{_datadir}/icons/crystalsvg/32x32/apps/daemons.png
-%__mv -f %{buildroot}%{_datadir}/apps/guidance/pics/kcmpartitions.png \
-	%{buildroot}%{_datadir}/icons/crystalsvg/32x32/apps/disksfilesystems.png
-%__mv -f %{buildroot}%{_datadir}/apps/guidance/pics/hi32-user.png \
-	%{buildroot}%{_datadir}/icons/crystalsvg/32x32/apps/userconfig.png
-%__mv -f %{buildroot}%{_datadir}/apps/guidance/pics/hi32-display.png \
-	%{buildroot}%{_datadir}/icons/crystalsvg/32x32/apps/displayconfig.png
-%__mv -f %{buildroot}%{_datadir}/apps/guidance/pics/32-wine.png \
-	%{buildroot}%{_datadir}/icons/crystalsvg/32x32/apps/wineconfig.png
+%__mkdir_p %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps
+%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-app-daemons.png \
+	%{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/daemons.png
+%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/kcmpartitions.png \
+	%{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/disksfilesystems.png
+%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-user.png \
+	%{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/userconfig.png
+%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-display.png \
+	%{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/displayconfig.png
+%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/32-wine.png \
+	%{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/wineconfig.png
 %__install -D -p -m0644 kde/wineconfig/pics/16x16/wineconfig.png \
-	%{buildroot}%{_datadir}/icons/crystalsvg/16x16/apps/wineconfig.png
+	%{buildroot}%{tde_datadir}/icons/crystalsvg/16x16/apps/wineconfig.png
 
 # fix binary-or-shlib-defines-rpath
-chrpath -d %{buildroot}%{tde_libdir}/kcm_*.so
+chrpath -d %{buildroot}%{tde_tdelibdir}/kcm_*.so
 
 # fix executable-not-elf-or-script
-%__chmod 0644 %{buildroot}%{_datadir}/apps/guidance/pics/kdewinewizard.png
+%__chmod 0644 %{buildroot}%{tde_datadir}/apps/guidance/pics/kdewinewizard.png
 
 # move python modules in %{python_sitearch}
 %__mkdir_p %{buildroot}%{python_sitearch}/%{name} 
-%__mv -f %{buildroot}%{_datadir}/apps/guidance/*.py %{buildroot}%{python_sitearch}/%{name}
+%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/*.py %{buildroot}%{python_sitearch}/%{name}
 
 # fix the link properly
-%__rm -f %{buildroot}%{_bindir}/*
-%__ln_s -f %{python_sitearch}/%{name}/displayconfig.py %{buildroot}%{_bindir}/displayconfig
-%__ln_s -f %{python_sitearch}/%{name}/mountconfig.py %{buildroot}%{_bindir}/mountconfig
-%__ln_s -f %{python_sitearch}/%{name}/serviceconfig.py %{buildroot}%{_bindir}/serviceconfig
-%__ln_s -f %{python_sitearch}/%{name}/userconfig.py %{buildroot}%{_bindir}/userconfig
-%__ln_s -f %{python_sitearch}/%{name}/wineconfig.py %{buildroot}%{_bindir}/wineconfig
-%__ln_s -f %{python_sitearch}/%{name}/grubconfig.py %{buildroot}%{_bindir}/grubconfig
+%__rm -f %{buildroot}%{tde_bindir}/*
+#%__ln_s -f %{python_sitearch}/%{name}/displayconfig.py %{buildroot}%{tde_bindir}/displayconfig
+%__ln_s -f %{python_sitearch}/%{name}/mountconfig.py %{buildroot}%{tde_bindir}/mountconfig
+%__ln_s -f %{python_sitearch}/%{name}/serviceconfig.py %{buildroot}%{tde_bindir}/serviceconfig
+%__ln_s -f %{python_sitearch}/%{name}/userconfig.py %{buildroot}%{tde_bindir}/userconfig
+%__ln_s -f %{python_sitearch}/%{name}/wineconfig.py %{buildroot}%{tde_bindir}/wineconfig
+%__ln_s -f %{python_sitearch}/%{name}/grubconfig.py %{buildroot}%{tde_bindir}/grubconfig
 
-# put this here since gnome people probably don't want it by default
-%__ln_s -f %{_python_sitearch}/%{name}/displayconfig-restore.py %{buildroot}%{_bindir}/displayconfig-restore
+# (obsolete)  put this here since gnome people probably don't want it by default
+#%__ln_s -f %{_python_sitearch}/%{name}/displayconfig-restore.py %{buildroot}%{tde_bindir}/displayconfig-restore
 
 # fix script-not-executable
 %__chmod 0755 %{buildroot}%{python_sitearch}/%{name}/fuser.py
 %__chmod 0755 %{buildroot}%{python_sitearch}/%{name}/grubconfig.py
 
-%__mv -f %{buildroot}%{_datadir}/applications/kde/displayconfig.desktop %{buildroot}%{_datadir}/applications/kde/guidance-displayconfig.desktop
+%__mv -f %{buildroot}%{tde_datadir}/applications/kde/displayconfig.desktop %{buildroot}%{tde_datadir}/applications/kde/guidance-displayconfig.desktop
 
 ##### BACKENDS INSTALLATION
 # install displayconfig-hwprobe.py script
 %__install -D -p -m0755 displayconfig/displayconfig-hwprobe.py \
 	%{buildroot}%{python_sitearch}/%{name}/displayconfig-hwprobe.py
 
-%__mv -f %{buildroot}%{_libdir}/python*/site-packages/ixf86misc.so %{buildroot}%{python_sitearch}
-%__mv -f %{buildroot}%{_libdir}/python*/site-packages/xf86misc.py* %{buildroot}%{python_sitearch}/%{name}
+# The xf86misc stuff should not go under /opt/trinity bur under /usr !!!
+%__mv -f %{buildroot}%{tde_libdir}/python*/site-packages/ixf86misc.so %{buildroot}%{python_sitearch}
+%__mv -f %{buildroot}%{tde_libdir}/python*/site-packages/xf86misc.py* %{buildroot}%{python_sitearch}/%{name}
 
-%__rm -f %{buildroot}%{_datadir}/apps/guidance/MonitorsDB
-%__ln_s -f /usr/share/hwdata/MonitorsDB %{buildroot}%{_datadir}/apps/guidance/MonitorsDB
+%__rm -f %{buildroot}%{tde_datadir}/apps/guidance/MonitorsDB
+%__ln_s -f /usr/share/hwdata/MonitorsDB %{buildroot}%{tde_datadir}/apps/guidance/MonitorsDB
 
 
 
 ##### POWERMANAGER INSTALLATION
 # install icon to right place
 %__install -D -p -m0644 kde/powermanager/pics/battery-charging-100.png \
-		%{buildroot}%{_datadir}/icons/hicolor/22x22/apps/power-manager.png
+		%{buildroot}%{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png
 %__install -D -p -m0644 kde/powermanager/pics/*.png \
-		%{buildroot}%{_datadir}/apps/guidance/pics/
+		%{buildroot}%{tde_datadir}/apps/guidance/pics/
 
 # install desktop file
 %__install -D -p -m0644 powermanager/guidance-power-manager.desktop \
-		%{buildroot}%{_datadir}/autostart/guidance-power-manager.desktop
+		%{buildroot}%{tde_datadir}/autostart/guidance-power-manager.desktop
 
 # copy python modules in PYSUPPORT_PATH
 %__cp powermanager/guidance_power_manager_ui.py %{buildroot}%{python_sitearch}/%{name}
@@ -201,12 +225,12 @@ chrpath -d %{buildroot}%{tde_libdir}/kcm_*.so
 %__cp powermanager/tooltip.py %{buildroot}%{python_sitearch}/%{name}
 
 # generate guidance-power-manager script
-cat <<EOF >%{buildroot}%{_bindir}/guidance-power-manager
+cat <<EOF >%{buildroot}%{tde_bindir}/guidance-power-manager
 #!/bin/sh
 export PYTHONPATH=%{python_sitearch}/%{name}
 %{python_sitearch}/%{name}/guidance-power-manager.py &
 EOF
-chmod +x %{buildroot}%{_bindir}/guidance-power-manager
+chmod +x %{buildroot}%{tde_bindir}/guidance-power-manager
 
 # fix script-not-executable
 chmod 0755 %{buildroot}%{python_sitearch}/%{name}/powermanage.py
@@ -227,51 +251,59 @@ for i in `find %{buildroot} -type f`; do
 	fi;
 done
 
+# Removes useless files
 find %{buildroot} -name "*.egg-info" -exec rm -f {} \;
 #find %{buildroot}%{_libdir} -name "*.a" -exec rm -f {} \;
 
+%__rm -f %{?buildroot}%{python_sitearch}/%{name}/*.pyc
+%__rm -f %{?buildroot}%{python_sitearch}/%{name}/*.pyo
+
+# Removes obsolete display config manager
+%__rm -f %{?buildroot}/etc/X11/Xsession.d/40guidance-displayconfig_restore
+%__rm -f %{?buildroot}%{tde_tdelibdir}/kcm_displayconfig.*
+%__rm -f %{?buildroot}%{python_sitearch}/%{name}/displayconfig.py
+%__rm -f %{?buildroot}%{python_sitearch}/%{name}/displayconfigwidgets.py 
+
 
 %clean
 %__rm -rf %{buildroot}
 
 
 %post
-touch --no-create %{_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
+touch --no-create %{tde_datadir}/icons/crystalsvg || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
 /sbin/ldconfig || :
 
 %postun
-touch --no-create %{_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
+touch --no-create %{tde_datadir}/icons/crystalsvg || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
 /sbin/ldconfig || :
 
 %post powermanager
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 %postun powermanager
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING README TODO
-%{_bindir}/displayconfig
-%{_bindir}/displayconfig-restore
-%{_bindir}/grubconfig
-%{_bindir}/mountconfig
-%{_bindir}/serviceconfig
-%{_bindir}/userconfig
-%{_bindir}/wineconfig
-%attr(0644,root,root) %{tde_libdir}/*.so
-%attr(0644,root,root) %{tde_libdir}/*.la
-%{_datadir}/apps/guidance
-%{_datadir}/applications/kde/*.desktop
-%{_datadir}/icons/crystalsvg/*/*/*.png
-%{_datadir}/icons/crystalsvg/*/*/*.svg
-%{tde_docdir}/HTML/en/guidance
-%exclude /etc/X11/Xsession.d/40guidance-displayconfig_restore
+#%{tde_bindir}/displayconfig
+#%{tde_bindir}/displayconfig-restore
+%{tde_bindir}/grubconfig
+%{tde_bindir}/mountconfig
+%{tde_bindir}/serviceconfig
+%{tde_bindir}/userconfig
+%{tde_bindir}/wineconfig
+%attr(0644,root,root) %{tde_tdelibdir}/*.so
+%attr(0644,root,root) %{tde_tdelibdir}/*.la
+%{tde_datadir}/apps/guidance/
+%{tde_datadir}/applications/kde/*.desktop
+%{tde_datadir}/icons/crystalsvg/*/*/*.png
+%{tde_datadir}/icons/crystalsvg/*/*/*.svg
 %{python_sitearch}/%{name}/SMBShareSelectDialog.py 
 %{python_sitearch}/%{name}/SimpleCommandRunner.py
 %{python_sitearch}/%{name}/fuser.py
@@ -285,11 +317,21 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %{python_sitearch}/%{name}/unixauthdb.py
 %{python_sitearch}/%{name}/userconfig.py
 %{python_sitearch}/%{name}/wineconfig.py
-
-# Removes obsolete display config manager
-%exclude %{tde_libdir}/kcm_displayconfig.*
-%exclude %{python_sitearch}/%{name}/displayconfig.py
-%exclude %{python_sitearch}/%{name}/displayconfigwidgets.py 
+%{tde_tdedocdir}/HTML/en/guidance/
+
+# Files from backends
+%exclude %{tde_datadir}/apps/guidance/vesamodes
+%exclude %{tde_datadir}/apps/guidance/extramodes
+%exclude %{tde_datadir}/apps/guidance/widescreenmodes
+%exclude %{tde_datadir}/apps/guidance/Cards+
+%exclude %{tde_datadir}/apps/guidance/pcitable
+%exclude %{tde_datadir}/apps/guidance/MonitorsDB
+
+# Files from powermanager
+%exclude %{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png
+%exclude %{tde_datadir}/apps/guidance/pics/ac-adapter.png
+%exclude %{tde_datadir}/apps/guidance/pics/battery*.png
+%exclude %{tde_datadir}/apps/guidance/pics/processor.png
 
 %files -n trinity-guidance-backends
 %defattr(-,root,root,-)
@@ -306,18 +348,18 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %{python_sitearch}/%{name}/xf86misc.py
 %{python_sitearch}/%{name}/xorgconfig.py
 %{python_sitearch}/ixf86misc.so
-%{_datadir}/apps/guidance/vesamodes
-%{_datadir}/apps/guidance/extramodes
-%{_datadir}/apps/guidance/widescreenmodes
-%{_datadir}/apps/guidance/Cards+
-%{_datadir}/apps/guidance/pcitable
-%{_datadir}/apps/guidance/MonitorsDB
+%{tde_datadir}/apps/guidance/vesamodes
+%{tde_datadir}/apps/guidance/extramodes
+%{tde_datadir}/apps/guidance/widescreenmodes
+%{tde_datadir}/apps/guidance/Cards+
+%{tde_datadir}/apps/guidance/pcitable
+%{tde_datadir}/apps/guidance/MonitorsDB
 
 
 
 %files powermanager
 %defattr(-,root,root,-)
-%{_bindir}/guidance-power-manager
+%{tde_bindir}/guidance-power-manager
 %{python_sitearch}/%{name}/MicroHAL.py
 %{python_sitearch}/%{name}/guidance-power-manager.py
 %{python_sitearch}/%{name}/powermanage.py
@@ -326,14 +368,11 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %{python_sitearch}/%{name}/guidance_power_manager_ui.py
 %{python_sitearch}/%{name}/notify.py
 %{python_sitearch}/%{name}/tooltip.py
-%{_datadir}/icons/hicolor/22x22/apps/power-manager.png
-%{_datadir}/apps/guidance/pics/ac-adapter.png
-%{_datadir}/apps/guidance/pics/battery*.png
-%{_datadir}/apps/guidance/pics/processor.png
-%{_datadir}/autostart/guidance-power-manager.desktop
-
-%exclude %{python_sitearch}/%{name}/*.pyc
-%exclude %{python_sitearch}/%{name}/*.pyo
+%{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png
+%{tde_datadir}/apps/guidance/pics/ac-adapter.png
+%{tde_datadir}/apps/guidance/pics/battery*.png
+%{tde_datadir}/apps/guidance/pics/processor.png
+%{tde_datadir}/autostart/guidance-power-manager.desktop
 
 
 
diff --git a/redhat/applications/kde-style-lipstik/trinity-kde-style-lipstik-3.5.13.spec b/redhat/applications/kde-style-lipstik/trinity-kde-style-lipstik-3.5.13.spec
index 5883a3d92..8834e935a 100644
--- a/redhat/applications/kde-style-lipstik/trinity-kde-style-lipstik-3.5.13.spec
+++ b/redhat/applications/kde-style-lipstik/trinity-kde-style-lipstik-3.5.13.spec
@@ -1,25 +1,32 @@
 # Default version for this component
 %define kdecomp kde-style-lipstik
-%define version 2.2.3
-%define release 2
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_prefix}/share/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/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-style-lipstik
 Summary:	Lipstik style for TDE
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	2.2.3
+Release:	2%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -28,16 +35,16 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org/
 
-Prefix:    %{_prefix}
+Prefix:    %{tde_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
 
-Obsoletes:	trinity-kde-style-lipstik
+Obsoletes:		trinity-kde-style-lipstik
 
 BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-kdelibs-devel
-BuildRequires:	trinity-kdebase-devel
+BuildRequires:	trinity-tdelibs-devel
+BuildRequires:	trinity-tdebase-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
@@ -55,8 +62,8 @@ Lipstik also provides Lipstik-color-schemes
 # 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|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+  -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"
@@ -64,18 +71,23 @@ Lipstik also provides Lipstik-color-schemes
 
 
 %build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --disable-rpath \
+  --with-extra-includes=%{tde_includedir}/tqt
 
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
@@ -88,14 +100,14 @@ export PATH="%{_bindir}:${PATH}"
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
-%{tde_libdir}/kstyle_lipstik_config.la
-%{tde_libdir}/kstyle_lipstik_config.so
-%{tde_libdir}/plugins/styles/lipstik.la
-%{tde_libdir}/plugins/styles/lipstik.so
-%{_datadir}/apps/kdisplay/color-schemes/lipstiknoble.kcsrc
-%{_datadir}/apps/kdisplay/color-schemes/lipstikstandard.kcsrc
-%{_datadir}/apps/kdisplay/color-schemes/lipstikwhite.kcsrc
-%{_datadir}/apps/kstyle/themes/lipstik.themerc
+%{tde_tdelibdir}/kstyle_lipstik_config.la
+%{tde_tdelibdir}/kstyle_lipstik_config.so
+%{tde_tdelibdir}/plugins/styles/lipstik.la
+%{tde_tdelibdir}/plugins/styles/lipstik.so
+%{tde_datadir}/apps/kdisplay/color-schemes/lipstiknoble.kcsrc
+%{tde_datadir}/apps/kdisplay/color-schemes/lipstikstandard.kcsrc
+%{tde_datadir}/apps/kdisplay/color-schemes/lipstikwhite.kcsrc
+%{tde_datadir}/apps/kstyle/themes/lipstik.themerc
 
 
 %Changelog
diff --git a/redhat/applications/kde-style-qtcurve/trinity-kde-style-qtcurve.spec b/redhat/applications/kde-style-qtcurve/trinity-kde-style-qtcurve.spec
index b52e16305..b859075ba 100644
--- a/redhat/applications/kde-style-qtcurve/trinity-kde-style-qtcurve.spec
+++ b/redhat/applications/kde-style-qtcurve/trinity-kde-style-qtcurve.spec
@@ -1,25 +1,32 @@
 # Default version for this component
 %define kdecomp kde-style-qtcurve
-%define version 0.55.2
-%define release 2
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_prefix}/share/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/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-style-qtcurve
 Summary:	This is a set of widget styles for Trinity based apps
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	0.55.2
+Release:	2%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -28,7 +35,7 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org/
 
-Prefix:    %{_prefix}
+Prefix:    %{tde_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
@@ -36,8 +43,8 @@ Source0:	%{kdecomp}-3.5.13.tar.gz
 Patch0:		kde-style-qtcurve-1.6.2-libsuffix.patch
 
 BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-kdelibs-devel
-BuildRequires:	trinity-kdebase-devel
+BuildRequires:	trinity-tdelibs-devel
+BuildRequires:	trinity-tdebase-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
@@ -58,26 +65,29 @@ gtk2-engines-qtcurve.
 # Ugly hack to modify TQT include directory inside autoconf files.
 # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
 %__sed -i CMakeLists.txt \
-  -e "s|/usr/include/tqt|%{_includedir}/tqt|g"
+  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g"
 
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
+
+export CXXFLAGS="-I${QTINC} -I%{tde_tdeincludedir} ${CXXFLAGS}"
 
-export CXXFLAGS="-I${QTINC} ${CXXFLAGS}"
-	
-%__mkdir build
+%if 0%{?rhel} || 0%{?fedora}
+%__mkdir_p build
 cd build
+%endif
+
 %cmake \
-	-DKDE3PREFIX=%{_prefix} \
+	-DKDE3PREFIX=%{tde_prefix} \
 	..
 
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot} -C build
 
@@ -90,20 +100,20 @@ export PATH="%{_bindir}:${PATH}"
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
-%{tde_libdir}/plugins/styles/qtcurve.so
-%{_datadir}/apps/QtCurve/Agua.qtcurve
-%{_datadir}/apps/QtCurve/Agua_II.qtcurve
-%{_datadir}/apps/QtCurve/Curve.qtcurve
-%{_datadir}/apps/QtCurve/Flat.qtcurve
-%{_datadir}/apps/QtCurve/Human.qtcurve
-%{_datadir}/apps/QtCurve/Inverted.qtcurve
-%{_datadir}/apps/QtCurve/Klearlooks.qtcurve
-%{_datadir}/apps/QtCurve/Milk.qtcurve
-%{_datadir}/apps/QtCurve/Murrine.qtcurve
-%{_datadir}/apps/QtCurve/Ozone.qtcurve
-%{_datadir}/apps/QtCurve/Plastic.qtcurve
-%{_datadir}/apps/QtCurve/Silk.qtcurve
-%{_datadir}/apps/kdisplay/color-schemes/QtCurve.kcsrc
+%{tde_tdelibdir}/plugins/styles/qtcurve.so
+%{tde_datadir}/apps/QtCurve/Agua.qtcurve
+%{tde_datadir}/apps/QtCurve/Agua_II.qtcurve
+%{tde_datadir}/apps/QtCurve/Curve.qtcurve
+%{tde_datadir}/apps/QtCurve/Flat.qtcurve
+%{tde_datadir}/apps/QtCurve/Human.qtcurve
+%{tde_datadir}/apps/QtCurve/Inverted.qtcurve
+%{tde_datadir}/apps/QtCurve/Klearlooks.qtcurve
+%{tde_datadir}/apps/QtCurve/Milk.qtcurve
+%{tde_datadir}/apps/QtCurve/Murrine.qtcurve
+%{tde_datadir}/apps/QtCurve/Ozone.qtcurve
+%{tde_datadir}/apps/QtCurve/Plastic.qtcurve
+%{tde_datadir}/apps/QtCurve/Silk.qtcurve
+%{tde_datadir}/apps/kdisplay/color-schemes/QtCurve.kcsrc
 
 
 %Changelog
diff --git a/redhat/applications/kde-systemsettings/trinity-kde-systemsettings.spec b/redhat/applications/kde-systemsettings/trinity-kde-systemsettings.spec
index 17fd66486..ed156aba8 100644
--- a/redhat/applications/kde-systemsettings/trinity-kde-systemsettings.spec
+++ b/redhat/applications/kde-systemsettings/trinity-kde-systemsettings.spec
@@ -2,19 +2,27 @@
 %define kdecomp kde-systemsettings
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_datadir}/doc
-
 # Currently, menu files under /etc/xdg conflict with KDE4
-%define _sysconfdir %{_prefix}/etc
+%define tde_sysconfdir %{tde_prefix}/etc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/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-systemsettings
@@ -29,7 +37,7 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org
 
-Prefix:		%{_prefix}
+Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
@@ -56,8 +64,8 @@ Control Centre with an improved user interface.
 # 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|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+  -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"
@@ -66,57 +74,65 @@ Control Centre with an improved user interface.
 
 %build
 unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt \
-    --enable-closure
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --sysconfdir=%{tde_sysconfdir} \
+  --disable-rpath \
+  --with-extra-includes=%{tde_includedir}/tqt \
+  --enable-closure
 
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
-%__install -D -m 644 %{SOURCE1} %{buildroot}%{_datadir}/desktop-directories/
+%__install -D -m 644 %{SOURCE1} %{buildroot}%{tde_datadir}/desktop-directories/
+
+# Unwanted files
+%__rm -f %{buildroot}%{tde_datadir}/applications/kde/kcmfontinst.desktop
+%__rm -f %{buildroot}%{tde_datadir}/desktop-directories/kde-settings-power.directory
+%__rm -f %{buildroot}%{tde_datadir}/desktop-directories/kde-settings-system.directory
 
 %clean
 %__rm -rf %{buildroot}
 
 
 %post
-touch --no-create %{_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
+touch --no-create %{tde_datadir}/icons/crystalsvg || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
+xdg-user-dirs-update
 
 %postun
-touch --no-create %{_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
-
+touch --no-create %{tde_datadir}/icons/crystalsvg || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
+xdg-user-dirs-update
 
 %files
 %defattr(-,root,root,-)
 %doc README TODO
-%{_sysconfdir}/xdg/menus/applications-merged/system-settings-merge.menu
-%{_sysconfdir}/xdg/menus/system-settings.menu
-%{_bindir}/systemsettings
-%{_datadir}/applications/kde/audioencoding.desktop
-%{_datadir}/applications/kde/defaultapplication.desktop
-%{_datadir}/applications/kde/kcm_knetworkconfmodule_ss.desktop
-%{_datadir}/applications/kde/laptoppowermanagement.desktop
-%{_datadir}/applications/kde/medianotifications.desktop
-%{_datadir}/applications/kde/systemsettings.desktop
-%{_datadir}/apps/systemsettings/systemsettingsui.rc
-%{_datadir}/config/systemsettingsrc
-%{_datadir}/desktop-directories/*.directory
-%{_datadir}/icons/crystalsvg/*/apps/systemsettings.png
-
-%exclude %{_datadir}/applications/kde/kcmfontinst.desktop
-%exclude %{_datadir}/desktop-directories/kde-settings-power.directory
-%exclude %{_datadir}/desktop-directories/kde-settings-system.directory
+%{tde_sysconfdir}/xdg/menus/applications-merged/system-settings-merge.menu
+%{tde_sysconfdir}/xdg/menus/system-settings.menu
+%{tde_bindir}/systemsettings
+%{tde_datadir}/applications/kde/audioencoding.desktop
+%{tde_datadir}/applications/kde/defaultapplication.desktop
+%{tde_datadir}/applications/kde/kcm_knetworkconfmodule_ss.desktop
+%{tde_datadir}/applications/kde/laptoppowermanagement.desktop
+%{tde_datadir}/applications/kde/medianotifications.desktop
+%{tde_datadir}/applications/kde/systemsettings.desktop
+%{tde_datadir}/apps/systemsettings/systemsettingsui.rc
+%{tde_datadir}/config/systemsettingsrc
+%{tde_datadir}/desktop-directories/*.directory
+%{tde_datadir}/icons/crystalsvg/*/apps/systemsettings.png
+
 
 
 %Changelog
diff --git a/redhat/applications/kdesudo/trinity-kdesudo-3.5.13.spec b/redhat/applications/kdesudo/trinity-kdesudo-3.5.13.spec
index 2817ed3db..da04bb7ef 100644
--- a/redhat/applications/kdesudo/trinity-kdesudo-3.5.13.spec
+++ b/redhat/applications/kdesudo/trinity-kdesudo-3.5.13.spec
@@ -1,26 +1,33 @@
 # Default version for this component
 %define kdecomp kdesudo
-%define version 2.5.1
-%define release 2
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_prefix}/share/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/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-%{kdecomp}
 Summary:	sudo frontend for Trinity
 
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	2.5.1
+Release:	2%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -36,8 +43,8 @@ Source0:	%{kdecomp}-3.5.13.tar.gz
 
 BuildRequires: tqtinterface-devel
 BuildRequires: trinity-arts-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
+BuildRequires: trinity-tdelibs-devel
+BuildRequires: trinity-tdebase-devel
 BuildRequires: desktop-file-utils
 
 
@@ -52,8 +59,8 @@ It allows you to run programs as another user by entering your password.
 # 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|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+  -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"
@@ -62,18 +69,21 @@ It allows you to run programs as another user by entering your password.
 
 %build
 unset QTDIR || : ; source /etc/profile.d/qt.sh
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --disable-rpath \
+  --with-extra-includes=%{tde_includedir}/tqt
 
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
@@ -97,19 +107,17 @@ for lang_dir in %{buildroot}$HTML_DIR/* ; do
 done
 fi
 
+%find_lang %{kdecomp}
 
 %clean
 %__rm -rf %{buildroot}
 
 
 
-%files
+%files -f %{kdecomp}.lang
 %defattr(-,root,root,-)
-%{_bindir}/kdesudo
-%{tde_docdir}/HTML/en/kdesudo/common
-%{tde_docdir}/HTML/en/kdesudo/index.cache.bz2
-%{tde_docdir}/HTML/en/kdesudo/index.docbook
-%{_datadir}/locale/fr/LC_MESSAGES/kdesudo.mo
+%{tde_bindir}/kdesudo
+%{tde_tdedocdir}/HTML/en/kdesudo/
 
 
 %Changelog
diff --git a/redhat/applications/kdesvn/kdesvn-3.5.13-fix_not_a_string_literal_error.patch b/redhat/applications/kdesvn/kdesvn-3.5.13-fix_not_a_string_literal_error.patch
new file mode 100644
index 000000000..c912db32b
--- /dev/null
+++ b/redhat/applications/kdesvn/kdesvn-3.5.13-fix_not_a_string_literal_error.patch
@@ -0,0 +1,127 @@
+--- kdesvn/src/svnqt/cache/LogCache.cpp.stringliteral	2011-08-17 23:41:23.000000000 +0200
++++ kdesvn/src/svnqt/cache/LogCache.cpp	2012-08-05 12:44:59.038119225 +0200
+@@ -187,7 +187,7 @@
+             TQDataBase db = TQSqlDatabase::addDatabase(SQLTYPE,_key);
+             db->setDatabaseName(m_BasePath+"/maindb.db");
+             if (!db->open()) {
+-                qWarning("Failed to open main database: " + db->lastError().text());
++                qWarning("%s", (TQString("Failed to open main database: " + db->lastError().text())).ascii());
+             } else {
+                 m_mainDB.setLocalData(new ThreadDBStore);
+                 m_mainDB.localData()->key = _key;
+@@ -269,12 +269,12 @@
+ #endif
+     TQDataBase mainDB = m_CacheData->getMainDB();
+     if (!mainDB || !mainDB->open()) {
+-        qWarning("Failed to open main database: " + (mainDB?mainDB->lastError().text():"No database object."));
++        qWarning("%s", ("Failed to open main database: " + (mainDB?mainDB->lastError().text():"No database object.")).ascii());
+     } else {
+         TQSqlQuery q(TQString(), mainDB);
+         mainDB->transaction();
+         if (!q.exec("CREATE TABLE IF NOT EXISTS \""+TQString(SQLMAINTABLE)+"\" (\"reposroot\" TEXT,\"id\" INTEGER PRIMARY KEY NOT NULL);")) {
+-            qWarning("Failed create main database: " + mainDB->lastError().text());
++            qWarning("%s", ("Failed create main database: " + mainDB->lastError().text()).ascii());
+         }
+         mainDB->commit();
+     }
+@@ -321,7 +321,7 @@
+     TQSqlQuery cur(TQString(),mainDB);
+     cur.prepare(s_q);
+     if (!cur.exec()) {
+-        qDebug(cur.lastError().text().TOUTF8().data());
++        qDebug("%s", (TQString(cur.lastError().text().TOUTF8().data())).ascii());
+         throw svn::cache::DatabaseException(TQString("Could not retrieve values: ")+cur.lastError().text());
+         return _res;
+     }
+--- kdesvn/src/svnqt/cache/ReposLog.cpp.ORI	2012-08-05 12:50:50.352685697 +0200
++++ kdesvn/src/svnqt/cache/ReposLog.cpp	2012-08-05 12:55:39.515888432 +0200
+@@ -68,7 +68,7 @@
+     TQString q("select revision from 'logentries' order by revision DESC limit 1");
+     TQSqlQuery _q(TQString(), m_Database);
+     if (!_q.exec(q)) {
+-        qDebug(_q.lastError().text().TOUTF8().data());
++        qDebug("%s", (TQString(_q.lastError().text().TOUTF8().data())).ascii());
+         return svn::Revision::UNDEFINED;
+     }
+     int _r;
+@@ -76,7 +76,7 @@
+         //qDebug("Sel result: %s",_q.value(0).toString().TOUTF8().data());
+         _r = _q.value(0).toInt();
+     } else {
+-        qDebug(_q.lastError().text().TOUTF8().data());
++        qDebug("%s", (TQString(_q.lastError().text().TOUTF8().data())).ascii());
+         return svn::Revision::UNDEFINED;
+     }
+     return _r;
+@@ -197,7 +197,7 @@
+     bcount.bindValue(0,TQ_LLONG(end.revnum()));
+     bcount.bindValue(1,TQ_LLONG(start.revnum()));
+     if (!bcount.exec()) {
+-        qDebug(bcount.lastError().text().TOUTF8().data());
++        qDebug("%s", (TQString(bcount.lastError().text().TOUTF8().data())).ascii());
+         throw svn::cache::DatabaseException(TQString("Could not retrieve count: ")+bcount.lastError().text());
+         return false;
+     }
+@@ -211,7 +211,7 @@
+     bcur.bindValue(1,TQ_LLONG(start.revnum()));
+ 
+     if (!bcur.exec()) {
+-        qDebug(bcur.lastError().text().TOUTF8().data());
++        qDebug("%s", (TQString(bcur.lastError().text().TOUTF8().data())).ascii());
+         throw svn::cache::DatabaseException(TQString("Could not retrieve values: ")+bcur.lastError().text());
+         return false;
+     }
+@@ -220,7 +220,7 @@
+         revision = bcur.value(0).toLongLong();
+         cur.bindValue(0,revision);
+         if (!cur.exec()) {
+-            qDebug(cur.lastError().text().TOUTF8().data());
++            qDebug("%s", (TQString(cur.lastError().text().TOUTF8().data())).ascii());
+             throw svn::cache::DatabaseException(TQString("Could not retrieve values: ")+cur.lastError().text()
+                     ,cur.lastError().number());
+             return false;
+@@ -264,7 +264,7 @@
+     TQSqlQuery query("select revision,date from logentries order by revision desc limit 1",m_Database);
+ 
+     if (query.lastError().type()!=TQSqlError::None) {
+-        qDebug(query.lastError().text().TOUTF8().data());
++        qDebug("%s", (TQString(query.lastError().text().TOUTF8().data())).ascii());
+     }
+     bool must_remote=!noNetwork;
+     if (query.next()) {
+@@ -283,7 +283,7 @@
+     query.bindValue(0,TQ_LLONG(aRev.date()));
+     query.exec();
+     if (query.lastError().type()!=TQSqlError::None) {
+-        qDebug(query.lastError().text().TOUTF8().data());
++        qDebug("%s", (TQString(query.lastError().text().TOUTF8().data())).ascii());
+     }
+     if (query.next()) {
+         return query.value(0).toInt();
+@@ -320,7 +320,7 @@
+     if (!_q.exec()) {
+         m_Database->rollback();
+         qDebug("Could not insert values: %s",_q.lastError().text().TOUTF8().data());
+-        qDebug(_q.lastQuery().TOUTF8().data());
++        qDebug("%s", (TQString(_q.lastQuery().TOUTF8().data())).ascii());
+         throw svn::cache::DatabaseException(TQString("Could not insert values: ")+_q.lastError().text(),_q.lastError().number());
+     }
+     _q.prepare(qPathes);
+@@ -334,7 +334,7 @@
+         if (!_q.exec()) {
+             m_Database->rollback();
+             qDebug("Could not insert values: %s",_q.lastError().text().TOUTF8().data());
+-            qDebug(_q.lastQuery().TOUTF8().data());
++            qDebug("%s", (TQString(_q.lastQuery().TOUTF8().data())).ascii());
+             throw svn::cache::DatabaseException(TQString("Could not insert values: ")+_q.lastError().text(),_q.lastError().number());
+         }
+     }
+@@ -375,7 +375,7 @@
+     _q.prepare(query_string);
+     if (!_q.exec()) {
+         qDebug("Could not select values: %s",_q.lastError().text().TOUTF8().data());
+-        qDebug(_q.lastQuery().TOUTF8().data());
++        qDebug("%s", (TQString(_q.lastQuery().TOUTF8().data())).ascii());
+         throw svn::cache::DatabaseException(TQString("Could not select values: ")+_q.lastError().text(),_q.lastError().number());
+     }
+     while(_q.next()) {
diff --git a/redhat/applications/kdesvn/trinity-kdesvn.spec b/redhat/applications/kdesvn/trinity-kdesvn.spec
index 8e7f0c065..ce67e8923 100644
--- a/redhat/applications/kdesvn/trinity-kdesvn.spec
+++ b/redhat/applications/kdesvn/trinity-kdesvn.spec
@@ -2,24 +2,27 @@
 %define kdecomp kdesvn
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_bindir %{_prefix}/bin
-%define tde_datadir %{_prefix}/share
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{_prefix}/include
-%define tde_libdir %{_prefix}/%{_lib}
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
 %define tde_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
 
-%define tde_tdeappdir %{tde_datadir}/applications/kde
+%define tde_tdeappdir %{tde_appdir}/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-%{kdecomp}
 Summary:	subversion client with tight KDE integration [Trinity]
 Version:	1.0.4
@@ -39,6 +42,8 @@ Source0:	%{kdecomp}-3.5.13.tar.gz
 
 # [kdesvn] Fix compilation with GCC 4.7
 Patch1:		kdesvn-3.5.13-fix_gcc47_compilation.patch
+# [kdesvn] Fix "not a string literal" error
+Patch2:		kdesvn-3.5.13-fix_not_a_string_literal_error.patch
 
 BuildRequires:	tqtinterface-devel
 BuildRequires:	trinity-tdelibs-devel
@@ -98,18 +103,19 @@ This package is part of tdesvn-trinity.
 %prep
 %setup -q -n applications/%{kdecomp}
 %patch1 -p1
+%patch2 -p1 -b .stringliteral
 
 # Ugly hack to modify TQT include directory inside autoconf files.
 # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
 find . -name CMakeLists.txt -exec %__sed -i {} \
-  -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \
-  -e "s,/usr/bin/tmoc,%{_bindir}/tmoc,g" \
-  -e "s,/usr/bin/uic-tqt,%{_bindir}/uic-tqt,g" \
+  -e "s,/usr/include/tqt,%{tde_includedir}/tqt,g" \
+  -e "s,/usr/bin/tmoc,%{tde_bindir}/tmoc,g" \
+  -e "s,/usr/bin/uic-tqt,%{tde_bindir}/uic-tqt,g" \
   \;
 
 # More ugly hack to add TQT include directory in CMakeLists.txt	
 %__sed -i CMakeLists.txt \
-  -e "s,^\(INCLUDE_DIRECTORIES (\)$,\1\n%{_includedir}/tqt,"
+  -e "s,^\(INCLUDE_DIRECTORIES (\)$,\1\n%{tde_includedir}/tqt,"
 
 # Moves HTML files to the correect location
 find . -name "*.cmake" -exec %__sed -i {} \
@@ -118,15 +124,23 @@ find . -name "*.cmake" -exec %__sed -i {} \
 
 %build
 unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{_bindir}:${QTDIR}/bin:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+export PATH="%{tde_bindir}:${QTDIR}/bin:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
+
+export CMAKE_INCLUDE_PATH="%{tde_tdeincludedir}"
+
+%if 0%{?rhel} || 0%{?fedora}
+%__mkdir_p build
+cd build
+%endif
 
-%{?!mgaversion:%__mkdir build; cd build}
 %cmake \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
   -DBIN_INSTALL_DIR=%{tde_bindir} \
   -DINCLUDE_INSTALL_DIR=%{tde_includedir} \
   -DLIB_INSTALL_DIR=%{tde_libdir} \
   -DMAN_INSTALL_DIR=%{tde_mandir}/man1 \
+  -DDATA_INSTALL_DIR=%{tde_datadir} \
   -DPKGCONFIG_INSTALL_DIR=%{tde_tdelibdir}/pkgconfig \
   -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
   -DCMAKE_SKIP_RPATH="OFF" \
diff --git a/redhat/applications/kdiff3/trinity-kdiff3-3.5.13.spec b/redhat/applications/kdiff3/trinity-kdiff3-3.5.13.spec
index 8e12a9298..df4218b5d 100644
--- a/redhat/applications/kdiff3/trinity-kdiff3-3.5.13.spec
+++ b/redhat/applications/kdiff3/trinity-kdiff3-3.5.13.spec
@@ -1,26 +1,32 @@
 # Default version for this component
 %define kdecomp kdiff3
-%define version 0.9.91
-%define release 4
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_datadir}/doc
-%define _mandir %{_datadir}/man
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/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-%{kdecomp}
 Summary:	KDiff3 is a utility for comparing and/or merging two or three text files or directories.
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	0.9.91
+Release:	4%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -29,7 +35,7 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org/
 
-Prefix:    %{_prefix}
+Prefix:    %{tde_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
@@ -63,8 +69,8 @@ Unicode & UTF-8 support
 # 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|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+  -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"
@@ -72,22 +78,30 @@ Unicode & UTF-8 support
 
 
 %build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt \
-    --enable-closure
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --disable-rpath \
+  --with-extra-includes=%{tde_includedir}/tqt \
+  --enable-closure
 
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
+%find_lang %{kdecomp}
 
 %clean
 %__rm -rf %{buildroot}
@@ -95,33 +109,32 @@ export PATH="%{_bindir}:${PATH}"
 
 %post
 for f in hicolor locolor; do
-  touch --no-create %{_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+  touch --no-create %{tde_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
 done
 
 %postun
 for f in hicolor locolor; do
-  touch --no-create %{_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+  touch --no-create %{tde_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
 done
 
 
-%files
+%files -f %{kdecomp}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
-%{_bindir}/*
-%{_datadir}/apps/*/
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/icons/locolor/*/*/*
-%{_datadir}/locale/*/*/*.mo
-%{tde_docdir}/HTML/*/*
-%{_datadir}/services/*.desktop
-%{tde_libdir}/*.so
-%{_datadir}/applnk/Development/*.desktop
-%{_datadir}/applnk/.hidden/*.desktop
-%{_mandir}/man*/*
-
-%{tde_libdir}/*.la
+%{tde_bindir}/*
+%{tde_datadir}/apps/*/
+%{tde_datadir}/icons/hicolor/*/*/*
+%{tde_datadir}/icons/locolor/*/*/*
+%{tde_tdedocdir}/HTML/*/*
+%{tde_datadir}/services/*.desktop
+%{tde_datadir}/applnk/Development/*.desktop
+%{tde_datadir}/applnk/.hidden/*.desktop
+%{tde_mandir}/man*/*
+
+%{tde_tdelibdir}/*.so
+%{tde_tdelibdir}/*.la
 
 %Changelog
 * Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.91-4
diff --git a/redhat/applications/kdirstat/trinity-kdirstat.spec b/redhat/applications/kdirstat/trinity-kdirstat.spec
index 153c4b1a6..90691838f 100644
--- a/redhat/applications/kdirstat/trinity-kdirstat.spec
+++ b/redhat/applications/kdirstat/trinity-kdirstat.spec
@@ -1,25 +1,32 @@
 # Default version for this component
 %define kdecomp kdirstat
-%define version 2.4.4
-%define release 2
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_prefix}/share/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/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-%{kdecomp}
 Summary:	graphical disk usage display with cleanup facilities [Trinity]
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	2.4.4
+Release:	2%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -28,7 +35,7 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org
 
-Prefix:    %{_prefix}
+Prefix:    %{tde_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
@@ -57,8 +64,8 @@ own cleanup actions.
 # 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|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+  -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"
@@ -66,24 +73,31 @@ own cleanup actions.
 
 
 %build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt:%{tde_includedir}
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --disable-rpath \
+  --with-extra-includes=%{tde_includedir}/tqt:%{tde_includedir}
 
 # SMP safe !
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
 
-%find_lang %{kdecomp} || touch %{kdecomp}.lang
+%find_lang %{kdecomp}
 
 
 
@@ -93,27 +107,27 @@ export PATH="%{_bindir}:${PATH}"
 
 %post
 for f in hicolor locolor; do
-  touch --no-create %{_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+  touch --no-create %{tde_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
 done
 
 %postun
 for f in hicolor locolor; do
-  touch --no-create %{_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+  touch --no-create %{tde_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
 done
 
 
 %files -f %{kdecomp}.lang
 %defattr(-,root,root,-)
-%{_bindir}/kdirstat
-%{_datadir}/applnk/Utilities/kdirstat.desktop
-%{_datadir}/apps/kconf_update/fix_move_to_trash_bin.pl
-%{_datadir}/apps/kconf_update/kdirstat.upd
-%{_datadir}/apps/kdirstat
-%{tde_docdir}/HTML/en/kdirstat
-%{_datadir}/icons/hicolor/*/apps/kdirstat.png
-%{_datadir}/icons/locolor/*/apps/kdirstat.png
+%{tde_bindir}/kdirstat
+%{tde_datadir}/applnk/Utilities/kdirstat.desktop
+%{tde_datadir}/apps/kconf_update/fix_move_to_trash_bin.pl
+%{tde_datadir}/apps/kconf_update/kdirstat.upd
+%{tde_datadir}/apps/kdirstat/
+%{tde_tdedocdir}/HTML/en/kdirstat/
+%{tde_datadir}/icons/hicolor/*/apps/kdirstat.png
+%{tde_datadir}/icons/locolor/*/apps/kdirstat.png
 
 
 %Changelog
diff --git a/redhat/applications/kdmtheme/kdmtheme.lintian-overrides b/redhat/applications/kdmtheme/kdmtheme.lintian-overrides
deleted file mode 100644
index 4932c5f8a..000000000
--- a/redhat/applications/kdmtheme/kdmtheme.lintian-overrides
+++ /dev/null
@@ -1,6 +0,0 @@
-# provided by tdelibs
-kdmtheme: desktop-command-not-in-package ./usr/share/applications/kde/kdmtheme.desktop kcmshell
-# kcontrol module
-kdmtheme: desktop-entry-invalid-category X-KDE-settings-system ./usr/share/applications/kde/kdmtheme.desktop
-kdmtheme: desktop-entry-lacks-main-category ./usr/share/applications/kde/kdmtheme.desktop
-
diff --git a/redhat/applications/kdmtheme/trinity-kdmtheme.spec b/redhat/applications/kdmtheme/trinity-kdmtheme.spec
index b7fb762dd..71d5dbdf0 100644
--- a/redhat/applications/kdmtheme/trinity-kdmtheme.spec
+++ b/redhat/applications/kdmtheme/trinity-kdmtheme.spec
@@ -2,16 +2,25 @@
 %define kdecomp kdmtheme
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_datadir}/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/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-%{kdecomp}
@@ -26,14 +35,14 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://beta.smileaf.org/projects
 
-Prefix:    %{_prefix}
+Prefix:    %{tde_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
 
 BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-kdelibs-devel
-BuildRequires:	trinity-kdebase-devel
+BuildRequires:	trinity-tdelibs-devel
+BuildRequires:	trinity-tdebase-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
@@ -50,8 +59,8 @@ that allows you to easily install, remove and change your KDM themes.
 # 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|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+  -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"
@@ -59,18 +68,25 @@ that allows you to easily install, remove and change your KDM themes.
 
 
 %build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --disable-rpath \
+  --with-extra-includes=%{tde_includedir}/tqt
 
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
@@ -82,10 +98,17 @@ export PATH="%{_bindir}:${PATH}"
 
 %files
 %defattr(-,root,root,-)
-%{tde_libdir}/kcm_kdmtheme.la
-%{tde_libdir}/kcm_kdmtheme.so
-%{_datadir}/applications/kde/kdmtheme.desktop
-%{tde_docdir}/HTML/en/kdmtheme/
+%{tde_tdelibdir}/kcm_kdmtheme.la
+%{tde_tdelibdir}/kcm_kdmtheme.so
+%{tde_tdeappdir}/kdmtheme.desktop
+%{tde_tdedocdir}/HTML/en/kdmtheme/
+
+
+%post
+update-desktop-database %{tde_appdir} &> /dev/null
+
+%postun
+update-desktop-database %{tde_appdir} &> /dev/null
 
 
 %Changelog
diff --git a/redhat/applications/keep/trinity-keep.spec b/redhat/applications/keep/trinity-keep.spec
index 2e172e5c4..a9e17885c 100644
--- a/redhat/applications/keep/trinity-keep.spec
+++ b/redhat/applications/keep/trinity-keep.spec
@@ -1,25 +1,32 @@
 # Default version for this component
 %define kdecomp keep
-%define version 0.4.0
-%define release 2
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_prefix}/share/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/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-%{kdecomp}
 Summary:	backup system for KDE [Trinity]
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	0.4.0
+Release:	2%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -28,14 +35,14 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org/
 
-Prefix:    %{_prefix}
+Prefix:    %{tde_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
 
 BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-kdelibs-devel
-BuildRequires:	trinity-kdebase-devel
+BuildRequires:	trinity-tdelibs-devel
+BuildRequires:	trinity-tdebase-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
@@ -54,8 +61,8 @@ Homepage: http://jr.falleri.free.fr/keep
 # 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|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+  -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"
@@ -63,18 +70,25 @@ Homepage: http://jr.falleri.free.fr/keep
 
 
 %build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --disable-rpath \
+  --with-extra-includes=%{tde_includedir}/tqt
 
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
@@ -85,25 +99,27 @@ export PATH="%{_bindir}:${PATH}"
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
+update-desktop-database %{tde_appdir} &> /dev/null
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
+update-desktop-database %{tde_appdir} &> /dev/null
 
 
 %files -f %{kdecomp}.lang
 %defattr(-,root,root,-)
-%{_bindir}/keep
-%{tde_libdir}/kded_keep.la
-%{tde_libdir}/kded_keep.so
-%{_datadir}/applications/kde/keep.desktop
-%{_datadir}/icons/hicolor/scalable/apps/keep.svgz
-%{_datadir}/apps/keep
-%{_datadir}/config.kcfg/keepsettings.kcfg
-%{_datadir}/icons/hicolor/*/apps/keep.png
-%{_datadir}/services/kded/keep.desktop
+%{tde_bindir}/keep
+%{tde_tdelibdir}/kded_keep.la
+%{tde_tdelibdir}/kded_keep.so
+%{tde_tdeappdir}/keep.desktop
+%{tde_datadir}/icons/hicolor/scalable/apps/keep.svgz
+%{tde_datadir}/apps/keep/
+%{tde_datadir}/config.kcfg/keepsettings.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/keep.png
+%{tde_datadir}/services/kded/keep.desktop
 
 
 %Changelog
diff --git a/redhat/applications/kerry/kerry-3.5.13-missing_ldflags.patch b/redhat/applications/kerry/kerry-3.5.13-missing_ldflags.patch
new file mode 100644
index 000000000..a4ba56b6e
--- /dev/null
+++ b/redhat/applications/kerry/kerry-3.5.13-missing_ldflags.patch
@@ -0,0 +1,22 @@
+--- kerry/kerry/src/Makefile.am.ORI	2012-08-05 16:28:11.459614735 +0200
++++ kerry/kerry/src/Makefile.am	2012-08-05 16:28:35.195085921 +0200
+@@ -28,7 +28,7 @@
+ 		dcopinterface.skel dcopinterface.stub kerrylabel.cpp query.cpp
+ 
+ kerry_la_LDFLAGS = -Wl,-export-dynamic  $(KDE_RPATH) $(all_libraries) -module $(KDE_PLUGIN) $(GLIB_LDFLAGS) $(LIBBEAGLE_LDFLAGS) $(LIB_QT)
+-kerry_la_LIBADD = -lkio -lkonq $(LIB_KDEUI) $(LIBBEAGLE_LIBADD) $(GLIB_LIBADD) $(LIB_KABC) 
++kerry_la_LIBADD = -lkio -lkonq $(LIB_KDEUI) $(LIBBEAGLE_LIBADD) $(GLIB_LIBADD) $(LIB_KABC) -lDCOP $(LIB_QT) $(LIB_KDECORE)
+ 
+ autostartdir = $(datadir)/autostart
+ autostart_DATA = kerry.autostart.desktop beagled.desktop
+--- kerry/kerry/src/kcm/Makefile.am.ORI	2012-08-06 10:28:54.410310191 -0400
++++ kerry/kerry/src/kcm/Makefile.am	2012-08-06 10:29:27.804685127 -0400
+@@ -9,7 +9,7 @@
+                         select_privacy_resource.ui
+ 
+ kcm_beagle_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
+-kcm_beagle_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIBBEAGLE_LIBADD)
++kcm_beagle_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIBBEAGLE_LIBADD) $(LIB_QT) $(LIB_KDECORE) -lDCOP
+ 
+ xdg_apps_DATA = kcmbeagle.desktop
+ 
diff --git a/redhat/applications/kerry/trinity-kerry.spec b/redhat/applications/kerry/trinity-kerry.spec
index cfe73a43d..683baa429 100644
--- a/redhat/applications/kerry/trinity-kerry.spec
+++ b/redhat/applications/kerry/trinity-kerry.spec
@@ -1,25 +1,32 @@
 # Default version for this component
 %define kdecomp kerry
-%define version 0.2.1
-%define release 1
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_prefix}/share/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/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-%{kdecomp}
 Summary:	a KDE frontend for the Beagle desktop search daemon [Trinity]
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	0.2.1
+Release:	1%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -28,21 +35,29 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://en.opensuse.org/Kerry
 
-Prefix:    %{_prefix}
+Prefix:    %{tde_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
 Source1:	kerry.1.docbook
 
+# [kerry] Missing LDFLAGS cause FTBFS on Mageia and Mandriva
+Patch1:		kerry-3.5.13-missing_ldflags.patch
+
+
 BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-kdelibs-devel
-BuildRequires:	trinity-kdebase-devel
+BuildRequires:	trinity-tdelibs-devel
+BuildRequires:	trinity-tdebase-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
-
 BuildRequires:	libbeagle-devel >= 0.3.0
-#BuildRequires:	docbook-utils
+
+
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	docbook2x
+%else
 BuildRequires:	docbook2X
+%endif
 
 %description
 Kerry is a Trinity frontend for the Beagle desktop search daemon.
@@ -54,12 +69,13 @@ filesystems, chat logs, mail and data, RSS and other.
 
 %prep
 %setup -q -n applications/%{kdecomp}
+%patch1 -p1
 
 # 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|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+  -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"
@@ -67,19 +83,26 @@ filesystems, chat logs, mail and data, RSS and other.
 
 
 %build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --disable-rpath \
+  --with-extra-includes=%{tde_includedir}/tqt:%{tde_includedir}
 
 %__make %{?_smp_mflags}
 
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
@@ -93,34 +116,36 @@ export PATH="%{_bindir}:${PATH}"
 
 
 %post
-/sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/sbin/ldconfig || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
+update-desktop-database %{tde_appdir} &> /dev/null
 
 %postun
-/sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/sbin/ldconfig || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
+update-desktop-database %{tde_appdir} &> /dev/null
 
 
 %files -f %{kdecomp}.lang
 %defattr(-,root,root,-)
-%{_datadir}/locale/*/LC_MESSAGES/kcmbeagle.mo
-%{_bindir}/beagled-shutdown
-%{_bindir}/kerry
-%{_libdir}/libkdeinit_kerry.la
-%{_libdir}/libkdeinit_kerry.so
-%{tde_libdir}/kcm_beagle.la
-%{tde_libdir}/kcm_beagle.so
-%{tde_libdir}/kerry.la
-%{tde_libdir}/kerry.so
-%{_datadir}/applications/kde/kcmbeagle.desktop
-%{_datadir}/applications/kde/kerry.desktop
-%{_datadir}/applnk/.hidden/kcmkerry.desktop
-%{_datadir}/apps/kerry/search-running.mng
-%{_datadir}/autostart/beagled.desktop
-%{_datadir}/autostart/kerry.autostart.desktop
-%{_datadir}/icons/hicolor/*/*/*
+%{tde_datadir}/locale/*/LC_MESSAGES/kcmbeagle.mo
+%{tde_bindir}/beagled-shutdown
+%{tde_bindir}/kerry
+%{tde_libdir}/libkdeinit_kerry.la
+%{tde_libdir}/libkdeinit_kerry.so
+%{tde_tdelibdir}/kcm_beagle.la
+%{tde_tdelibdir}/kcm_beagle.so
+%{tde_tdelibdir}/kerry.la
+%{tde_tdelibdir}/kerry.so
+%{tde_tdeappdir}/kcmbeagle.desktop
+%{tde_tdeappdir}/kerry.desktop
+%{tde_datadir}/applnk/.hidden/kcmkerry.desktop
+%{tde_datadir}/apps/kerry/search-running.mng
+%{tde_datadir}/autostart/beagled.desktop
+%{tde_datadir}/autostart/kerry.autostart.desktop
+%{tde_datadir}/icons/hicolor/*/*/*
 
 
 %Changelog
diff --git a/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13-fix_libsuffix.patch b/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13-fix_libsuffix.patch
new file mode 100644
index 000000000..a8deaa551
--- /dev/null
+++ b/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13-fix_libsuffix.patch
@@ -0,0 +1,22 @@
+--- kgtk-qt3/qt3/kqt3-wrapper.cmake.ORI	2012-08-08 22:30:14.598900960 +0200
++++ kgtk-qt3/qt3/kqt3-wrapper.cmake	2012-08-08 22:30:39.661367613 +0200
+@@ -15,7 +15,7 @@
+ app=`basename $0`
+ 
+ if [ "$app" = "kqt3-wrapper" ] ; then
+-    LD_PRELOAD=@CMAKE_INSTALL_PREFIX@/lib/kgtk/libkqt3.so:$LD_PRELOAD "$@"
++    LD_PRELOAD=@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@/kgtk/libkqt3.so:$LD_PRELOAD "$@"
+ else
+     dir=`dirname $0`
+     oldPath=$PATH
+--- kgtk-qt3/gtk2/kgtk2-wrapper.cmake.ORI	2012-08-08 22:31:30.684286835 +0200
++++ kgtk-qt3/gtk2/kgtk2-wrapper.cmake	2012-08-08 22:32:10.294452119 +0200
+@@ -19,7 +19,7 @@
+ app=`basename $0`
+ 
+ if [ "$app" = "kgtk2-wrapper" ] ; then
+-    LD_PRELOAD=@CMAKE_INSTALL_PREFIX@/lib/kgtk/libkgtk2.so:libnspr4.so:$LD_PRELOAD "$@"
++    LD_PRELOAD=@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@/kgtk/libkgtk2.so:libnspr4.so:$LD_PRELOAD "$@"
+ else
+     dir=`dirname $0`
+     oldPath=$PATH
diff --git a/redhat/applications/kgtk-qt3/trinity-kgtk-qt3.spec b/redhat/applications/kgtk-qt3/trinity-kgtk-qt3.spec
index 01ae9369b..3163d1b58 100644
--- a/redhat/applications/kgtk-qt3/trinity-kgtk-qt3.spec
+++ b/redhat/applications/kgtk-qt3/trinity-kgtk-qt3.spec
@@ -1,25 +1,32 @@
 # Default version for this component
 %define kdecomp kgtk-qt3
-%define version 0.10.2
-%define release 2
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_prefix}/share/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/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-%{kdecomp}
 Summary:	Use KDE dialogs in Gtk apps
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	0.10.2
+Release:	2%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -28,14 +35,17 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org
 
-Prefix:    %{_prefix}
+Prefix:    %{tde_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
 
+# [kgtk-qt-engine] Fix libsuffix for 64 bits machines
+Patch1:		kgtk-qt3-3.5.13-fix_libsuffix.patch
+
 BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-kdelibs-devel
-BuildRequires:	trinity-kdebase-devel
+BuildRequires:	trinity-tdelibs-devel
+BuildRequires:	trinity-tdebase-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
@@ -52,30 +62,43 @@ This package includes the kqt3-wrapper
 
 %prep
 %setup -q -n applications/%{kdecomp}
+%patch1 -p1
 
 # Ugly hack to modify TQT include directory inside autoconf files.
 # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
 find . -name CMakeLists.txt -exec sed -i {} \
-  -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \
-  -e "s,/usr/bin/tmoc,%{_bindir}/tmoc,g" \
-  -e "s,/usr/bin/uic-tqt,%{_bindir}/uic-tqt,g" \
+  -e "s,/usr/include/tqt,%{tde_includedir}/tqt,g" \
+  -e "s,/usr/bin/tmoc,%{tde_bindir}/tmoc,g" \
+  -e "s,/usr/bin/uic-tqt,%{tde_bindir}/uic-tqt,g" \
   \;
 
 %build
 unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir} -L${QTLIB} -lX11"
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir} -L${QTLIB} -lX11"
 
+%if 0%{?rhel} || 0%{?fedora}
 %__mkdir_p build
 cd build
-%cmake ..
+%endif
+
+export CMAKE_INCLUDE_PATH="%{tde_tdeincludedir}"
+
+%cmake \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  -DCMAKE_SKIP_RPATH="OFF" \
+  ..
 
 # SMP safe !
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot} -C build
 
@@ -91,13 +114,13 @@ export PATH="%{_bindir}:${PATH}"
 %files -f kdialogd3.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
-%{_bindir}/kdialogd-wrapper
-%{_bindir}/kdialogd3
-%{_bindir}/kgtk-wrapper
-%{_bindir}/kgtk2-wrapper
-%{_bindir}/kqt3-wrapper
-%{_libdir}/kgtk/libkgtk2.so
-%{_libdir}/kgtk/libkqt3.so
+%{tde_bindir}/kdialogd-wrapper
+%{tde_bindir}/kdialogd3
+%{tde_bindir}/kgtk-wrapper
+%{tde_bindir}/kgtk2-wrapper
+%{tde_bindir}/kqt3-wrapper
+%{tde_libdir}/kgtk/libkgtk2.so
+%{tde_libdir}/kgtk/libkqt3.so
 
 
 %Changelog
diff --git a/redhat/applications/kile/kile.xpm b/redhat/applications/kile/kile.xpm
deleted file mode 100644
index 408d2710b..000000000
--- a/redhat/applications/kile/kile.xpm
+++ /dev/null
@@ -1,176 +0,0 @@
-/* XPM */
-static char *kile[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 138 2",
-"   c black",
-".  c #015FBC",
-"X  c #1067BE",
-"o  c #005DC0",
-"O  c #0063C3",
-"+  c #006BC9",
-"@  c #0A6EC9",
-"#  c #0071CC",
-"$  c #0E76CE",
-"%  c #0076D0",
-"&  c #007BD2",
-"*  c #0978D0",
-"=  c #1467C0",
-"-  c #1468C1",
-";  c #136FC9",
-":  c #1A6AC1",
-">  c #1372CA",
-",  c #1C7BCE",
-"<  c #1B7DD0",
-"1  c #267ACD",
-"2  c #2878C6",
-"3  c #2C7ECE",
-"4  c #207ED0",
-"5  c #3D7BC1",
-"6  c #3F83BB",
-"7  c #0080D6",
-"8  c #0086DA",
-"9  c #008ADC",
-"0  c #0A85D8",
-"q  c #0C8BDB",
-"w  c #1A81D2",
-"e  c #2F81D0",
-"r  c #2B89D4",
-"t  c #2A98D9",
-"y  c #3D80C2",
-"u  c #3D8ACB",
-"i  c #328BD5",
-"p  c #3985D0",
-"a  c #3A89D3",
-"s  c #3D90CF",
-"d  c #3296DC",
-"f  c #3D92D0",
-"g  c #399CDF",
-"h  c #399EE0",
-"j  c #20A0E4",
-"k  c #4981C2",
-"l  c #468DD3",
-"z  c #4C8DD2",
-"x  c #4891D6",
-"c  c #518EC8",
-"v  c #5C8EC5",
-"b  c #5B9ECF",
-"n  c #5493D5",
-"m  c #519CD1",
-"M  c #549ADA",
-"N  c #5D98D7",
-"B  c #5F9AD8",
-"V  c #4FA2DF",
-"C  c #53A0DD",
-"Z  c #5BA4D2",
-"A  c #5BA3DE",
-"S  c #40A7E4",
-"D  c #4DA4E1",
-"F  c #53A9E3",
-"G  c #629CD9",
-"H  c #7999C3",
-"J  c #6DA2DB",
-"K  c #79A8CD",
-"L  c #71A5DC",
-"P  c #73A8DD",
-"I  c #7AABDE",
-"U  c #6DADE2",
-"Y  c #63B2E6",
-"T  c #77AEE1",
-"R  c #75B4E5",
-"E  c #7EB3E3",
-"W  c #79BAE8",
-"Q  c #829DC4",
-"!  c #82A2C7",
-"~  c #82A7CA",
-"^  c #89B6D8",
-"/  c #88BCDF",
-"(  c #92A6C5",
-")  c #92AECA",
-"_  c #91B3CF",
-"`  c #96B6D0",
-"'  c #9BBCD5",
-"]  c #84B2E1",
-"[  c #8EB7E3",
-"{  c #8EBBE5",
-"}  c #92BAE5",
-"|  c #98BEE6",
-" . c #A1BED5",
-".. c #B6B6C5",
-"X. c #87C9EF",
-"o. c #95C2E9",
-"O. c #9CC0E7",
-"+. c #9AC5EA",
-"@. c #ADC2D6",
-"#. c #BEC1CF",
-"$. c #B2C2D4",
-"%. c #B6C4DA",
-"&. c #BDC8D7",
-"*. c #A4C5E9",
-"=. c #A1C8E3",
-"-. c #ABCBEB",
-";. c #AAD0EF",
-":. c #AAD3F0",
-">. c #B1CDEC",
-",. c #B5D0ED",
-"<. c #BDD5ED",
-"1. c #B7D6F1",
-"2. c #B4D8F2",
-"3. c #BBD7F0",
-"4. c #BFE6F9",
-"5. c #C0C9D7",
-"6. c #C1CCDD",
-"7. c #C0D6EF",
-"8. c #C6DBEC",
-"9. c #C8D2E0",
-"0. c #C0D7F0",
-"q. c #C3DAF0",
-"w. c #C9DDF2",
-"e. c #D1DEEC",
-"r. c #C6E8FA",
-"t. c #CDE0F3",
-"y. c #D2E3F4",
-"u. c #D4EBF9",
-"i. c #DBE8F6",
-"p. c #DBEDF9",
-"a. c #E1ECF7",
-"s. c #E5EEF8",
-"d. c #E6F1F9",
-"f. c #E9F3FB",
-"g. c #F1F6FB",
-"h. c #F6F9FD",
-"j. c #FEFEFE",
-"k. c None",
-/* pixels */
-"k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.",
-"k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.",
-"k.k.k.k.k.k.k.k.k.k.k... .%.&.&.&.&.@.' ....k.k.k.k.k.k.k.k.k.k.",
-"k.k.k.k.k.k.k.k.k.....9.r.p.f.f.f.f.u.4.<.$...k.k.k.k.k.k.k.k.k.",
-"k.k.k.k.k.k.k...#.e.s.s.s.s.s.s.f.d.s.s.d.s.8.%.....k.k.k.k.k.k.",
-"k.k.k.k.k.k...6.e.i.i.i.i.i.i.i.i.i.i.i.i.i.p.y.=.` k.k.k.k.k.k.",
-"k.k.k.k.k...6.t.y.w.w.y.y.w.w.y.t.t.t.y.t.w.y.w.w.X._ ..k.k.k.k.",
-"k.k.k.k...%.7.7.q.8.0.8.7.w.w.0.7.w.q.7.8.q.7.8.8.3./ ..k.k.k.k.",
-"k.k.k...^ 1.y.t.t.<.>.,.>.7.w.y.i.y.y.0.>.>.>.1.>.1.+.j ..k.k.k.",
-"k.k.k...Y s.j.j.j.w.-.-.-.-.g.j.j.j.s.>.>.-.>.-.-.-.*.S Z ..k.k.",
-"k.k._ t R i.j.j.j.7.*.| *.i.j.j.j.g.>.*.O.O.| | | O.| F t ) k.k.",
-"k.k.K q U i.j.j.j.>.} } 7.h.j.j.h.0.| } } } } } } } } D 9 K k.k.",
-"k...m 9 C y.j.j.j.-.^ O.h.j.j.h.>.] ] ] ^ ] ] } -.=.o.W 9 9 ..k.",
-"k...8 8 d t.j.j.j.*.[ s.j.j.h.q.] ] ] ] I I ] w.j.a.O.f.q 8 N ..",
-"..~ 7 7 0 2.j.j.j.*.y.j.j.j.>.^ ] I I G J J | f.-.y.C r.h 7 s ..",
-"..f 7 7 7 :.j.j.j.i.j.j.j.i.I P L L G G G G | s.] 8.d u.h 7 s ..",
-"..f & & & :.j.j.j.j.j.j.j.s.J G G N N n n n L s.y.i.y.p.& & f ..",
-"..u & & & :.j.j.j.j.j.j.j.j.<.G n n n n l z l U i.j.y.D & & u ..",
-"..u % % % -.j.j.j.q.o.h.j.j.h.*.z z l p e < * % % % % % % % u ..",
-"..u # % # :.j.j.j.F w 1.j.j.j.g.M 1 , $ r +.:.:.:.:.-.:.# % u ..",
-"k...# # # -.j.j.j.C # < p.j.j.j.y.i # # r ,.t.q.q.t.q.t.# # u ..",
-"k.k.c + # -.j.j.j.M + + B d.j.j.j.;.+ + # < < < w < < < + + ! ..",
-"k.k.H + + -.j.j.j.M + + @ T j.j.j.j.] @ , E a E { { { { + H k.k.",
-"k.k.( 2 O -.j.j.j.M + O + @ 7.j.j.j.s.x a s.P s.j.h.j.j.+ H k.k.",
-"k.k...v O 1 a p p ; O O O + ; a a a a 3 O O O O O O O O 5 6 k.k.",
-"k.k.k...O O o . O o o O o o O + O + O O O o O O O O O o ....k.k.",
-"k.k.k.k...5 . o o . o o o O O + O O o o . o o o . o - Q k.k.k.k.",
-"k.k.k.k...Q o o o o o o o o o o o o o o o o o o . o Q ..k.k.k.k.",
-"k.k.k.k.k.k.Q 5 o o o o o o o o o o o o o o o o 5 Q k.k.k.k.k.k.",
-"k.k.k.k.k.k.....= o o o o o o o o o o o o o o . ....k.k.k.k.k.k.",
-"k.k.k.k.k.k.k.k.....Q 5 o o o o o o o o - : ....k.k.k.k.k.k.k.k.",
-"k.k.k.k.k.k.k.k.k.k.....k H H H H H H k 5 ..k.k.k.k.k.k.k.k.k.k."
-};
diff --git a/redhat/applications/kile/trinity-kile.spec b/redhat/applications/kile/trinity-kile.spec
index 1b106bb88..96318c5a9 100644
--- a/redhat/applications/kile/trinity-kile.spec
+++ b/redhat/applications/kile/trinity-kile.spec
@@ -1,25 +1,32 @@
 # Default version for this component
 %define kdecomp kile
-%define version 2.0.2
-%define release 3
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_prefix}/share/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/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-%{kdecomp}
 Summary:	KDE Integrated LaTeX Environment [Trinity]
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	2.0.2
+Release:	3%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Publishing
@@ -28,14 +35,14 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org/
 
-Prefix:    %{_prefix}
+Prefix:    %{tde_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
 
 BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-kdelibs-devel
-BuildRequires:	trinity-kdebase-devel
+BuildRequires:	trinity-tdelibs-devel
+BuildRequires:	trinity-tdebase-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
@@ -420,201 +427,211 @@ Kile can support large projects consisting of several smaller files.
 # 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|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+  -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"
+%__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
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+unset QTDIR; . /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} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
   --disable-rpath \
-  --with-extra-includes=%{_includedir}/tqt
+  --with-extra-includes=%{tde_includedir}/tqt
 
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
-%__chmod +x %{buildroot}%{_datadir}/apps/kile/test/runTests.sh
+%__chmod +x %{buildroot}%{tde_datadir}/apps/kile/test/runTests.sh
+
+# Unwanted files ...
+%__rm -f %{?buildroot}%{tde_datadir}/apps/katepart/syntax/bibtex.xml
+%__rm -f %{?buildroot}%{tde_datadir}/apps/katepart/syntax/latex.xml
 
 %clean
 %__rm -rf %{buildroot}
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+update-desktop-database %{tde_appdir} > /dev/null
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+update-desktop-database %{tde_appdir} > /dev/null
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 
 %files
 %defattr(-,root,root,-)
-%{_bindir}/kile
-%{_datadir}/applications/kde/kile.desktop
-%exclude %{_datadir}/apps/katepart/syntax/bibtex.xml
-%exclude %{_datadir}/apps/katepart/syntax/latex.xml
-%{_datadir}/apps/kconf_update
-%{_datadir}/apps/kile
-%{_datadir}/config.kcfg/kile.kcfg
-%{_datadir}/icons/hicolor/*/apps/kile.png
-%{_datadir}/icons/hicolor/scalable/apps/kile.svgz
-%{tde_docdir}/HTML/en/kile
-%{_datadir}/mimelnk/text/x-kilepr.desktop
+%{tde_bindir}/kile
+%{tde_tdeappdir}/kile.desktop
+%{tde_datadir}/apps/kconf_update
+%{tde_datadir}/apps/kile
+%{tde_datadir}/config.kcfg/kile.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/kile.png
+%{tde_datadir}/icons/hicolor/scalable/apps/kile.svgz
+%{tde_tdedocdir}/HTML/en/kile
+%{tde_datadir}/mimelnk/text/x-kilepr.desktop
 
 %files i18n-da
-%lang(da) %{tde_docdir}/HTML/da/kile
-%lang(da) %{_datadir}/locale/da/LC_MESSAGES/kile.mo
+%lang(da) %{tde_tdedocdir}/HTML/da/kile
+%lang(da) %{tde_datadir}/locale/da/LC_MESSAGES/kile.mo
 
 %files i18n-es
-%lang(es) %{tde_docdir}/HTML/es/kile
-%lang(es) %{_datadir}/locale/es/LC_MESSAGES/kile.mo
+%lang(es) %{tde_tdedocdir}/HTML/es/kile
+%lang(es) %{tde_datadir}/locale/es/LC_MESSAGES/kile.mo
 
 %files i18n-et
-%lang(et) %{tde_docdir}/HTML/et/kile
-%lang(et) %{_datadir}/locale/et/LC_MESSAGES/kile.mo
+%lang(et) %{tde_tdedocdir}/HTML/et/kile
+%lang(et) %{tde_datadir}/locale/et/LC_MESSAGES/kile.mo
 
 %files i18n-it
-%lang(it) %{tde_docdir}/HTML/it/kile
-%lang(it) %{_datadir}/locale/it/LC_MESSAGES/kile.mo
+%lang(it) %{tde_tdedocdir}/HTML/it/kile
+%lang(it) %{tde_datadir}/locale/it/LC_MESSAGES/kile.mo
 
 %files i18n-nl
-%lang(nl) %{tde_docdir}/HTML/nl/kile
-%lang(nl) %{_datadir}/locale/nl/LC_MESSAGES/kile.mo
+%lang(nl) %{tde_tdedocdir}/HTML/nl/kile
+%lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/kile.mo
 
 %files i18n-pt
-%lang(pt) %{tde_docdir}/HTML/pt/kile
-%lang(pt) %{_datadir}/locale/pt/LC_MESSAGES/kile.mo
+%lang(pt) %{tde_tdedocdir}/HTML/pt/kile
+%lang(pt) %{tde_datadir}/locale/pt/LC_MESSAGES/kile.mo
 
 %files i18n-sv
-%lang(sv) %{tde_docdir}/HTML/sv/kile
-%lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/kile.mo
+%lang(sv) %{tde_tdedocdir}/HTML/sv/kile
+%lang(sv) %{tde_datadir}/locale/sv/LC_MESSAGES/kile.mo
 
 %files i18n-ar
-%lang(ar) %{_datadir}/locale/ar/LC_MESSAGES/kile.mo
+%lang(ar) %{tde_datadir}/locale/ar/LC_MESSAGES/kile.mo
 
 %files i18n-bg
-%lang(bg) %{_datadir}/locale/bg/LC_MESSAGES/kile.mo
+%lang(bg) %{tde_datadir}/locale/bg/LC_MESSAGES/kile.mo
 
 %files i18n-br
-%lang(br) %{_datadir}/locale/br/LC_MESSAGES/kile.mo
+%lang(br) %{tde_datadir}/locale/br/LC_MESSAGES/kile.mo
 
 %files i18n-ca
-%lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/kile.mo
+%lang(ca) %{tde_datadir}/locale/ca/LC_MESSAGES/kile.mo
 
 %files i18n-cs
-%lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/kile.mo
+%lang(cs) %{tde_datadir}/locale/cs/LC_MESSAGES/kile.mo
 
 %files i18n-cy
-%lang(cy) %{_datadir}/locale/cy/LC_MESSAGES/kile.mo
+%lang(cy) %{tde_datadir}/locale/cy/LC_MESSAGES/kile.mo
 
 %files i18n-de
-%lang(de) %{_datadir}/locale/de/LC_MESSAGES/kile.mo
+%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/kile.mo
 
 %files i18n-el
-%lang(el) %{_datadir}/locale/el/LC_MESSAGES/kile.mo
+%lang(el) %{tde_datadir}/locale/el/LC_MESSAGES/kile.mo
 
 %files i18n-engb
-%lang(en_GB) %{_datadir}/locale/en_GB/LC_MESSAGES/kile.mo
+%lang(en_GB) %{tde_datadir}/locale/en_GB/LC_MESSAGES/kile.mo
 
 %files i18n-eu
-%lang(eu) %{_datadir}/locale/eu/LC_MESSAGES/kile.mo
+%lang(eu) %{tde_datadir}/locale/eu/LC_MESSAGES/kile.mo
 
 %files i18n-fi
-%lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/kile.mo
+%lang(fi) %{tde_datadir}/locale/fi/LC_MESSAGES/kile.mo
 
 %files i18n-fr
-%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/kile.mo
+%lang(fr) %{tde_datadir}/locale/fr/LC_MESSAGES/kile.mo
 
 %files i18n-ga
-%lang(ga) %{_datadir}/locale/ga/LC_MESSAGES/kile.mo
+%lang(ga) %{tde_datadir}/locale/ga/LC_MESSAGES/kile.mo
 
 %files i18n-gl
-%lang(gl) %{_datadir}/locale/gl/LC_MESSAGES/kile.mo
+%lang(gl) %{tde_datadir}/locale/gl/LC_MESSAGES/kile.mo
 
 %files i18n-hi
-%lang(hi) %{_datadir}/locale/hi/LC_MESSAGES/kile.mo
+%lang(hi) %{tde_datadir}/locale/hi/LC_MESSAGES/kile.mo
 
 %files i18n-hu
-%lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/kile.mo
+%lang(hu) %{tde_datadir}/locale/hu/LC_MESSAGES/kile.mo
 
 %files i18n-is
-%lang(is) %{_datadir}/locale/is/LC_MESSAGES/kile.mo
+%lang(is) %{tde_datadir}/locale/is/LC_MESSAGES/kile.mo
 
 %files i18n-ja
-%lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/kile.mo
+%lang(ja) %{tde_datadir}/locale/ja/LC_MESSAGES/kile.mo
 
 %files i18n-lt
-%lang(lt) %{_datadir}/locale/lt/LC_MESSAGES/kile.mo
+%lang(lt) %{tde_datadir}/locale/lt/LC_MESSAGES/kile.mo
 
 %files i18n-ms
-%lang(ms) %{_datadir}/locale/ms/LC_MESSAGES/kile.mo
+%lang(ms) %{tde_datadir}/locale/ms/LC_MESSAGES/kile.mo
 
 %files i18n-mt
-%lang(mt) %{_datadir}/locale/mt/LC_MESSAGES/kile.mo
+%lang(mt) %{tde_datadir}/locale/mt/LC_MESSAGES/kile.mo
 
 %files i18n-nb
-%lang(nb) %{_datadir}/locale/nb/LC_MESSAGES/kile.mo
+%lang(nb) %{tde_datadir}/locale/nb/LC_MESSAGES/kile.mo
 
 %files i18n-nds
-%lang(nds) %{_datadir}/locale/nds/LC_MESSAGES/kile.mo
+%lang(nds) %{tde_datadir}/locale/nds/LC_MESSAGES/kile.mo
 
 %files i18n-nn
-%lang(nn) %{_datadir}/locale/nn/LC_MESSAGES/kile.mo
+%lang(nn) %{tde_datadir}/locale/nn/LC_MESSAGES/kile.mo
 
 %files i18n-pa
-%lang(pa) %{_datadir}/locale/pa/LC_MESSAGES/kile.mo
+%lang(pa) %{tde_datadir}/locale/pa/LC_MESSAGES/kile.mo
 
 %files i18n-pl
-%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/kile.mo
+%lang(pl) %{tde_datadir}/locale/pl/LC_MESSAGES/kile.mo
 
 %files i18n-ptbr
-%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/kile.mo
+%lang(pt_BR) %{tde_datadir}/locale/pt_BR/LC_MESSAGES/kile.mo
 
 %files i18n-ro
-%lang(ro) %{_datadir}/locale/ro/LC_MESSAGES/kile.mo
+%lang(ro) %{tde_datadir}/locale/ro/LC_MESSAGES/kile.mo
 
 %files i18n-ru
-%lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/kile.mo
+%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/kile.mo
 
 %files i18n-rw
-%lang(rw) %{_datadir}/locale/rw/LC_MESSAGES/kile.mo
+%lang(rw) %{tde_datadir}/locale/rw/LC_MESSAGES/kile.mo
 
 %files i18n-sk
-%lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/kile.mo
+%lang(sk) %{tde_datadir}/locale/sk/LC_MESSAGES/kile.mo
 
 %files i18n-sr
-%lang(sr) %{_datadir}/locale/sr/LC_MESSAGES/kile.mo
+%lang(sr) %{tde_datadir}/locale/sr/LC_MESSAGES/kile.mo
 
 %files i18n-srlatin
-%lang(sr@Latn) %{_datadir}/locale/sr@Latn/LC_MESSAGES/kile.mo
+%lang(sr@Latn) %{tde_datadir}/locale/sr@Latn/LC_MESSAGES/kile.mo
 
 %files i18n-ta
-%lang(ta) %{_datadir}/locale/ta/LC_MESSAGES/kile.mo
+%lang(ta) %{tde_datadir}/locale/ta/LC_MESSAGES/kile.mo
 
 %files i18n-th
-%lang(th) %{_datadir}/locale/th/LC_MESSAGES/kile.mo
+%lang(th) %{tde_datadir}/locale/th/LC_MESSAGES/kile.mo
 
 %files i18n-tr
-%lang(tr) %{_datadir}/locale/tr/LC_MESSAGES/kile.mo
+%lang(tr) %{tde_datadir}/locale/tr/LC_MESSAGES/kile.mo
 
 %files i18n-uk
-%lang(uk) %{_datadir}/locale/uk/LC_MESSAGES/kile.mo
+%lang(uk) %{tde_datadir}/locale/uk/LC_MESSAGES/kile.mo
 
 %files i18n-zhcn
-%lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/kile.mo
+%lang(zh_CN) %{tde_datadir}/locale/zh_CN/LC_MESSAGES/kile.mo
  
 
 
diff --git a/redhat/applications/kima/trinity-kima.spec b/redhat/applications/kima/trinity-kima.spec
index 8c1e6e3b7..657029f3c 100644
--- a/redhat/applications/kima/trinity-kima.spec
+++ b/redhat/applications/kima/trinity-kima.spec
@@ -2,16 +2,25 @@
 %define kdecomp kima
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_datadir}/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/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-%{kdecomp}
@@ -26,14 +35,14 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.elliptique.net/~ken/kima/
 
-Prefix:    %{_prefix}
+Prefix:    %{tde_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
 
 BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-kdelibs-devel
-BuildRequires:	trinity-kdebase-devel
+BuildRequires:	trinity-tdelibs-devel
+BuildRequires:	trinity-tdebase-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
@@ -50,8 +59,8 @@ panel.
 # 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|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+  -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"
@@ -59,24 +68,31 @@ panel.
 
 
 %build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt:%{tde_includedir}
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --disable-rpath \
+  --with-extra-includes=%{tde_includedir}/tqt:%{tde_tdeincludedir}
 
 # SMP safe !
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
 
-%find_lang %{kdecomp} || touch %{kdecomp}.lang
+%find_lang %{kdecomp}
 
 
 
@@ -87,10 +103,10 @@ export PATH="%{_bindir}:${PATH}"
 %files -f %{kdecomp}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_libdir}/libkima.la
-%{tde_libdir}/libkima.so
-%{_datadir}/apps/kicker/applets/kima.desktop
-%{tde_docdir}/HTML/en/kima/
+%{tde_tdelibdir}/libkima.la
+%{tde_tdelibdir}/libkima.so
+%{tde_datadir}/apps/kicker/applets/kima.desktop
+%{tde_tdedocdir}/HTML/en/kima/
 
 
 %Changelog
diff --git a/redhat/applications/kio-locate/trinity-kio-locate-3.5.12.spec b/redhat/applications/kio-locate/trinity-kio-locate-3.5.12.spec
new file mode 100644
index 000000000..f24f3a2f7
--- /dev/null
+++ b/redhat/applications/kio-locate/trinity-kio-locate-3.5.12.spec
@@ -0,0 +1,111 @@
+# Default version for this component
+%define kdecomp kio-locate
+
+# 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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/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-%{kdecomp}
+Summary:	kio-slave for the locate command [Trinity]
+Version:	0.4.5
+Release:	2%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+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:	%{kdecomp}-3.5.12.tar.gz
+
+# [kio-locate] Fix compilation with GCC 4.7
+Patch1:		kio-locate-3.5.13-fix_gcc47_compilation.patch
+
+BuildRequires: tqtinterface-devel
+BuildRequires: trinity-tdelibs-devel
+BuildRequires: trinity-tdebase-devel
+BuildRequires: desktop-file-utils
+
+BuildRequires:	scons
+
+%description
+Adds support for the "locate:" and "locater:"
+protocols to Konqueror and other TDE applications.
+
+This enables you to perform locate searches as you
+would in a terminal. The result is displayed just
+as a directory.
+
+
+%prep
+%setup -q -n applications/%{kdecomp}
+#patch1 -p1 -b .install
+
+# Ugly hack to modify TQT include directory inside SCONS files.
+# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
+%__sed -i "admin/kde.py" \
+  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g"
+
+
+%build
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
+export CXXFLAGS="-I%{tde_includedir}/tqt ${CXXFLAGS}"
+scons configure
+scons
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+scons install DESTDIR=%{buildroot}
+
+%clean
+%__rm -rf %{buildroot}
+
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING TODO
+%{tde_tdelibdir}/kio_locate.la
+%{tde_tdelibdir}/kio_locate.so
+%{tde_tdedocdir}/HTML/en/kio-locate/
+%{tde_datadir}/services/locate.protocol
+%{tde_datadir}/services/locater.protocol
+%{tde_datadir}/services/rlocate.protocol
+%{tde_datadir}/services/searchproviders/locate.desktop
+
+
+%Changelog
+* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.5-2
+- Rebuilt for Fedora 17
+- Removes post and postun
+- Fix compilation with GCC 4.7
+
+* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.5-1
+- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+
diff --git a/redhat/applications/kio-locate/trinity-kio-locate.spec b/redhat/applications/kio-locate/trinity-kio-locate-3.5.13.spec
index 8c0677730..72b4e1032 100644
--- a/redhat/applications/kio-locate/trinity-kio-locate.spec
+++ b/redhat/applications/kio-locate/trinity-kio-locate-3.5.13.spec
@@ -1,25 +1,32 @@
 # Default version for this component
 %define kdecomp kio-locate
-%define version 0.4.5
-%define release 2
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_datadir}/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/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-%{kdecomp}
 Summary:	kio-slave for the locate command [Trinity]
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	0.4.5
+Release:	2%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -28,7 +35,7 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org
 
-Prefix:		%{_prefix}
+Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
@@ -36,9 +43,11 @@ Source0:	%{kdecomp}-3.5.13.tar.gz
 # [kio-locate] Fix compilation with GCC 4.7
 Patch1:		kio-locate-3.5.13-fix_gcc47_compilation.patch
 
+Patch2:		kio-locate-3.5.13-downgrade_3512.patch
+
 BuildRequires: tqtinterface-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
+BuildRequires: trinity-tdelibs-devel
+BuildRequires: trinity-tdebase-devel
 BuildRequires: desktop-file-utils
 
 BuildRequires:	scons
@@ -55,23 +64,24 @@ as a directory.
 %prep
 %setup -q -n applications/%{kdecomp}
 %patch1 -p1 -b .install
+%patch2 -p7
 
 # Ugly hack to modify TQT include directory inside SCONS files.
 # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
 %__sed -i "admin/kde.py" \
-  -e "s|/usr/include/tqt|%{_includedir}/tqt|g"
+  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g"
 
 
 %build
 unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 scons configure
 scons
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 scons install DESTDIR=%{buildroot}
 
@@ -83,16 +93,13 @@ scons install DESTDIR=%{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING TODO
-%{tde_libdir}/kio_locate.la
-%{tde_libdir}/kio_locate.so
-%{tde_docdir}/HTML/en/kio-locate/common
-%{tde_docdir}/HTML/en/kio-locate/index.cache.bz2
-%{tde_docdir}/HTML/en/kio-locate/index.docbook
-%{tde_docdir}/HTML/en/kio-locate/screenshot.png
-%{_datadir}/services/locate.protocol
-%{_datadir}/services/locater.protocol
-%{_datadir}/services/rlocate.protocol
-%{_datadir}/services/searchproviders/locate.desktop
+%{tde_tdelibdir}/kio_locate.la
+%{tde_tdelibdir}/kio_locate.so
+%{tde_tdedocdir}/HTML/en/kio-locate/
+%{tde_datadir}/services/locate.protocol
+%{tde_datadir}/services/locater.protocol
+%{tde_datadir}/services/rlocate.protocol
+%{tde_datadir}/services/searchproviders/locate.desktop
 
 
 %Changelog
diff --git a/redhat/applications/kio-umountwrapper/trinity-kio-umountwrapper.spec b/redhat/applications/kio-umountwrapper/trinity-kio-umountwrapper.spec
index d8ed7076a..352e39845 100644
--- a/redhat/applications/kio-umountwrapper/trinity-kio-umountwrapper.spec
+++ b/redhat/applications/kio-umountwrapper/trinity-kio-umountwrapper.spec
@@ -2,16 +2,25 @@
 %define kdecomp kio-umountwrapper
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_datadir}/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/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-%{kdecomp}
@@ -26,7 +35,7 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://frode.kde.no/misc/kio_umountwrapper/
 
-Prefix:		%{_prefix}
+Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
@@ -34,8 +43,8 @@ Source1:	media_safelyremove.desktop
 
 
 BuildRequires: tqtinterface-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
+BuildRequires: trinity-tdelibs-devel
+BuildRequires: trinity-tdebase-devel
 BuildRequires: desktop-file-utils
 
 
@@ -46,14 +55,13 @@ Provides a progress dialog for Safely Removing of devices in Trinity.
 
 
 %prep
-unset QTDIR; . /etc/profile.d/qt.sh
 %setup -q -n applications/%{kdecomp}
 
 # 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|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
+  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
 %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@@ -61,25 +69,32 @@ unset QTDIR; . /etc/profile.d/qt.sh
 
 
 %build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt \
-    --enable-closure
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --disable-rpath \
+  --with-extra-includes=%{tde_includedir}/tqt \
+  --enable-closure
 
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
-%__install -D -m 644 %{SOURCE1} %{?buildroot}%{_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_kio-umountwrapper
-#%__install -D -m 644 %{SOURCE1} %{?buildroot}%{_datadir}/apps/dolphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper
-%__install -D -m 644 %{SOURCE1} %{?buildroot}%{_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper
+%__install -D -m 644 %{SOURCE1} %{?buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_kio-umountwrapper
+#%__install -D -m 644 %{SOURCE1} %{?buildroot}%{tde_datadir}/apps/dolphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper
+%__install -D -m 644 %{SOURCE1} %{?buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper
 
 
 %clean
@@ -88,9 +103,9 @@ export PATH="%{_bindir}:${PATH}"
 %post
 for f in konqueror d3lphin; do
   alternatives --install \
-    %{_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop \
+    %{tde_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop \
     media_safelyremove.desktop_${f} \
-    %{_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop_kio-umountwrapper \
+    %{tde_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop_kio-umountwrapper \
     20
 done
 
@@ -100,17 +115,17 @@ if [ $1 -eq 0 ]; then
   for f in konqueror d3lphin; do
     alternatives --remove \
       media_safelyremove.desktop_${f} \
-      %{_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop_kio-umountwrapper
+      %{tde_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop_kio-umountwrapper
   done
 fi
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{_bindir}/kio_umountwrapper
-%{_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_kio-umountwrapper
-#%{_datadir}/apps/dolphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper
-%{_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper
+%{tde_bindir}/kio_umountwrapper
+%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_kio-umountwrapper
+#%{tde_datadir}/apps/dolphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper
+%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper
 
 %Changelog
 * Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.2-3
diff --git a/redhat/applications/kiosktool/trinity-kiosktool.spec b/redhat/applications/kiosktool/trinity-kiosktool.spec
index 523f5682e..3195e466b 100644
--- a/redhat/applications/kiosktool/trinity-kiosktool.spec
+++ b/redhat/applications/kiosktool/trinity-kiosktool.spec
@@ -1,24 +1,31 @@
 # Default version for this component
 %define kdecomp kiosktool
-%define version 1.0
-%define release 2
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_prefix}/share/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/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-%{kdecomp}
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	1.0
+Release:	2%{?dist}%{?_variant}
 Summary:	tool to configure the TDE kiosk framework
 
 License:	GPLv2+
@@ -33,7 +40,7 @@ Source0: %{kdecomp}-3.5.13.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gettext
-BuildRequires: trinity-kdelibs-devel
+BuildRequires: trinity-tdelibs-devel
 
 
 %description
@@ -48,8 +55,8 @@ groups of users.
 # 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|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
+  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
 %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@@ -58,24 +65,30 @@ groups of users.
 
 %build
 unset QTDIR || : ; source /etc/profile.d/qt.sh
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 
 %configure \
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
   --disable-rpath \
   --enable-new-ldflags \
   --disable-debug --disable-warnings \
   --disable-dependency-tracking --enable-final \
   --enable-closure \
-  --with-extra-includes=%{_includedir}/tqt
+  --with-extra-includes=%{tde_includedir}/tqt
   
 
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf $RPM_BUILD_ROOT
 %__make install DESTDIR=$RPM_BUILD_ROOT
 
@@ -105,13 +118,13 @@ fi
 
 
 %post
-touch --no-create %{_datadir}/icons/crystalsvg ||:
-gtk-update-icon-cache -q %{_datadir}/icons/crystalsvg 2> /dev/null ||:
+touch --no-create %{tde_datadir}/icons/crystalsvg ||:
+gtk-update-icon-cache -q %{tde_datadir}/icons/crystalsvg 2> /dev/null ||:
 update-desktop-database >& /dev/null ||:
 
 %postun
-touch --no-create %{_datadir}/icons/crystalsvg ||:
-gtk-update-icon-cache -q %{_datadir}/icons/crystalsvg 2> /dev/null ||:
+touch --no-create %{tde_datadir}/icons/crystalsvg ||:
+gtk-update-icon-cache -q %{tde_datadir}/icons/crystalsvg 2> /dev/null ||:
 update-desktop-database >& /dev/null ||:
 
 
@@ -119,14 +132,14 @@ update-desktop-database >& /dev/null ||:
 %files -f %{kdecomp}.lang
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING README TODO
-%{_bindir}/kiosktool
-%{_bindir}/kiosktool-kdedirs
-%{_datadir}/applications/kde/kiosktool.desktop
-%{_datadir}/apps/kiosktool/*.png
-%{tde_docdir}/HTML/en/kiosktool/
-%{_datadir}/icons/crystalsvg/*/apps/kiosktool.png
-%{_datadir}/apps/kiosktool/kiosk_data.xml
-%{_datadir}/apps/kiosktool/kiosktoolui.rc
+%{tde_bindir}/kiosktool
+%{tde_bindir}/kiosktool-kdedirs
+%{tde_tdeappdir}/kiosktool.desktop
+%{tde_datadir}/apps/kiosktool/*.png
+%{tde_tdedocdir}/HTML/en/kiosktool/
+%{tde_datadir}/icons/crystalsvg/*/apps/kiosktool.png
+%{tde_datadir}/apps/kiosktool/kiosk_data.xml
+%{tde_datadir}/apps/kiosktool/kiosktoolui.rc
 
 %Changelog
 * Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-2
diff --git a/redhat/applications/kmplayer/kmplayer-3.5.13-ftbfs.patch b/redhat/applications/kmplayer/kmplayer-3.5.13-ftbfs.patch
deleted file mode 100644
index f3a5d51da..000000000
--- a/redhat/applications/kmplayer/kmplayer-3.5.13-ftbfs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- kmplayer/src/Makefile.am.ORI	2011-12-03 23:22:01.601981533 +0100
-+++ kmplayer/src/Makefile.am	2011-12-03 23:22:44.469655046 +0100
-@@ -58,6 +58,7 @@
- kgstplayer_SOURCES= gstplayer.cpp
- 
- knpplayer_LDADD= $(LIBNSPR_LIBS)
-+knpplayer_LDFLAGS= -lX11 -lgmodule-2.0
- knpplayer_SOURCES= npplayer.c
- 
- xdg_apps_DATA = kmplayer.desktop
diff --git a/redhat/applications/kmplayer/kmplayer-3.5.13-missing_ldflags.patch b/redhat/applications/kmplayer/kmplayer-3.5.13-missing_ldflags.patch
new file mode 100644
index 000000000..ba6c16cb9
--- /dev/null
+++ b/redhat/applications/kmplayer/kmplayer-3.5.13-missing_ldflags.patch
@@ -0,0 +1,21 @@
+--- kmplayer/src/Makefile.am.ORI	2012-08-05 17:09:59.963896862 +0200
++++ kmplayer/src/Makefile.am	2012-08-05 17:10:16.667563785 +0200
+@@ -6,7 +6,7 @@
+ 
+ libkmplayercommon_la_SOURCES = viewarea.cpp kmplayerview.cpp playlistview.cpp kmplayercontrolpanel.cpp kmplayerconfig.cpp pref.cpp kmplayerprocess.cpp kmplayer_callback.skel kmplayer_backend.stub kmplayerpartbase.cpp kmplayerplaylist.cpp kmplayer_asx.cpp kmplayer_smil.cpp kmplayer_rp.cpp kmplayer_rss.cpp kmplayer_atom.cpp kmplayer_xspf.cpp triestring.cpp kmplayerpartbase.skel
+ libkmplayercommon_la_LDFLAGS = -avoid-version $(all_libraries)
+-libkmplayercommon_la_LIBADD = -lkmediaplayer $(LIB_KPARTS) $(LIB_KUTILS) $(LIB_EXPAT) -lm $(LIBCAIRO_LIBS) $(LIBQTDBUS)
++libkmplayercommon_la_LIBADD = -lkmediaplayer $(LIB_KPARTS) $(LIB_KUTILS) $(LIB_EXPAT) -lm $(LIBCAIRO_LIBS) $(LIBQTDBUS) $(LIB_QT) -lDCOP $(LIB_KDECORE) -lkdefx $(LIB_KDEUI) $(LIB_KIO)
+ 
+ if include_koffice_support
+ kofficeplugin_lib= libkmplayerkofficepart.la
+--- kmplayer/src/Makefile.am.ORI	2011-12-03 23:22:01.601981533 +0100
++++ kmplayer/src/Makefile.am	2011-12-03 23:22:44.469655046 +0100
+@@ -58,6 +58,7 @@
+ kgstplayer_SOURCES= gstplayer.cpp
+ 
+ knpplayer_LDADD= $(LIBNSPR_LIBS)
++knpplayer_LDFLAGS= -lX11 -lgmodule-2.0
+ knpplayer_SOURCES= npplayer.c
+ 
+ xdg_apps_DATA = kmplayer.desktop
diff --git a/redhat/applications/kmplayer/trinity-kmplayer.spec b/redhat/applications/kmplayer/trinity-kmplayer.spec
index 933e47ee2..70589fe00 100644
--- a/redhat/applications/kmplayer/trinity-kmplayer.spec
+++ b/redhat/applications/kmplayer/trinity-kmplayer.spec
@@ -1,25 +1,32 @@
 # Default version for this component
 %define kdecomp kmplayer
-%define version 0.10.0c
-%define release 2
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_prefix}/share/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/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-%{kdecomp}
 Summary:	media player for Trinity
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	0.10.0c
+Release:	2%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Multimedia
@@ -28,24 +35,33 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://kmplayer.kde.org
 
-Prefix:		%{_prefix}
+Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
-Patch0:		kmplayer-3.5.13-ftbfs.patch
 
 # [kmplayer] Fix compilation with GCC 4.7 [Commit #5106117b]
 Patch1:		kmplayer-3.5.13-fix_gcc47_compilation.patch
 
+# [kmplayer] Missing LDLFLAGS cause FTBFS
+Patch2:		kmplayer-3.5.13-missing_ldflags.patch
+
 BuildRequires: tqtinterface-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
+BuildRequires: trinity-tdelibs-devel
+BuildRequires: trinity-tdebase-devel
 BuildRequires: desktop-file-utils
 
-BuildRequires:	libXv-devel
 BuildRequires:	dbus-tqt-devel
+
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}gstreamer0.10-devel
+BuildRequires:	%{_lib}gstreamer-plugins-base0.10-devel
+BuildRequires:	libxv-devel
+%else
 BuildRequires:	gstreamer-devel
 BuildRequires:	gstreamer-plugins-base-devel
+BuildRequires:	libXv-devel
+%endif
 
 Requires:	%{name}-base
 
@@ -96,16 +112,15 @@ Documention for KMPlayer, a basic audio/video viewer application for KDE.
 
 
 %prep
-unset QTDIR; . /etc/profile.d/qt.sh
 %setup -q -n applications/%{kdecomp}
-%patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 # 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|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
+  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
 %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@@ -114,87 +129,98 @@ unset QTDIR; . /etc/profile.d/qt.sh
 
 
 %build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt:%{_includedir}/dbus-1.0 \
-    --enable-closure
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --disable-rpath \
+  --with-extra-includes=%{tde_includedir}/tqt:%{tde_includedir}/dbus-1.0 \
+  --enable-closure
+
 
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
 %find_lang %{kdecomp}
 
+# Removes unwanted files
+%__rm -f %{?buildroot}%{tde_datadir}/mimelnk/application/x-mplayer2.desktop
+
+
 %clean
 %__rm -rf %{buildroot}
 
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post
+/sbin/ldconfig || :
+
+%postun
+/sbin/ldconfig || :
 
 %post base
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 /sbin/ldconfig || :
 
 %postun base
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 /sbin/ldconfig || :
 
-%post konq-plugins -p /sbin/ldconfig
-%postun konq-plugins  -p /sbin/ldconfig
-
 
 %files -f %{kdecomp}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog INSTALL README TODO kmplayer.lsm
-%{_bindir}/kmplayer
-%{_bindir}/knpplayer
-%{_bindir}/kxvplayer
-%{_libdir}/libkdeinit_kmplayer.la
-%{_libdir}/libkdeinit_kmplayer.so
-%{tde_libdir}/kmplayer.la
-%{tde_libdir}/kmplayer.so
-%{_datadir}/applications/kde/kmplayer.desktop
-%{_datadir}/apps/kmplayer
-%exclude %{_datadir}/mimelnk/application/x-mplayer2.desktop
-%{_datadir}/services/kmplayer_part.desktop
+%{tde_bindir}/kmplayer
+%{tde_bindir}/knpplayer
+%{tde_bindir}/kxvplayer
+%{tde_libdir}/libkdeinit_kmplayer.la
+%{tde_libdir}/libkdeinit_kmplayer.so
+%{tde_tdelibdir}/kmplayer.la
+%{tde_tdelibdir}/kmplayer.so
+%{tde_tdeappdir}/kmplayer.desktop
+%{tde_datadir}/apps/kmplayer
+%{tde_datadir}/services/kmplayer_part.desktop
 
 %files base
 %defattr(-,root,root,-)
-%{_libdir}/libkmplayercommon.la
-%{_libdir}/libkmplayercommon.so
-%{_bindir}/kgstplayer
-%{_bindir}/kxineplayer
-%{_datadir}/config/kmplayerrc
-%{_datadir}/apps/kmplayer/bookmarks.xml
-%{_datadir}/apps/kmplayer/noise.gif
-%{_datadir}/apps/kmplayer/pluginsinfo
-%{_datadir}/icons/hicolor/*/apps/kmplayer.png
-%{_datadir}/icons/hicolor/*/apps/kmplayer.svgz
-%{_datadir}/mimelnk/application/x-kmplayer.desktop
-%{_datadir}/mimelnk/video/x-ms-wmp.desktop
+%{tde_libdir}/libkmplayercommon.la
+%{tde_libdir}/libkmplayercommon.so
+%{tde_bindir}/kgstplayer
+%{tde_bindir}/kxineplayer
+%{tde_datadir}/config/kmplayerrc
+%{tde_datadir}/apps/kmplayer/bookmarks.xml
+%{tde_datadir}/apps/kmplayer/noise.gif
+%{tde_datadir}/apps/kmplayer/pluginsinfo
+%{tde_datadir}/icons/hicolor/*/apps/kmplayer.png
+%{tde_datadir}/icons/hicolor/*/apps/kmplayer.svgz
+%{tde_datadir}/mimelnk/application/x-kmplayer.desktop
+%{tde_datadir}/mimelnk/video/x-ms-wmp.desktop
 
 
 %files doc
 %defattr(-,root,root,-)
-%{tde_docdir}/HTML/*/kmplayer
+%{tde_tdedocdir}/HTML/*/kmplayer
 
 %files konq-plugins
 %defattr(-,root,root,-)
-%{tde_libdir}/libkmplayerpart.la
-%{tde_libdir}/libkmplayerpart.so
-%{_datadir}/apps/kmplayer/kmplayerpartui.rc
-%{_datadir}/apps/kmplayer/pluginsinfo
-%{_datadir}/services/kmplayer_part.desktop
+%{tde_tdelibdir}/libkmplayerpart.la
+%{tde_tdelibdir}/libkmplayerpart.so
+%{tde_datadir}/apps/kmplayer/kmplayerpartui.rc
+%{tde_datadir}/apps/kmplayer/pluginsinfo
+%{tde_datadir}/services/kmplayer_part.desktop
 
 
 %Changelog
diff --git a/redhat/applications/kmyfirewall/kmyfirewall-3.5.13-missing_ldflags.patch b/redhat/applications/kmyfirewall/kmyfirewall-3.5.13-missing_ldflags.patch
new file mode 100644
index 000000000..f2d236faa
--- /dev/null
+++ b/redhat/applications/kmyfirewall/kmyfirewall-3.5.13-missing_ldflags.patch
@@ -0,0 +1,11 @@
+--- kmyfirewall/kmyfirewall/core/Makefile.am.ROI	2012-08-05 17:28:28.006801940 +0200
++++ kmyfirewall/kmyfirewall/core/Makefile.am	2012-08-05 17:28:40.878545270 +0200
+@@ -53,7 +53,7 @@
+ 
+ libkmfcoreincludedir = $(includedir)/kmyfirewall/core/
+ 
+-libkmfcore_la_LIBADD = $(LIB_KPARTS) $(LIB_KIO)
++libkmfcore_la_LIBADD = $(LIB_KPARTS) $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+ 
+ libkmfcoreinclude_HEADERS = ipaddress.h \
+ 	iptable.h \
diff --git a/redhat/applications/kmyfirewall/trinity-kmyfirewall.spec b/redhat/applications/kmyfirewall/trinity-kmyfirewall.spec
index ddc21d3fa..5a0cde153 100644
--- a/redhat/applications/kmyfirewall/trinity-kmyfirewall.spec
+++ b/redhat/applications/kmyfirewall/trinity-kmyfirewall.spec
@@ -1,25 +1,32 @@
 # Default version for this component
 %define kdecomp kmyfirewall
-%define version 1.1.1
-%define release 2
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_prefix}/share/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/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-%{kdecomp}
 Summary:	iptables based firewall configuration tool for KDE [Trinity]
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	1.1.1
+Release:	2%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -28,17 +35,19 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org/
 
-Prefix:		%{_prefix}
+Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
 
 # [kmyfirewall] GCC 4.7 fixes. [Commit #88d2d2a7]
 Patch1:		kmyfirewall-3.5.13-fix_gcc47_compilation.patch
+# [kmyfirefall] Missing LDFLAGS cause FTBFS
+Patch2:		kmyfirewall-3.5.13-missing_ldflags.patch
 
 BuildRequires: tqtinterface-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
+BuildRequires: trinity-tdelibs-devel
+BuildRequires: trinity-tdebase-devel
 BuildRequires: desktop-file-utils
 
 
@@ -64,15 +73,15 @@ Requires:		%{name} = %{version}-%{release}
 
 
 %prep
-unset QTDIR; . /etc/profile.d/qt.sh
 %setup -q -n applications/%{kdecomp}
 %patch1 -p1
+%patch2 -p1
 
 # 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|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
+  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
 %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@@ -80,18 +89,26 @@ unset QTDIR; . /etc/profile.d/qt.sh
 
 
 %build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt \
-    --enable-closure
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --includedir=%{tde_tdeincludedir} \
+  --disable-rpath \
+  --with-extra-includes=%{tde_includedir}/tqt \
+  --enable-closure
 
 %__make %{?_smp_mflags}
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
@@ -101,16 +118,18 @@ export PATH="%{_bindir}:${PATH}"
 
 
 %post
+update-desktop-database %{tde_appdir} > /dev/null
 for f in hicolor Locolor; do
-  touch --no-create %{_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+  touch --no-create %{tde_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
 done
 /sbin/ldconfig || :
 
 %postun
+update-desktop-database %{tde_appdir} > /dev/null
 for f in hicolor Locolor; do
-  touch --no-create %{_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+  touch --no-create %{tde_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
 done
 /sbin/ldconfig || :
 
@@ -118,68 +137,66 @@ done
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING COPYING-DOCS README TODO
-%{_bindir}/kmyfirewall
-%{_libdir}/libkmfcore.so.*
-%{_libdir}/libkmfwidgets.so.*
-%{tde_libdir}/libkmfcompiler_ipt.la
-%{tde_libdir}/libkmfcompiler_ipt.so
-%{tde_libdir}/libkmfgenericinterfacepart.la
-%{tde_libdir}/libkmfgenericinterfacepart.so
-%{tde_libdir}/libkmfinstaller_linux.la
-%{tde_libdir}/libkmfinstaller_linux.so
-%{tde_libdir}/libkmfinstallerplugin.la
-%{tde_libdir}/libkmfinstallerplugin.so
-%{tde_libdir}/libkmfipteditorpart.la
-%{tde_libdir}/libkmfipteditorpart.so
-%{tde_libdir}/libkmfruleoptionedit_custom.la
-%{tde_libdir}/libkmfruleoptionedit_custom.so
-%{tde_libdir}/libkmfruleoptionedit_interface.la
-%{tde_libdir}/libkmfruleoptionedit_interface.so
-%{tde_libdir}/libkmfruleoptionedit_ip.la
-%{tde_libdir}/libkmfruleoptionedit_ip.so
-%{tde_libdir}/libkmfruleoptionedit_limit.la
-%{tde_libdir}/libkmfruleoptionedit_limit.so
-%{tde_libdir}/libkmfruleoptionedit_mac.la
-%{tde_libdir}/libkmfruleoptionedit_mac.so
-%{tde_libdir}/libkmfruleoptionedit_protocol.la
-%{tde_libdir}/libkmfruleoptionedit_protocol.so
-%{tde_libdir}/libkmfruleoptionedit_state.la
-%{tde_libdir}/libkmfruleoptionedit_state.so
-%{tde_libdir}/libkmfruleoptionedit_tos.la
-%{tde_libdir}/libkmfruleoptionedit_tos.so
-%{tde_libdir}/libkmfruletargetoptionedit_log.la
-%{tde_libdir}/libkmfruletargetoptionedit_log.so
-%{tde_libdir}/libkmfruletargetoptionedit_mark.la
-%{tde_libdir}/libkmfruletargetoptionedit_mark.so
-%{tde_libdir}/libkmfruletargetoptionedit_nat.la
-%{tde_libdir}/libkmfruletargetoptionedit_nat.so
-%{tde_libdir}/libkmfruletargetoptionedit_tos.la
-%{tde_libdir}/libkmfruletargetoptionedit_tos.so
-%{_datadir}/applications/kde/kmyfirewall.desktop
-%{_datadir}/apps/kmfgenericinterfacepart/kmfgenericinterfacepartui.rc
-%{_datadir}/apps/kmfipteditorpart/kmfipteditorpartui.rc
-%{_datadir}/apps/kmfsystray
-%{_datadir}/apps/kmyfirewall
-%{_datadir}/config.kcfg/kmfconfig.kcfg
-%{_datadir}/config/kmyfirewallrc
-%{tde_docdir}/HTML/en/kmyfirewall/common
-%{tde_docdir}/HTML/en/kmyfirewall/index.cache.bz2
-%{tde_docdir}/HTML/en/kmyfirewall/index.docbook
-%{_datadir}/icons/hicolor/*/apps/kmyfirewall.png
-%{_datadir}/icons/Locolor/*/apps/kmyfirewall.png
-%{_datadir}/mimelnk/application/kmfgrs.desktop
-%{_datadir}/mimelnk/application/kmfnet.desktop
-%{_datadir}/mimelnk/application/kmfpkg.desktop
-%{_datadir}/mimelnk/application/kmfrs.desktop
-%{_datadir}/services/kmf*.desktop
-%{_datadir}/servicetypes/kmf*.desktop
+%{tde_bindir}/kmyfirewall
+%{tde_libdir}/libkmfcore.so.*
+%{tde_libdir}/libkmfwidgets.so.*
+%{tde_tdelibdir}/libkmfcompiler_ipt.la
+%{tde_tdelibdir}/libkmfcompiler_ipt.so
+%{tde_tdelibdir}/libkmfgenericinterfacepart.la
+%{tde_tdelibdir}/libkmfgenericinterfacepart.so
+%{tde_tdelibdir}/libkmfinstaller_linux.la
+%{tde_tdelibdir}/libkmfinstaller_linux.so
+%{tde_tdelibdir}/libkmfinstallerplugin.la
+%{tde_tdelibdir}/libkmfinstallerplugin.so
+%{tde_tdelibdir}/libkmfipteditorpart.la
+%{tde_tdelibdir}/libkmfipteditorpart.so
+%{tde_tdelibdir}/libkmfruleoptionedit_custom.la
+%{tde_tdelibdir}/libkmfruleoptionedit_custom.so
+%{tde_tdelibdir}/libkmfruleoptionedit_interface.la
+%{tde_tdelibdir}/libkmfruleoptionedit_interface.so
+%{tde_tdelibdir}/libkmfruleoptionedit_ip.la
+%{tde_tdelibdir}/libkmfruleoptionedit_ip.so
+%{tde_tdelibdir}/libkmfruleoptionedit_limit.la
+%{tde_tdelibdir}/libkmfruleoptionedit_limit.so
+%{tde_tdelibdir}/libkmfruleoptionedit_mac.la
+%{tde_tdelibdir}/libkmfruleoptionedit_mac.so
+%{tde_tdelibdir}/libkmfruleoptionedit_protocol.la
+%{tde_tdelibdir}/libkmfruleoptionedit_protocol.so
+%{tde_tdelibdir}/libkmfruleoptionedit_state.la
+%{tde_tdelibdir}/libkmfruleoptionedit_state.so
+%{tde_tdelibdir}/libkmfruleoptionedit_tos.la
+%{tde_tdelibdir}/libkmfruleoptionedit_tos.so
+%{tde_tdelibdir}/libkmfruletargetoptionedit_log.la
+%{tde_tdelibdir}/libkmfruletargetoptionedit_log.so
+%{tde_tdelibdir}/libkmfruletargetoptionedit_mark.la
+%{tde_tdelibdir}/libkmfruletargetoptionedit_mark.so
+%{tde_tdelibdir}/libkmfruletargetoptionedit_nat.la
+%{tde_tdelibdir}/libkmfruletargetoptionedit_nat.so
+%{tde_tdelibdir}/libkmfruletargetoptionedit_tos.la
+%{tde_tdelibdir}/libkmfruletargetoptionedit_tos.so
+%{tde_tdeappdir}/kmyfirewall.desktop
+%{tde_datadir}/apps/kmfgenericinterfacepart/kmfgenericinterfacepartui.rc
+%{tde_datadir}/apps/kmfipteditorpart/kmfipteditorpartui.rc
+%{tde_datadir}/apps/kmfsystray
+%{tde_datadir}/apps/kmyfirewall
+%{tde_datadir}/config.kcfg/kmfconfig.kcfg
+%{tde_datadir}/config/kmyfirewallrc
+%{tde_tdedocdir}/HTML/en/kmyfirewall/
+%{tde_datadir}/icons/hicolor/*/apps/kmyfirewall.png
+%{tde_datadir}/icons/Locolor/*/apps/kmyfirewall.png
+%{tde_datadir}/mimelnk/application/kmfgrs.desktop
+%{tde_datadir}/mimelnk/application/kmfnet.desktop
+%{tde_datadir}/mimelnk/application/kmfpkg.desktop
+%{tde_datadir}/mimelnk/application/kmfrs.desktop
+%{tde_datadir}/services/kmf*.desktop
+%{tde_datadir}/servicetypes/kmf*.desktop
 
 %files devel
-%{_includedir}/kmyfirewall
-%{_libdir}/libkmfcore.la
-%{_libdir}/libkmfcore.so
-%{_libdir}/libkmfwidgets.la
-%{_libdir}/libkmfwidgets.so
+%{tde_tdeincludedir}/kmyfirewall
+%{tde_libdir}/libkmfcore.la
+%{tde_libdir}/libkmfcore.so
+%{tde_libdir}/libkmfwidgets.la
+%{tde_libdir}/libkmfwidgets.so
 
 %Changelog
 * Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.1.1-2
diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13-fix_qt3_plugins_location.patch b/redhat/applications/kmymoney/kmymoney-3.5.13-fix_qt3_plugins_location.patch
new file mode 100644
index 000000000..8a6754fb5
--- /dev/null
+++ b/redhat/applications/kmymoney/kmymoney-3.5.13-fix_qt3_plugins_location.patch
@@ -0,0 +1,41 @@
+--- kmymoney/kmymoney2/widgets/Makefile.am.ORI	2012-08-05 18:38:59.001977368 +0200
++++ kmymoney/kmymoney2/widgets/Makefile.am	2012-08-05 18:39:47.007986865 +0200
+@@ -68,19 +68,19 @@
+ # Hence the quick hack to include the required objects from the
+ # libkmm_mymoney.so directly into libkmymoney.so
+ libkmymoney_la_CXXFLAGS = -U_CHECK_MEMORY -DKMM_DESIGNER
+-libkmymoney_la_LDFLAGS = `ls ../mymoney/*.lo` $(KDE_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) -rpath $(DESTDIR)$(qt_libraries)/../plugins/designer $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
++libkmymoney_la_LDFLAGS = `ls ../mymoney/*.lo` $(KDE_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) -rpath $(DESTDIR)${QTPLUGINS}/designer $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+ 
+ if INSTALL_QTDESIGNER_SUPPORT
+ install-exec-local: libkmymoney.la
+-	$(mkinstalldirs) $(DESTDIR)$(qt_libraries)/../plugins/designer
+-	$(INSTALL_PROGRAM) .libs/libkmymoney.so $(DESTDIR)$(qt_libraries)/../plugins/designer
++	$(mkinstalldirs) $(DESTDIR)${QTPLUGINS}/designer
++	$(INSTALL_PROGRAM) .libs/libkmymoney.so $(DESTDIR)${QTPLUGINS}/designer
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_datadir)/$(PICS_DIR)
+ 	for file in $(WIDGET_PNGS); do \
+ 	  $(INSTALL_DATA) $(abs_srcdir)/$$file $(DESTDIR)$(kde_datadir)/$(PICS_DIR); \
+ 	done
+ 
+ uninstall-local:
+-	-rm $(DESTDIR)$(qt_libraries)/../plugins/designer/libkmymoney.so
++	-rm $(DESTDIR)${QTPLUGINS}/designer/libkmymoney.so
+ 	for file in $(WIDGET_PNGS); do \
+ 	  rm -rf $(DESTDIR)$(kde_datadir)/$(PICS_DIR)/$$file; \
+ 	done
+--- kmymoney/admin/acinclude.m4.ORI	2012-08-05 19:47:47.819789267 +0200
++++ kmymoney/admin/acinclude.m4.in	2012-08-05 19:48:35.842776216 +0200
+@@ -6724,7 +6724,11 @@
+       QTDIR=`dirname $MOC`
+       QTDIR=${QTDIR%/bin}
+     fi
+-    LIBSQLITE3=${QTDIR}/plugins/sqldrivers/libsqlite3${qtlib}.so
++    if test x$QTPLUGINS = x; then
++      LIBSQLITE3=${QTDIR}/plugins/sqldrivers/libsqlite3${qtlib}.so
++    else
++      LIBSQLITE3=${QTPLUGINS}/sqldrivers/libsqlite3${qtlib}.so
++    fi
+ 
+     # do the checks
+     if test $enable_sqlite3 = auto; then
diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13-missing_ldflags.patch b/redhat/applications/kmymoney/kmymoney-3.5.13-missing_ldflags.patch
new file mode 100644
index 000000000..c80007000
--- /dev/null
+++ b/redhat/applications/kmymoney/kmymoney-3.5.13-missing_ldflags.patch
@@ -0,0 +1,18 @@
+--- kmymoney/qt-sqlite3-0.2/sqlite3/sqlite3.pro.ORI	2012-08-05 18:51:56.961702141 +0200
++++ kmymoney/qt-sqlite3-0.2/sqlite3/sqlite3.pro	2012-08-05 19:05:43.064116419 +0200
+@@ -4,13 +4,13 @@
+ # Target is una libreria:  qsqlite3
+ 
+ INSTALLS += target 
+-target.path = $QTDIR/plugins/sqldrivers 
++target.path = $(qt_plugins)/sqldrivers 
+ HEADERS += qsql_sqlite3.h \
+            qsqlcachedresult.h 
+ SOURCES += smain.cpp \
+            qsql_sqlite3.cpp \
+            qsqlcachedresult.cpp 
+-LIBS += -lsqlite3 
++LIBS += -lsqlite3 -L$(QTLIB)
+ TARGET = qsqlite3 
+ DESTDIR = ../sqldrivers 
+ CONFIG += release \
diff --git a/redhat/applications/kmymoney/trinity-kmymoney-3.5.13.spec b/redhat/applications/kmymoney/trinity-kmymoney-3.5.13.spec
index f1a9dea58..9e01de404 100644
--- a/redhat/applications/kmymoney/trinity-kmymoney-3.5.13.spec
+++ b/redhat/applications/kmymoney/trinity-kmymoney-3.5.13.spec
@@ -1,27 +1,42 @@
 # Default version for this component
 %define kdecomp kmymoney
-%define version 1.0.5
-%define release 2
+
+# Required for Mageia 2: removes the ldflag '--no-undefined'
+%define _disable_ld_no_undefined 1
+
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%define qt3pluginsdir %{_libdir}/qt3/plugins
+%else
+%define qt3pluginsdir %{_libdir}/qt-3.3/plugins
+%endif
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_datadir}/doc
-%define _mandir %{_datadir}/man
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/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-%{kdecomp}
 Summary:	personal finance manager for TDE
 
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	1.0.5
+Release:	2%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -30,7 +45,7 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org/
 
-Prefix:    %{_prefix}
+Prefix:    %{tde_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
@@ -46,17 +61,28 @@ Patch2:		kmymoney-3.5.13-update_to_1.0.5.patch
 # [kmymoney] Fix compilation with GCC 4.7 [Bug #958]
 Patch3:		kmymoney-3.5.13-fix_gcc47_compilation.patch
 
+# [kmymoney] Missing LDFLAGS causing FTBFS
+Patch4:		kmymoney-3.5.13-missing_ldflags.patch
+
+# [kmymoney] Fix QT3 plugins directory location
+Patch5:		kmymoney-3.5.13-fix_qt3_plugins_location.patch
+
 BuildRequires: tqtinterface-devel
 BuildRequires: trinity-arts-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
+BuildRequires: trinity-tdelibs-devel
+BuildRequires: trinity-tdebase-devel
 BuildRequires: desktop-file-utils
 
 BuildRequires: recode
 BuildRequires: html2ps
-BuildRequires: opensp-devel
 BuildRequires: libofx-devel
 
+%if 0%{?mgaversion}
+BuildRequires: %{_lib}OpenSP5-devel
+%else
+BuildRequires: opensp-devel
+%endif
+
 Requires:		%{name}-common == %{version}
 
 %description
@@ -92,13 +118,15 @@ This package contains development files needed for KMyMoney plugins.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch5 -p1 -b .qtpluginsdir
+
 %__install -m644 %{SOURCE1} kmymoney2/widgets/
 
 # 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|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
+  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
 %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@@ -106,29 +134,52 @@ This package contains development files needed for KMyMoney plugins.
 
 
 %build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
+
+# Required to find the QT3 plugins directory
+%if 0%{?mgaversion} || 0%{?mdkversion}
+export QTPLUGINS=%{_libdir}/qt3/plugins
+%endif
 
 %configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt \
-    --enable-closure \
-    --enable-pdf-docs \
-    --enable-ofxplugin \
-    --enable-ofxbanking \
-    --enable-qtdesigner \
-    --enable-sqlite3
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --includedir=%{tde_tdeincludedir} \
+  --disable-rpath \
+  --with-extra-includes=%{tde_includedir}/tqt \
+  --enable-closure \
+  --enable-pdf-docs \
+  --enable-ofxplugin \
+  --enable-ofxbanking \
+  --enable-qtdesigner \
+  --enable-sqlite3
+
+# Fix FTBFS inside sqlite3 archive
+patch -p1 < %{PATCH4}
 
 %__make %{?_smp_mflags}
 
-
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
+
+# Required to find the QT3 plugins directory
+%if 0%{?mgaversion} || 0%{?mdkversion}
+export QTPLUGINS=%{_libdir}/qt3/plugins
+%endif
+
 %__make install DESTDIR=%{buildroot}
 
 
 
+
 ## File lists
 # HTML (1.0)
 HTML_DIR=$(kde-config --expandvars --install html)
@@ -154,65 +205,64 @@ fi
 
 
 %post
+update-desktop-database %{tde_appdir} > /dev/null
 /sbin/ldconfig
 for f in hicolor locolor Tango oxygen; do
-  touch --no-create %{_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+  touch --no-create %{tde_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
 done
 
 %postun
+update-desktop-database %{tde_appdir} > /dev/null
 /sbin/ldconfig
 for f in hicolor locolor Tango oxygen; do
-  touch --no-create %{_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+  touch --no-create %{tde_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
 done
 
 %files
 %defattr(-,root,root,-)
-%{_bindir}/kmymoney
-%{_bindir}/kmymoney2
-%{_datadir}/applications/kde/kmymoney2.desktop
-%{_datadir}/mimelnk/application/x-kmymoney2.desktop
-%{_datadir}/servicetypes/kmymoneyimporterplugin.desktop
-%{_datadir}/servicetypes/kmymoneyplugin.desktop
-%{_libdir}/*.so.*
-%{tde_libdir}/kmm_ofximport.la
-%{tde_libdir}/kmm_ofximport.so
+%{tde_bindir}/kmymoney
+%{tde_bindir}/kmymoney2
+%{tde_tdeappdir}/kmymoney2.desktop
+%{tde_datadir}/mimelnk/application/x-kmymoney2.desktop
+%{tde_datadir}/servicetypes/kmymoneyimporterplugin.desktop
+%{tde_datadir}/servicetypes/kmymoneyplugin.desktop
+%{tde_libdir}/*.so.*
+%{tde_tdelibdir}/kmm_ofximport.la
+%{tde_tdelibdir}/kmm_ofximport.so
 
 %files common -f kmymoney2.lang
 %defattr(-,root,root,-)
-%{_datadir}/apps/kmymoney2/html/
-%{_datadir}/apps/kmymoney2/icons/*/*/*/*.png
-%{_datadir}/apps/kmymoney2/kmymoney2ui.rc
-%{_datadir}/apps/kmymoney2/misc/financequote.pl
-%{_datadir}/apps/kmymoney2/pics/*.png
-%{_datadir}/apps/kmymoney2/templates/*/*.kmt
-%{_datadir}/apps/kmymoney2/tips
-%{_datadir}/config.kcfg/kmymoney2.kcfg
-%{_datadir}/icons/hicolor/*/*/*.png
-%{_datadir}/icons/Tango/*/*/*.png
-%{_datadir}/icons/Tango/scalable/*.svgz
-%{_datadir}/icons/locolor/*/*/*.png
-%{_datadir}/icons/oxygen/*/*/*.png
-%{_datadir}/icons/oxygen/scalable/*.svgz
-%{tde_docdir}/HTML/en/kmymoney2/*.docbook
-%{tde_docdir}/HTML/en/kmymoney2/*.png
-%{tde_docdir}/HTML/en/kmymoney2/common
-%{tde_docdir}/HTML/en/kmymoney2/index.cache.bz2
-%{_mandir}/man1/kmymoney2.*
-%{_datadir}/apps/kmm_ofximport/kmm_ofximport.rc
-%{_datadir}/services/kmm_ofximport.desktop
+%{tde_datadir}/apps/kmymoney2/html/
+%{tde_datadir}/apps/kmymoney2/icons/*/*/*/*.png
+%{tde_datadir}/apps/kmymoney2/kmymoney2ui.rc
+%{tde_datadir}/apps/kmymoney2/misc/financequote.pl
+%{tde_datadir}/apps/kmymoney2/pics/*.png
+%{tde_datadir}/apps/kmymoney2/templates/*/*.kmt
+%{tde_datadir}/apps/kmymoney2/tips
+%{tde_datadir}/config.kcfg/kmymoney2.kcfg
+%{tde_datadir}/icons/hicolor/*/*/*.png
+%{tde_datadir}/icons/Tango/*/*/*.png
+%{tde_datadir}/icons/Tango/scalable/*.svgz
+%{tde_datadir}/icons/locolor/*/*/*.png
+%{tde_datadir}/icons/oxygen/*/*/*.png
+%{tde_datadir}/icons/oxygen/scalable/*.svgz
+%{tde_tdedocdir}/HTML/en/kmymoney2/
+%{tde_mandir}/man1/kmymoney2.*
+%{tde_datadir}/apps/kmm_ofximport/kmm_ofximport.rc
+%{tde_datadir}/services/kmm_ofximport.desktop
 
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/kmymoney/*.h
-%{_libdir}/libkmm_kdchart.la
-%{_libdir}/libkmm_mymoney.la
-%{_libdir}/libkmm_plugin.la
-%{_libdir}/*.so
-%{_usr}/%{_lib}/qt-3.3/plugins/sqldrivers/libsqlite3*.so
-%{_usr}/%{_lib}/qt-3.3/plugins/designer/libkmymoney.so
+%{tde_tdeincludedir}/kmymoney/*.h
+%{tde_libdir}/libkmm_kdchart.la
+%{tde_libdir}/libkmm_mymoney.la
+%{tde_libdir}/libkmm_plugin.la
+%{tde_libdir}/*.so
+%{qt3pluginsdir}/sqldrivers/libsqlite3*.so
+%{qt3pluginsdir}/designer/libkmymoney.so
 
 %Changelog
 * Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-2
diff --git a/redhat/applications/knemo/trinity-knemo.spec b/redhat/applications/knemo/trinity-knemo.spec
index 441a78732..3db393ccd 100644
--- a/redhat/applications/knemo/trinity-knemo.spec
+++ b/redhat/applications/knemo/trinity-knemo.spec
@@ -1,25 +1,32 @@
 # Default version for this component
 %define kdecomp knemo
-%define version 0.4.8
-%define release 2
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_datadir}/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/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-%{kdecomp}
 Summary:	network interfaces monitor for the Trinity systray
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	0.4.8
+Release:	2%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -28,14 +35,14 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://beta.smileaf.org/projects
 
-Prefix:    %{_prefix}
+Prefix:    %{tde_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
 
 BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-kdelibs-devel
-BuildRequires:	trinity-kdebase-devel
+BuildRequires:	trinity-tdelibs-devel
+BuildRequires:	trinity-tdebase-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
@@ -59,8 +66,8 @@ Homepage: http://extragear.kde.org/apps/knemo/
 # 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|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
+  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
 %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@@ -68,18 +75,26 @@ Homepage: http://extragear.kde.org/apps/knemo/
 
 
 %build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --includedir=%{tde_tdeincludedir} \
+  --disable-rpath \
+  --with-extra-includes=%{tde_includedir}/tqt
 
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
@@ -88,26 +103,28 @@ export PATH="%{_bindir}:${PATH}"
 
 
 %post
-touch --no-create %{_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
+update-desktop-database %{tde_appdir} > /dev/null
+touch --no-create %{tde_datadir}/icons/crystalsvg || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
 
 %postun
-touch --no-create %{_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
+update-desktop-database %{tde_appdir} > /dev/null
+touch --no-create %{tde_datadir}/icons/crystalsvg || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
 
 
 %files
 %defattr(-,root,root,-)
-%{tde_libdir}/kcm_knemo.la
-%{tde_libdir}/kcm_knemo.so
-%{tde_libdir}/kded_knemod.la
-%{tde_libdir}/kded_knemod.so
-%{_datadir}/applications/kde/kcm_knemo.desktop
-%{_datadir}/apps/knemo/eventsrc
-%{_datadir}/icons/crystalsvg/*/*/*.png
-%{_datadir}/locale/*/LC_MESSAGES/knemod.mo
-%{_datadir}/locale/*/LC_MESSAGES/kcm_knemo.mo
-%{_datadir}/services/kded/knemod.desktop
+%{tde_tdelibdir}/kcm_knemo.la
+%{tde_tdelibdir}/kcm_knemo.so
+%{tde_tdelibdir}/kded_knemod.la
+%{tde_tdelibdir}/kded_knemod.so
+%{tde_tdeappdir}/kcm_knemo.desktop
+%{tde_datadir}/apps/knemo/eventsrc
+%{tde_datadir}/icons/crystalsvg/*/*/*.png
+%{tde_datadir}/locale/*/LC_MESSAGES/knemod.mo
+%{tde_datadir}/locale/*/LC_MESSAGES/kcm_knemo.mo
+%{tde_datadir}/services/kded/knemod.desktop
 
 
 %Changelog
diff --git a/redhat/applications/knetload/trinity-knetload.spec b/redhat/applications/knetload/trinity-knetload.spec
index 55b1383c2..89b234ac9 100644
--- a/redhat/applications/knetload/trinity-knetload.spec
+++ b/redhat/applications/knetload/trinity-knetload.spec
@@ -1,25 +1,32 @@
 # Default version for this component
 %define kdecomp knetload
-%define version 2.3
-%define release 2
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_prefix}/share/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/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-%{kdecomp}
 Summary:	a network meter for Kicker [Trinity]
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	2.3
+Release:	2%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -28,14 +35,14 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org
 
-Prefix:    %{_prefix}
+Prefix:    %{tde_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
 
 BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-kdelibs-devel
-BuildRequires:	trinity-kdebase-devel
+BuildRequires:	trinity-tdelibs-devel
+BuildRequires:	trinity-tdebase-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
@@ -56,8 +63,8 @@ KNetLoad can monitor just about any network device.
 # 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|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
+  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
 %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@@ -65,19 +72,27 @@ KNetLoad can monitor just about any network device.
 
 
 %build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --includedir=%{tde_tdeincludedir} \
+  --disable-rpath \
+  --with-extra-includes=%{tde_includedir}/tqt
 
 # SMP safe !
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
@@ -90,25 +105,27 @@ export PATH="%{_bindir}:${PATH}"
 
 
 %post
+update-desktop-database %{tde_appdir} > /dev/null
 for f in crystalsvg locolor ; do
-  touch --no-create %{_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+  touch --no-create %{tde_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
 done
 
 %postun
+update-desktop-database %{tde_appdir} > /dev/null
 for f in crystalsvg locolor ; do
-  touch --no-create %{_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+  touch --no-create %{tde_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
 done
 
 
 %files -f %{kdecomp}.lang
 %defattr(-,root,root,-)
-%{_bindir}/knetload
-%{_datadir}/applications/kde/knetload.desktop
-%{_datadir}/apps/knetload
-%{_datadir}/icons/crystalsvg/*/apps/knetload.png
-%{_datadir}/icons/locolor/*/apps/knetload.png
+%{tde_bindir}/knetload
+%{tde_tdeappdir}/knetload.desktop
+%{tde_datadir}/apps/knetload
+%{tde_datadir}/icons/crystalsvg/*/apps/knetload.png
+%{tde_datadir}/icons/locolor/*/apps/knetload.png
 
 
 %Changelog
diff --git a/redhat/applications/knetstats/trinity-knetstats.spec b/redhat/applications/knetstats/trinity-knetstats.spec
index 0179cdd61..9e37f55c6 100644
--- a/redhat/applications/knetstats/trinity-knetstats.spec
+++ b/redhat/applications/knetstats/trinity-knetstats.spec
@@ -1,25 +1,32 @@
 # Default version for this component
 %define kdecomp knetstats
-%define version 1.6.1
-%define release 1
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_prefix}/share/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/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-%{kdecomp}
 Summary:	network interfaces monitor for the Trinity systray
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	1.6.1
+Release:	1%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -28,14 +35,14 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org
 
-Prefix:    %{_prefix}
+Prefix:    %{tde_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
 
 BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-kdelibs-devel
-BuildRequires:	trinity-kdebase-devel
+BuildRequires:	trinity-tdelibs-devel
+BuildRequires:	trinity-tdebase-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
@@ -51,8 +58,8 @@ network interface on a system tray icon
 # 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|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
+  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
 %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@@ -60,19 +67,27 @@ network interface on a system tray icon
 
 
 %build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --includedir=%{tde_tdeincludedir} \
+  --disable-rpath \
+  --with-extra-includes=%{tde_includedir}/tqt
 
 # SMP safe !
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
@@ -85,23 +100,23 @@ export PATH="%{_bindir}:${PATH}"
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+update-desktop-database %{tde_appdir} > /dev/null
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+update-desktop-database %{tde_appdir} > /dev/null
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 
 %files -f %{kdecomp}.lang
 %defattr(-,root,root,-)
-%{_bindir}/knetstats
-%{_datadir}/applications/kde/knetstats.desktop
-%{_datadir}/apps/knetstats
-%{tde_docdir}/HTML/en/knetstats/common
-%{tde_docdir}/HTML/en/knetstats/index.cache.bz2
-%{tde_docdir}/HTML/en/knetstats/index.docbook
-%{_datadir}/icons/hicolor/*/apps/knetstats.png
+%{tde_bindir}/knetstats
+%{tde_tdeappdir}/knetstats.desktop
+%{tde_datadir}/apps/knetstats
+%{tde_tdedocdir}/HTML/en/knetstats/
+%{tde_datadir}/icons/hicolor/*/apps/knetstats.png
 
 
 %Changelog
diff --git a/redhat/applications/knetworkmanager/trinity-knetworkmanager.spec b/redhat/applications/knetworkmanager/trinity-knetworkmanager.spec
index 3dbcc7458..8adbb5f6d 100644
--- a/redhat/applications/knetworkmanager/trinity-knetworkmanager.spec
+++ b/redhat/applications/knetworkmanager/trinity-knetworkmanager.spec
@@ -1,26 +1,36 @@
 # Default version for this component
 %define kdecomp knetworkmanager
-%if 0%{?fedora} >= 15
+%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion}
 %define version 0.9
 %else
 %define version 0.8
 %endif
-%define release 3
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_prefix}/share/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: cmake >= 2.8
-%define tde_docdir %{_docdir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/kde
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_tdedocdir}
+
 
 Name:			trinity-%{kdecomp}
 Version:		%{?version}
-Release:		%{?release}%{?dist}%{?_variant}
+Release:		3%{?dist}%{?_variant}
 
 Summary:        Trinity applet for Network Manager
 
@@ -42,10 +52,15 @@ Patch10:		knetworkmanager-3.5.13-subdir_version.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:       NetworkManager-gnome
-Requires:       kde-filesystem
+#Requires:       kde-filesystem
 BuildRequires:  desktop-file-utils
 
+%if 0%{?rhel} || 0%{?fedora}
+Requires:       NetworkManager-gnome
+%else
+Requires:       networkmanager
+%endif
+
 BuildRequires:	dbus-1-tqt-devel
 BuildRequires:	dbus-tqt-devel
 BuildRequires:	NetworkManager-glib-devel
@@ -83,18 +98,29 @@ cd knetworkmanager-0.*/src
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
-export PATH="%{_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{_libdir}/pkgconfig"
-export CMAKE_INCLUDE_PATH="%{_includedir}:%{_includedir}/tqt"
-export LD_LIBRARY_PATH="%{_libdir}"
+export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
+export LD_LIBRARY_PATH="%{tde_libdir}"
 
 # Missing TDE macros
 %__mkdir_p cmake
-%__ln_s %{_datadir}/cmake cmake/modules
+%__ln_s %{tde_datadir}/cmake cmake/modules
 
-%__mkdir build
+%if 0%{?rhel} || 0%{?fedora}
+%__mkdir_p build
 cd build
-%cmake ..
+%endif
+
+%cmake \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  -DCMAKE_SKIP_RPATH="OFF" \
+  ..
+  
 %__make %{?_smp_mflags} 
 
 %install
@@ -107,14 +133,16 @@ cd build
 
 
 %post
+update-desktop-database %{tde_appdir} > /dev/null
 /sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 %postun
+update-desktop-database %{tde_appdir} > /dev/null
 /sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 %post devel
 /sbin/ldconfig
@@ -124,22 +152,22 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %files 
 %defattr(-,root,root,-)
-%{_bindir}/knetworkmanager
-%{_libdir}/*.la
-%{_libdir}/*.so
+%{tde_bindir}/knetworkmanager
+%{tde_libdir}/*.la
+%{tde_libdir}/*.so
 %{_sysconfdir}/dbus-1/system.d/knetworkmanager.conf
-%{_datadir}/applications/kde/knetworkmanager.desktop
-%{_datadir}/apps/knetworkmanager
-%{_datadir}/icons/hicolor/*/apps/knetworkmanager*
-%{_datadir}/servicetypes/knetworkmanager_plugin.desktop
-%{_datadir}/servicetypes/knetworkmanager_vpnplugin.desktop
+%{tde_tdeappdir}/knetworkmanager.desktop
+%{tde_datadir}/apps/knetworkmanager
+%{tde_datadir}/icons/hicolor/*/apps/knetworkmanager*
+%{tde_datadir}/servicetypes/knetworkmanager_plugin.desktop
+%{tde_datadir}/servicetypes/knetworkmanager_vpnplugin.desktop
 
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/*.h
-%{tde_libdir}/*.la
-%{tde_libdir}/*.so
+%{tde_tdeincludedir}/*.h
+%{tde_tdelibdir}/*.la
+%{tde_tdelibdir}/*.so
 
 %changelog
 * Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.8-3 / 0.9-3
diff --git a/redhat/applications/knights/trinity-knights.spec b/redhat/applications/knights/trinity-knights.spec
index 6338661d7..e0271e12d 100644
--- a/redhat/applications/knights/trinity-knights.spec
+++ b/redhat/applications/knights/trinity-knights.spec
@@ -1,25 +1,32 @@
 # Default version for this component
 %define kdecomp knights
-%define version 0.6
-%define release 3
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_prefix}/share/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/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-%{kdecomp}
 Summary:	A chess interface for the K Desktop Environment [Trinity]
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	0.6
+Release:	3%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Amusements/Games
@@ -28,14 +35,14 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org/
 
-Prefix:    %{_prefix}
+Prefix:    %{tde_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
 
 BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-kdelibs-devel
-BuildRequires:	trinity-kdebase-devel
+BuildRequires:	trinity-tdelibs-devel
+BuildRequires:	trinity-tdebase-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
@@ -62,8 +69,8 @@ Here's a quick list of Knights' key features:
 # 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|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
+  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
 %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@@ -71,18 +78,26 @@ Here's a quick list of Knights' key features:
 
 
 %build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --includedir=%{tde_tdeincludedir} \
+  --disable-rpath \
+  --with-extra-includes=%{tde_includedir}/tqt:%{tde_includedir}
 
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
@@ -93,22 +108,22 @@ export PATH="%{_bindir}:${PATH}"
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 
 %files -f %{kdecomp}.lang
 %defattr(-,root,root,-)
-%{_bindir}/knights
-%{_datadir}/applnk/Games/Board/knights.desktop
-%{_datadir}/apps/knights
-%{tde_docdir}/HTML/*/knights
-%{_datadir}/icons/hicolor/*/*/*.png
-%{_datadir}/mimelnk/application/pgn.desktop
+%{tde_bindir}/knights
+%{tde_datadir}/applnk/Games/Board/knights.desktop
+%{tde_datadir}/apps/knights
+%{tde_tdedocdir}/HTML/*/knights
+%{tde_datadir}/icons/hicolor/*/*/*.png
+%{tde_datadir}/mimelnk/application/pgn.desktop
 
 
 %Changelog
diff --git a/redhat/applications/knowit/trinity-knowit.spec b/redhat/applications/knowit/trinity-knowit.spec
index 4b40fe29f..76467be17 100644
--- a/redhat/applications/knowit/trinity-knowit.spec
+++ b/redhat/applications/knowit/trinity-knowit.spec
@@ -1,25 +1,32 @@
 # Default version for this component
 %define kdecomp knowit
-%define version 0.10
-%define release 1
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_prefix}/share/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/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-%{kdecomp}
 Summary:	Tool for managing notes [Trinity]
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	0.10
+Release:	1%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -28,14 +35,14 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org
 
-Prefix:    %{_prefix}
+Prefix:    %{tde_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
 
 BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-kdelibs-devel
-BuildRequires:	trinity-kdebase-devel
+BuildRequires:	trinity-tdelibs-devel
+BuildRequires:	trinity-tdebase-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
@@ -52,8 +59,8 @@ but KDE-based, and requires Trinity.
 # 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|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
+  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
 %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@@ -61,25 +68,33 @@ but KDE-based, and requires Trinity.
 
 
 %build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --includedir=%{tde_tdeincludedir} \
+  --disable-rpath \
+  --with-extra-includes=%{tde_includedir}/tqt
 
 # SMP safe !
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
-%__mkdir_p %{buildroot}%{_datadir}/applications/kde
-%__mv %{buildroot}%{_datadir}/applnk/Applications/knowit.desktop %{buildroot}%{_datadir}/applications/kde/knowit.desktop
-%__rm -r %{buildroot}%{_datadir}/applnk
+%__mkdir_p %{buildroot}%{tde_tdeappdir}
+%__mv %{buildroot}%{tde_datadir}/applnk/Applications/knowit.desktop %{buildroot}%{tde_tdeappdir}/knowit.desktop
+%__rm -r %{buildroot}%{tde_datadir}/applnk
 
 
 %find_lang %{kdecomp}
@@ -91,25 +106,27 @@ export PATH="%{_bindir}:${PATH}"
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+update-desktop-database %{tde_appdir} > /dev/null
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+update-desktop-database %{tde_appdir} > /dev/null
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 
 %files -f %{kdecomp}.lang
 %defattr(-,root,root,-)
-%{_bindir}/knowit
-%{_datadir}/applications/kde/knowit.desktop
-%{_datadir}/apps/knowit/knowitui.rc
-%{_datadir}/apps/knowit/tips
-%{tde_docdir}/HTML/en/knowit/common
-%{tde_docdir}/HTML/en/knowit/index.cache.bz2
-%{tde_docdir}/HTML/en/knowit/index.docbook
-%{tde_docdir}/HTML/en/knowit/screenshot.png
-%{_datadir}/icons/hicolor/*/apps/knowit.png
+%{tde_bindir}/knowit
+%{tde_tdeappdir}/knowit.desktop
+%{tde_datadir}/apps/knowit/knowitui.rc
+%{tde_datadir}/apps/knowit/tips
+%{tde_tdedocdir}/HTML/en/knowit/common
+%{tde_tdedocdir}/HTML/en/knowit/index.cache.bz2
+%{tde_tdedocdir}/HTML/en/knowit/index.docbook
+%{tde_tdedocdir}/HTML/en/knowit/screenshot.png
+%{tde_datadir}/icons/hicolor/*/apps/knowit.png
 
 
 %Changelog
diff --git a/redhat/applications/knutclient/trinity-knutclient.spec b/redhat/applications/knutclient/trinity-knutclient.spec
index ef45ad28d..a7c88e8af 100644
--- a/redhat/applications/knutclient/trinity-knutclient.spec
+++ b/redhat/applications/knutclient/trinity-knutclient.spec
@@ -1,25 +1,32 @@
 # Default version for this component
 %define kdecomp knutclient
-%define version 0.9.5
-%define release 2
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_prefix}/share/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/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-%{kdecomp}
 Summary:	A KDE GUI that displays UPS statistics from NUT's upsd [Trinity]
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	0.9.5
+Release:	2%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -28,15 +35,15 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.knut.noveradsl.cz/knutclient/
 
-Prefix:		%{_prefix}
+Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
 
 
 BuildRequires: tqtinterface-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
+BuildRequires: trinity-tdelibs-devel
+BuildRequires: trinity-tdebase-devel
 BuildRequires: desktop-file-utils
 
 
@@ -48,14 +55,13 @@ stations using an UPS.
 
 
 %prep
-unset QTDIR; . /etc/profile.d/qt.sh
 %setup -q -n applications/%{kdecomp}
 
 # 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|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
+  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
 %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@@ -63,19 +69,27 @@ unset QTDIR; . /etc/profile.d/qt.sh
 
 
 %build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt \
-    --enable-closure
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --includedir=%{tde_tdeincludedir} \
+  --disable-rpath \
+  --with-extra-includes=%{tde_includedir}/tqt \
+  --enable-closure
 
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
@@ -87,28 +101,28 @@ export PATH="%{_bindir}:${PATH}"
 
 %post
 for f in hicolor locolor; do
-  touch --no-create %{_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+  touch --no-create %{tde_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
 done
 
 %postun
 for f in hicolor locolor; do
-  touch --no-create %{_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+  touch --no-create %{tde_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
 done
 
 
 %files -f %{kdecomp}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{_bindir}/knutclient
-%{_datadir}/applnk/Utilities/knutclient.desktop
-%{_datadir}/apps/knutclient/knutclientui.rc
-%{_datadir}/apps/knutclient
-%{tde_docdir}/HTML/cs/knutclient
-%{tde_docdir}/HTML/en/knutclient
-%{_datadir}/icons/hicolor/*/apps/*.png
-%{_datadir}/icons/locolor/*/apps/*.png
+%{tde_bindir}/knutclient
+%{tde_datadir}/applnk/Utilities/knutclient.desktop
+%{tde_datadir}/apps/knutclient/knutclientui.rc
+%{tde_datadir}/apps/knutclient
+%{tde_tdedocdir}/HTML/cs/knutclient
+%{tde_tdedocdir}/HTML/en/knutclient
+%{tde_datadir}/icons/hicolor/*/apps/*.png
+%{tde_datadir}/icons/locolor/*/apps/*.png
 
 %Changelog
 * Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.5-2
diff --git a/redhat/applications/koffice/chalk.xpm b/redhat/applications/koffice/chalk.xpm
deleted file mode 100644
index 0edc4f49a..000000000
--- a/redhat/applications/koffice/chalk.xpm
+++ /dev/null
@@ -1,295 +0,0 @@
-/* XPM */
-static char *chalk[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 257 2",
-"   c #000000",
-".  c #0C0C0C",
-"X  c #080604",
-"o  c #0E0F12",
-"O  c #110D01",
-"+  c #1A1200",
-"@  c #131314",
-"#  c #171719",
-"$  c #001D0B",
-"%  c #1A1C22",
-"&  c #00350A",
-"*  c #013716",
-"=  c #06221C",
-"-  c #242424",
-";  c #2D2D2C",
-":  c #3D3C3D",
-">  c #343434",
-",  c #282C33",
-"<  c #000F56",
-"1  c #00164F",
-"2  c #011554",
-"3  c #001263",
-"4  c #051E7B",
-"5  c #0A2C6A",
-"6  c #3B3D41",
-"7  c #005313",
-"8  c #085621",
-"9  c #1D5137",
-"0  c #016914",
-"q  c #0B6328",
-"w  c #126C3B",
-"e  c #23723C",
-"r  c #084755",
-"t  c #1B5952",
-"y  c #1F5475",
-"u  c #006044",
-"i  c #1B6F41",
-"p  c #2E5F48",
-"a  c #3D6270",
-"s  c #473504",
-"d  c #5C4B0B",
-"f  c #634F09",
-"g  c #4A4A4A",
-"h  c #424345",
-"j  c #5A5A5A",
-"k  c #5A5240",
-"l  c #496457",
-"z  c #5F636D",
-"x  c #605F5D",
-"c  c #6D765F",
-"v  c #636363",
-"b  c #656866",
-"n  c #666B73",
-"m  c #747573",
-"M  c #787778",
-"N  c #6C7572",
-"B  c #1A3890",
-"V  c #0739C1",
-"C  c #0030D2",
-"Z  c #1E5091",
-"A  c #13488F",
-"S  c #1243B4",
-"D  c #395787",
-"F  c #3B5498",
-"G  c #2554A9",
-"H  c #264CB8",
-"J  c #1B4BC1",
-"K  c #1650DB",
-"L  c #1960DE",
-"P  c #2254CF",
-"I  c #3766D9",
-"U  c #3A7AD6",
-"Y  c #2B67E2",
-"T  c #236EFE",
-"R  c #2C74FD",
-"E  c #2F78FD",
-"W  c #3269E2",
-"Q  c #386BFE",
-"!  c #337FFE",
-"~  c #3578FD",
-"^  c #2C7CE6",
-"/  c #4569AF",
-"(  c #646287",
-")  c #4D70CE",
-"_  c #4777E0",
-"`  c #4D7FFE",
-"'  c #038021",
-"]  c #128D2E",
-"[  c #0EA835",
-"{  c #3F9159",
-"}  c #2EB551",
-"|  c #22C24D",
-" . c #6E8422",
-".. c #428F5E",
-"X. c #5D8270",
-"o. c #53976B",
-"O. c #58AA6F",
-"+. c #618673",
-"@. c #139CFD",
-"#. c #0795FD",
-"$. c #16A2FD",
-"%. c #11B2F2",
-"&. c #2880DA",
-"*. c #378BF2",
-"=. c #27B4F4",
-"-. c #38A9F2",
-";. c #22ABFE",
-":. c #14C2FB",
-">. c #19C5FE",
-",. c #19C8FE",
-"<. c #17C8FE",
-"1. c #31C5F8",
-"2. c #559C95",
-"3. c #4C81B7",
-"4. c #798484",
-"5. c #7689B0",
-"6. c #4F8DFD",
-"7. c #5394ED",
-"8. c #5091EF",
-"9. c #43A0C6",
-"0. c #52AEE8",
-"q. c #749BE8",
-"w. c #739EFE",
-"e. c #6497F2",
-"r. c #62BDC9",
-"t. c #67A5FD",
-"y. c #7DAFFD",
-"u. c #5CCE82",
-"i. c #56CFF2",
-"p. c #70C4DA",
-"a. c #63DAFC",
-"s. c #66C9F5",
-"d. c #B8682F",
-"f. c #A78F18",
-"g. c #9F915C",
-"h. c #818279",
-"j. c #958E78",
-"k. c #969360",
-"l. c #9FA07B",
-"z. c #B69F47",
-"x. c #D1B928",
-"c. c #FEA509",
-"v. c #FEBE01",
-"b. c #FCB507",
-"n. c #FEAD22",
-"m. c #D7AF68",
-"M. c #DCC82C",
-"N. c #FEC100",
-"B. c #FECC00",
-"V. c #FDD201",
-"C. c #FDDA01",
-"Z. c #FEC614",
-"A. c #F7C825",
-"S. c #F9C63A",
-"D. c #FDDC2A",
-"F. c #F1D629",
-"G. c #F8D638",
-"H. c #E8CC39",
-"J. c #FDE502",
-"K. c #FDE717",
-"L. c #FDF911",
-"P. c #FAEA3F",
-"I. c #FDF933",
-"U. c #D3C254",
-"Y. c #DED16A",
-"T. c #E9D645",
-"R. c #FEC550",
-"E. c #F5D741",
-"W. c #EDD476",
-"Q. c #F7D375",
-"!. c #EDDB63",
-"~. c #FDEA58",
-"^. c #FBF644",
-"/. c #FDFE59",
-"(. c #F5EE49",
-"). c #FCE969",
-"_. c #FBE27C",
-"`. c #FDFE6B",
-"'. c #FDFE71",
-"]. c #92918F",
-"[. c #989A81",
-"{. c #9B9B9A",
-"}. c #949492",
-"|. c #898D8A",
-" X c #8F92A0",
-".X c #9AA3B7",
-"XX c #9BACAA",
-"oX c #A0A182",
-"OX c #B0A996",
-"+X c gray64",
-"@X c #A8ACA9",
-"#X c #AFB0AF",
-"$X c #B4B5B3",
-"%X c #BABABA",
-"&X c #B6B6B3",
-"*X c #ADA8AD",
-"=X c #8BA9E9",
-"-X c #92B3F0",
-";X c #A8BDEB",
-":X c #84D3A7",
-">X c #93CAD8",
-",X c #84C4D6",
-"<X c #8BD4F8",
-"1X c #90C9FD",
-"2X c #93EBFE",
-"3X c #B1C6D5",
-"4X c #AECCFE",
-"5X c #A8C5F8",
-"6X c #A9D6FB",
-"7X c #BACCF3",
-"8X c #B8D9F8",
-"9X c #BCCBEE",
-"0X c #ACE6FB",
-"qX c #D2BD83",
-"wX c #C4BDBA",
-"eX c #CFC497",
-"rX c #C7C3B9",
-"tX c #D1CABB",
-"yX c #ECD98D",
-"uX c #EECFA1",
-"iX c #EDDCA2",
-"pX c #FDF690",
-"aX c #FDFAA8",
-"sX c #FCFAB7",
-"dX c #F8E3A2",
-"fX c #C5C5C6",
-"gX c #D3D3D3",
-"hX c #D8D8D8",
-"jX c #D0D0CE",
-"kX c #C9D8F7",
-"lX c #D6D7E3",
-"zX c #D0DDFC",
-"xX c #C8E4FB",
-"cX c #DEE0E3",
-"vX c #DDFEFE",
-"bX c #D1EDFD",
-"nX c #E3DDD1",
-"mX c #E0DCE3",
-"MX c #E4E1DA",
-"NX c #F7ECCA",
-"BX c #FDFDCB",
-"VX c #FDFDC5",
-"CX c #FBF5DD",
-"ZX c #E1E2E1",
-"AX c #E6E7E8",
-"SX c #EEF0EE",
-"DX c #E9F3F8",
-"FX c #F4E9E4",
-"GX c #FBFBE8",
-"HX c #F4F4F2",
-"JX c #F6FAFB",
-"KX c #F8F5F0",
-"LX c #FCFAF4",
-"PX c #FDFDFD",
-"IX c #F1F7FE",
-"UX c #EBECF2",
-"YX c None",
-/* pixels */
-"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX  f O YXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXf F.+ YXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX+ F.d   YXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXf.M.X YXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXs I.d YXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXO x.G.k . YXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX  - j M z.(.Q.PXg YXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYXYXYX  # g M @XhXJXPXNX~.G.NXPX&X  YXYXYXYXYX",
-"YXYXYXYXYXYXYXYX  # h m %XSXPXPXPXPXPXJXW.~.U.<X8XPX- YXYXYXYXYX",
-"YXYXYX  . : x ].rXKXPXPXPXPXJXxX6X8X0XNX).T.3.T w.PXv YXYXYX    ",
-"YX> }.wXFXPXPXIXkX4X4X-Xy.e.6.~ 6.1XxXW.).k.Q Q ` JX$X  YX      ",
-"YXv PXxX1Xt.6.*.R E E T R R E t.<XbXdXQ.U.U E ! Y 7XLX@         ",
-"YX; PXs.#.@.$.$.$.$.$.$.@.$.%.$.;.<XyX).2.@.U G 4 F MX:     YXYX",
-"YX. FX2X%.>.<.%.%.<.<.<.>.>.,.1.,.9.OXg./ G B 4 3 < .X].  YXYXYX",
-"YX  &XvXa.i.p.>X>X,Xp.a.a.a.p.p.2. X+.t r 5 5 3 1 1 5.KX@ YXYXYX",
-"YXYXM PX3XcXKXLXKXrX{.XXr.u.| 0 e {.9 * 8 e q 8 7 * p PXg YXYXYX",
-"YXYXj SXmXJXLXHXZX$Xm l O.| [ 0 N n * t { ] 0 7 & $ = HX|.YXYXYX",
-"YXYX- lXSXLXJXZX$X|.v N O.[ 0 8 4.l o.{ i i u r y D / -XnX  YXYX",
-"YXYX. rXgXHXLXmX&XXX+XXXo.0 7  .c G Z A S V V _ zXzX) / PX; YXYX",
-"YXX h +X&XgXAXAXcXgX%X#X#XX.a d.y J P P J S H =XkXvXkX7.JXm YXYX",
-"  b jXAXlXcXhXjXtXrXrXgXlXlXOX( _ _ I I I Y *.<X6X2XxXL 5XrX  YX",
-"; gXPXFX!.G.G.E.H.S.G.T.yXKXJX.X_ 8.7.-.=.%.%.0.-X=XK C q.GX- YX",
-"g JXiXZ.B.V.B.N.v.N.N.C.B.A.nXjX0.i.-.-.*.^ Y I _ q.=XzXJXPXj YX",
-": SXA.v.V.C.K.D.D.D.K.J.C.B.yX3X0.e.e.q.=X3XkXDXPXLXMX@Xm h @ YX",
-"# gXpXD.K.^./.`.'.`./.I.K.`.sX.X=X9XUXJXPXKXMX&Xh.: o     YXYXYX",
-"  OXG.pXsXaXsXVXBXsXaXsXaX^.H.jXKXMX%X].v > @     YXYXYXYXYXYXYX",
-"YXn R.B.I.pXBXGXLXGXBX'.L.V.m.b : @       YXYXYXYXYXYXYXYXYXYXYX",
-"YX, uXc.b.D.).aXsXsX).A.c.n.j.  YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
-"YX  {.Q.n.b.v.B.C.C.V.Z.S.yX: YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
-"YXYX# }.qXU.T.(.^.(.T.Y.eXv   YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
-"YXYXYXX g m j.l.oX[.h.x #   YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYX    o @ @ @ X   YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX"
-};
diff --git a/redhat/applications/koffice/koffice-3.5.13-disable_graphicksmagick.patch b/redhat/applications/koffice/koffice-3.5.13-disable_graphicksmagick.patch
deleted file mode 100644
index 2ed8017e6..000000000
--- a/redhat/applications/koffice/koffice-3.5.13-disable_graphicksmagick.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- koffice/configure.in.in.ORI	2011-11-23 14:10:51.406182478 -0500
-+++ koffice/configure.in.in	2011-11-23 14:11:51.714475724 -0500
-@@ -20,7 +20,7 @@
- 
- if test -n "$GRAPHICS_MAGICK_CONFIG"; then
-  vers=`$GRAPHICS_MAGICK_CONFIG --version 2>/dev/null | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
--  if test -n "$vers" && test "$vers" -ge 1001007;  then
-+  if test -n "$vers" && test "$vers" -ge 1001007 && test "$vers" -lt 1002000;  then
-      LIBGMAGICK_LIBS="`$GRAPHICS_MAGICK_CONFIG --libs`"
-      LIBGMAGICK_LDFLAGS="`$GRAPHICS_MAGICK_CONFIG --ldflags`"
-      LIBGMAGICK_RPATH=
-@@ -36,7 +36,7 @@
-      AC_DEFINE(HAVE_GMAGICK,1, [GraphicsMagick is available])
-      have_graphicsmagick=yes
-   else
--     AC_MSG_WARN([You need at least GraphicsMagick 1.1.7])
-+     AC_MSG_WARN([You need at least GraphicsMagick 1.1.7, but less than 1.2.0])
-   fi
- 
- fi
diff --git a/redhat/applications/koffice/koffice-3.5.13-fix_lcms_detection.patch b/redhat/applications/koffice/koffice-3.5.13-fix_lcms_detection.patch
new file mode 100644
index 000000000..bf714ab8a
--- /dev/null
+++ b/redhat/applications/koffice/koffice-3.5.13-fix_lcms_detection.patch
@@ -0,0 +1,11 @@
+--- koffice/chalk/configure.in.in.ORI	2012-08-05 22:30:11.362533703 +0200
++++ koffice/chalk/configure.in.in	2012-08-05 22:30:31.456987824 +0200
+@@ -48,7 +48,7 @@
+ fi
+ 
+ 
+-ac_link='$LIBTOOL_SHELL --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries -ltqt conftest.$ac_ext -llcms 1>&5'
++ac_link='$LIBTOOL_SHELL --mode=link --tag=LD ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries -ltqt conftest.$ac_ext -llcms 1>&5'
+ 
+ if AC_TRY_EVAL(ac_link) && test -s conftest; then
+     	AC_MSG_RESULT(yes)
diff --git a/redhat/applications/koffice/koffice-3.5.13-fix_poppler_detect.patch b/redhat/applications/koffice/koffice-3.5.13-fix_poppler_detect.patch
deleted file mode 100644
index 2675ddd01..000000000
--- a/redhat/applications/koffice/koffice-3.5.13-fix_poppler_detect.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- koffice/filters/chalk/pdf/configure.in.in.ORI	2011-11-23 14:20:06.517677101 -0500
-+++ koffice/filters/chalk/pdf/configure.in.in	2011-11-23 14:20:14.461584005 -0500
-@@ -1,5 +1,5 @@
- # Compile the pdf import filter only if Poppler is available
--# PKG_CHECK_MODULES(POPPLER, poppler-qt >= 0.5.1, have_poppler=yes, have_poppler=no)
--have_poppler=yes
-+PKG_CHECK_MODULES(POPPLER, poppler-qt >= 0.5.1, have_poppler=yes, have_poppler=no)
-+#have_poppler=yes
- 
- AM_CONDITIONAL(include_PDF, test "x$have_poppler" = xyes) 
diff --git a/redhat/applications/koffice/koffice-3.5.13-missing_ldflags.patch b/redhat/applications/koffice/koffice-3.5.13-missing_ldflags.patch
new file mode 100644
index 000000000..e6c683dc9
--- /dev/null
+++ b/redhat/applications/koffice/koffice-3.5.13-missing_ldflags.patch
@@ -0,0 +1,61 @@
+--- koffice/lib/store/Makefile.am.ORI	2012-08-05 21:05:16.181010835 +0200
++++ koffice/lib/store/Makefile.am	2012-08-05 21:05:25.027837330 +0200
+@@ -7,7 +7,7 @@
+ 
+ ####### Files
+ 
+-libkstore_la_LIBADD = $(LIB_KIO)
++libkstore_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+ libkstore_la_SOURCES = KoStore.cpp KoTarStore.cpp KoDirectoryStore.cpp KoZipStore.cpp KoStoreDrag.cpp KoStoreBase.cpp KoXmlWriter.cpp
+ libkstore_la_LDFLAGS = $(all_libraries) -version-info 3:0:0 $(KDE_LDFLAGS) -no-undefined
+ include_HEADERS = KoStore.h KoStoreDevice.h KoXmlWriter.h
+--- koffice/lib/kwmf/Makefile.am.ORI	2012-08-05 21:09:16.183303850 +0200
++++ koffice/lib/kwmf/Makefile.am	2012-08-05 21:09:35.742920240 +0200
+@@ -3,7 +3,7 @@
+ INCLUDES= $(KOFFICECORE_INCLUDES) -I$(srcdir) $(all_includes)
+ libkwmf_la_LDFLAGS = $(all_libraries) -version-info 3:0:0 -no-undefined
+ # We use kdecore for kdDebug :)
+-libkwmf_la_LIBADD = $(LIB_KDECORE)
++libkwmf_la_LIBADD = $(LIB_KDECORE) $(LIB_QT)
+ 
+ ####### Files
+ 
+@@ -16,4 +16,4 @@
+ 
+ libkowmf_la_SOURCES  = kowmfreadprivate.cc kowmfstack.cc kowmfread.cc kowmfwrite.cc kowmfpaint.cc
+ libkowmf_la_LDFLAGS = $(all_libraries) -version-info 2:0:0  -no-undefined
+-libkowmf_la_LIBADD = $(LIB_KDECORE)
++libkowmf_la_LIBADD = $(LIB_KDECORE) $(LIB_QT)
+--- koffice/lib/kofficecore/Makefile.am.ORI	2012-08-05 21:12:34.924406087 +0200
++++ koffice/lib/kofficecore/Makefile.am	2012-08-05 21:12:47.700155525 +0200
+@@ -4,7 +4,7 @@
+ KDE_CXXFLAGS = $(USE_RTTI) $(WOVERLOADED_VIRTUAL)
+ INCLUDES= $(KSTORE_INCLUDES) $(KWMF_INCLUDES) $(all_includes)
+ libkofficecore_la_LIBADD  = $(LIB_KSTORE) $(LIB_KOWMF) $(LIB_KPARTS) \
+-	$(LIB_KDEPRINT) $(LIB_KABC) $(LIB_KWMF)
++	$(LIB_KDEPRINT) $(LIB_KABC) $(LIB_KWMF) -lDCOP
+ 
+ ####### Files
+ 
+--- koffice/lib/koproperty/Makefile.am.ORI	2012-08-05 21:16:10.320181691 +0200
++++ koffice/lib/koproperty/Makefile.am	2012-08-05 21:16:17.135048036 +0200
+@@ -2,7 +2,7 @@
+ 
+ lib_LTLIBRARIES =  libkoproperty.la
+ 
+-libkoproperty_la_LIBADD = $(LIB_KDEUI) ./editors/libkopropertyeditors.la
++libkoproperty_la_LIBADD = $(LIB_KDEUI) ./editors/libkopropertyeditors.la $(LIB_QT) $(LIB_KDECORE)
+ libkoproperty_la_LDFLAGS = -no-undefined $(all_libraries) -version-info 2:0:0
+ libkoproperty_la_SOURCES = property.cpp customproperty.cpp set.cpp editor.cpp \
+ 	editoritem.cpp factory.cpp widget.cpp
+--- koffice/kpresenter/Makefile.am.ORI	2012-08-05 21:41:53.120199863 +0200
++++ koffice/kpresenter/Makefile.am	2012-08-05 21:42:03.358832558 +0200
+@@ -72,7 +72,7 @@
+ if include_ARTS
+ ARTSKDE = -lartskde
+ endif
+-libkpresenterprivate_la_LIBADD = autoformEdit/libaf.la $(LIB_KOFFICEUI) $(LIB_KOTEXT) $(LIB_KOPAINTER) $(ARTSKDE)
++libkpresenterprivate_la_LIBADD = autoformEdit/libaf.la $(LIB_KOFFICEUI) $(LIB_KOTEXT) $(LIB_KOPAINTER) $(ARTSKDE) -lsoundserver_idl -lmcop
+ 
+ ## The part
+ kde_module_LTLIBRARIES = libkpresenterpart.la
diff --git a/redhat/applications/koffice/trinity-koffice-3.5.13.spec b/redhat/applications/koffice/trinity-koffice-3.5.13.spec
new file mode 100644
index 000000000..996f785d1
--- /dev/null
+++ b/redhat/applications/koffice/trinity-koffice-3.5.13.spec
@@ -0,0 +1,1080 @@
+# Default version for this component
+%define kdecomp koffice
+
+# 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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/kde
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_docdir}
+
+# Disable Kross support for RHEL <= 5 (python is too old)
+%if 0%{?fedora} > 0 || 0%{?rhel} >= 6
+%define with_kross 1
+%endif
+
+%if 0%{?fedora} >= 17
+%define with_ruby 0
+%else
+%define with_ruby 1
+%endif
+
+# Ruby 1.9 includes are located in strance directories ... (taken from ruby 1.9 spec file)
+%global	_normalized_cpu	%(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/;s/sparcv./sparc/;s/armv.*/arm/')
+
+
+Name:		trinity-%{kdecomp}
+Summary:        An integrated office suite
+Version:	1.6.3
+Release:	5%{?dist}%{?_variant}
+
+Group:          Applications/Productivity
+License:        GPLv2+
+
+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:	%{kdecomp}-3.5.13.tar.gz
+Source100:      koshell.png
+
+# [lib/kross/python/scripts/RestrictedPython/Utilities.py] Syntax error [Bug #679]
+Patch2:		koffice-3.5.13-kross_utilities_syntax.patch
+# [koffice/chalk] Fix GraphicksMagick 1.3 support [Bug #353]
+Patch3:		koffice-3.5.13-chalk_gmagick.patch
+# [koffice/kexi] Various patches for kexi, found on the web [Bug # 777]
+Patch5:		kexi-fix-possible-crash-in-buffered-mode-sqlite-2.patch
+Patch6:		kexi-hide_hourglass-1.1.3-2.patch
+Patch7:		kexi-fix-support-for-boolean-types-in-migration.patch
+Patch8:		kexi-mysql_migrate_long_text-1.1.3.patch
+Patch9:		kexi-fix-support-for-boolean-types.patch
+Patch10:	kexi-thoushand_objects_support-1.1.3-2.patch
+Patch11:	kexi-fp_expressions-1.1.3.patch
+# [koffice] Fix compilation with GCC 4.7 [Bug #958]
+Patch12:	koffice-3.5.13-fix_gcc47_compilation.patch
+# [koffice] Fix compilation with Ruby 1.9 [Bug #735]
+Patch13:	koffice-3.5.13-fix_ruby_1.9.patch 
+# [koffice] Fix compilation with libpng [Bug #603]
+Patch14:	koffice-3.5.13-fix_libpng.patch
+# [koffice] Fix FTBFS due to missing libraries [Bug #657] [Commit #5c69fcd3]
+#  Clean up lib paths in LDFLAGS - moved to LIBADD
+#  For KWord and and KPresenter added linking kspell2
+#  For KSpread added linking kutils
+Patch15:	koffice-3.5.13-fix_bug_657.patch
+# [koffice] Fix accidental conversions of binary files [Bug #1033] [Commit #dbe89307]
+Source1:	koffice-3.5.13-damaged_binary_files.tar.gz
+# [koffice] Missing LDFLAGS cause FTBFS on Mageia / Mandriva
+Patch16:	koffice-3.5.13-missing_ldflags.patch
+
+# BuildRequires: world-devel ;)
+BuildRequires:  trinity-tdelibs-devel
+BuildRequires:  trinity-tdegraphics-devel
+BuildRequires:  automake libtool
+BuildRequires:  freetype-devel
+BuildRequires:  fontconfig-devel
+BuildRequires:  libart_lgpl-devel
+BuildRequires:  libpng-devel
+BuildRequires:  libtiff-devel
+BuildRequires:  libjpeg-devel
+BuildRequires:  ImageMagick-devel
+BuildRequires:  bzip2-devel
+BuildRequires:  zlib-devel
+BuildRequires:  openssl-devel
+BuildRequires:  python-devel
+BuildRequires:  pcre-devel
+BuildRequires:  lcms-devel
+BuildRequires:  gettext-devel
+BuildRequires:  mysql-devel
+BuildRequires:  desktop-file-utils
+BuildRequires:  perl
+BuildRequires:  doxygen
+BuildRequires:  aspell-devel
+BuildRequires:  libxslt-devel
+BuildRequires:  OpenEXR-devel
+BuildRequires:  libexif-devel
+BuildRequires:  readline-devel
+%if 0%{?with_ruby}
+BuildRequires:  ruby ruby-devel >= 1.8.2
+%endif
+BuildRequires:  libpaper-devel
+BuildRequires:	libutempter-devel
+BuildRequires:	GraphicsMagick-devel >= 1.1.0
+
+#%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
+#BuildRequires:	poppler-qt-devel >= 0.1.2
+#%else
+#BuildRequires:	trinity-poppler-qt3-devel >= 0.1.2
+#%endif
+
+BuildRequires:	trinity-tdegraphics-libpoppler-tqt-devel
+
+# These libraries are either too old or too recent on distributions !
+# We always provide our versions with TDE...
+BuildRequires:	trinity-libwpd-devel
+
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}mesagl1-devel
+BuildRequires:	%{_lib}mesaglu1-devel
+BuildRequires:	%{_lib}xi-devel
+BuildRequires:  wv2-devel
+BuildRequires:  libpqxx-devel
+%else
+BuildRequires:  libGL-devel
+BuildRequires:	libGLU-devel
+BuildRequires:  libXi-devel
+BuildRequires:  trinity-wv2-devel
+BuildRequires:  trinity-libpqxx-devel
+%endif
+
+%description
+KOffice is an integrated office suite.
+
+%package suite
+Summary:        An integrated office suite
+Group:          Applications/Productivity
+Obsoletes:      %{name} <= %{version}-%{release}
+Obsoletes:      %{name}-i18n < 4:%{version}
+Requires:       %{name}-core = %{version}-%{release} 
+Requires:       %{name}-kword = %{version}-%{release} 
+Requires:       %{name}-kspread = %{version}-%{release} 
+Requires:       %{name}-kpresenter = %{version}-%{release}
+Requires:       %{name}-kivio = %{version}-%{release}
+Requires:       %{name}-karbon = %{version}-%{release}
+Requires:       %{name}-kugar = %{version}-%{release}
+Requires:       %{name}-kexi = %{version}-%{release}
+Requires:       %{name}-kexi-driver-mysql = %{version}-%{release}
+Requires:       %{name}-kexi-driver-pgsql = %{version}-%{release}
+Requires:       %{name}-kchart = %{version}-%{release}
+Requires:       %{name}-kformula = %{version}-%{release}
+Requires:       %{name}-filters = %{version}-%{release}
+Requires:       %{name}-kplato = %{version}-%{release}
+Requires:       %{name}-chalk = %{version}-%{release}
+
+%description suite
+KOffice is an integrated office suite.
+
+%package core
+Summary:        Core support files for %{name} 
+Group:          Applications/Productivity
+Requires:       %{name}-libs = %{version}-%{release}
+Requires:       perl
+Conflicts:      koffice-i18n < %{version}
+%description core
+%{summary}.
+
+%package libs
+Summary:        Runtime libraries for %{name} 
+Group:          System Environment/Libraries
+Conflicts:      %{name} <= %{version}-%{release}
+Requires:       trinity-kdelibs
+License:        LGPLv2+
+%description libs
+%{summary}.
+
+%package devel
+Summary:        Development files for %{name} 
+Group:          Development/Libraries
+Requires:       %{name}-libs = %{version}-%{release}
+License:        LGPLv2+
+%description devel
+%{summary}.
+
+%package kword
+Summary:	A frame-based word processor capable of professional standard documents
+Group:          Applications/Productivity
+Requires:       %{name}-core = %{version}-%{release}
+%description kword
+%{summary}.
+
+%package kspread
+Summary:        A powerful spreadsheet application
+Group:          Applications/Productivity
+Requires:       %{name}-core = %{version}-%{release}
+%description kspread
+%{summary}.
+
+%package kpresenter
+Summary:        A full-featured presentation program
+Group:          Applications/Productivity
+Requires:       %{name}-core = %{version}-%{release}
+%description kpresenter
+%{summary}.
+
+%package kivio
+Summary:        A flowcharting application
+Group:          Applications/Productivity
+Requires:       %{name}-core = %{version}-%{release}
+Obsoletes:      kivio < %{version}-%{release}
+%description kivio
+%{summary}.
+
+%package karbon
+Summary:        A vector drawing application
+Group:          Applications/Productivity
+Requires:       %{name}-core = %{version}-%{release}
+%description karbon
+%{summary}.
+
+%package kugar
+Summary:        A tool for generating business quality reports
+Group:          Applications/Productivity
+Requires:       %{name}-core = %{version}-%{release}
+%description kugar
+%{summary}.
+
+%package kexi
+Summary:        An integrated environment for managing data
+Group:          Applications/Productivity
+Requires:       %{name}-core = %{version}-%{release}
+%description kexi
+%{summary}.
+For additional database drivers take a look at %{name}-kexi-driver-*
+
+%package kexi-driver-mysql
+Summary:        Mysql-driver for kexi
+Group:          Applications/Productivity
+Requires:       %{name}-kexi = %{version}-%{release}
+%description kexi-driver-mysql
+%{summary}.
+
+%package kexi-driver-pgsql
+Summary:        Postgresql driver for kexi
+Group:          Applications/Productivity
+Requires:       %{name}-kexi = %{version}-%{release}
+%description kexi-driver-pgsql
+%{summary}.
+
+%package kchart
+Summary:        An integrated graph and chart drawing tool
+Group:          Applications/Productivity
+Requires:       %{name}-core = %{version}-%{release}
+%description kchart
+%{summary}.
+
+%package kformula
+Summary:        A powerful formula editor
+Group:          Applications/Productivity
+Requires:       %{name}-core = %{version}-%{release}
+Requires:       lyx-cmex10-fonts
+%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
+Requires:       dejavu-lgc-sans-fonts
+%else
+Requires:       dejavu-lgc-fonts 
+%endif
+%description kformula
+%{summary}.
+
+%package filters
+Summary:        Import and Export Filters for KOffice
+Group:          Applications/Productivity
+Requires:       %{name}-core = %{version}-%{release}
+%description filters
+%{summary}.
+
+%package kplato
+Summary:         An integrated project management and planning tool
+Group:           Applications/Productivity
+Requires:        %{name}-core = %{version}-%{release}
+%description kplato
+%{summary}.
+
+%package chalk
+Summary:		 pixel-based image manipulation program for the TDE Office Suite [Trinity]
+Group:           Applications/Productivity
+Requires:        %{name}-core = %{version}-%{release}
+Requires:        %{name}-chalk-data = %{version}-%{release}
+Requires:        %{name}-filters
+%description chalk
+Chalk is a painting and image editing application for KOffice. Chalk contains
+both ease-of-use and fun features like guided painting.
+
+This package is part of the TDE Office Suite.
+
+%package chalk-data
+Summary:		data files for Chalk painting program [Trinity]
+Group:           Applications/Productivity
+%description chalk-data
+This package contains architecture-independent data files for Chalk,
+the painting program shipped with the TDE Office Suite.
+
+See the chalk package for further information.
+
+This package is part of the TDE Office Suite.
+
+
+
+%prep
+%setup -q -n applications/%{kdecomp}
+%setup -q -n applications/%{kdecomp} -a 1
+
+#patch0 -p1
+#patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch5 -p0
+%patch6 -p0
+%patch7 -p0
+%patch8 -p0
+%patch9 -p0
+%patch10 -p0
+%patch11 -p0
+%patch12 -p1 -b .gcc47
+%if 0%{?fedora} >= 17
+%patch13 -p1 -b .ruby
+%patch14 -p1 -b .libpng
+%endif
+%patch15 -p1
+%patch16 -p1
+
+# use LGC variant instead
+%__sed -i.dejavu-lgc \
+  -e 's|DejaVu Sans|DejaVu LGC Sans|' \
+  -e 's|dejavu sans|dejavu lgc sans|' \
+  lib/kformula/{contextstyle,fontstyle,symboltable}.cc 
+
+# 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 || : ; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
+
+%configure \
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --includedir=%{tde_tdeincludedir} \
+  --disable-rpath --disable-dependency-tracking \
+  --enable-new-ldflags \
+  --disable-debug --disable-warnings \
+  --with-pic --enable-shared --disable-static \
+  --with-extra-libs=%{tde_libdir} \
+  --enable-final \
+  --with-extra-includes=%{tde_includedir}/tqt \
+  --enable-closure \
+  --disable-kexi-macros \
+  --with-pqxx-includes=%{tde_includedir} \
+  --with-pqxx-libraries=%{tde_libdir} \
+%if 0%{?with_kross} > 0
+  --enable-scripting \
+%else
+  --disable-scripting \
+%endif
+
+%__make %{?_smp_mflags}
+
+
+%install
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+[ ! -f %{buildroot}%{tde_datadir}/icons/hicolor/48x48/apps/koshell.png ] && \
+%__install -p -D -m644 %{SOURCE100} %{buildroot}%{tde_datadir}/icons/hicolor/48x48/apps/koshell.png
+
+# Replace absolute symlinks with relative ones
+pushd %{buildroot}%{tde_tdedocdir}/HTML
+for lang in *; do
+  if [ -d $lang ]; then
+    pushd $lang
+    for i in */*; do
+      [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../../common $i/common
+    done
+    popd
+  fi
+done
+popd
+
+desktop-file-install \
+  --dir=%{buildroot}%{tde_tdeappdir} \
+  --vendor="" \
+  --delete-original \
+  %{buildroot}%{tde_datadir}/applnk/Office/*.desktop
+
+## Hack-in NoDisplay=True (http://bugzilla.redhat.com/245061)
+## until http://bugzilla.redhat.com/245190 is fixed
+for desktop_file in %{buildroot}%{tde_datadir}/applnk/.hidden/*.desktop ; do
+  grep "^NoDisplay=" ${desktop_file} || \
+    echo "NoDisplay=True" >> ${desktop_file}
+done
+
+## unpackaged files
+# fonts
+rm -rfv %{buildroot}%{tde_datadir}/apps/kformula/fonts/
+# libtool archives
+rm -f %{buildroot}%{tde_libdir}/lib*.la
+# shouldn't these be in koffice-l10n? 
+rm -f %{buildroot}%{tde_datadir}/locale/pl/LC_MESSAGES/kexi_{add,delete}_column_gui_transl_pl.sh
+# -devel symlinks to nuke
+rm -f %{buildroot}%{tde_libdir}/lib*common.so
+rm -f %{buildroot}%{tde_libdir}/lib*filters.so
+rm -f %{buildroot}%{tde_libdir}/lib*private.so
+rm -f %{buildroot}%{tde_libdir}/libkarbon*.so
+rm -f %{buildroot}%{tde_libdir}/libkchart*.so
+rm -f %{buildroot}%{tde_libdir}/libkexi*.so
+rm -f %{buildroot}%{tde_libdir}/libkisexiv2.so
+rm -f %{buildroot}%{tde_libdir}/libkformdesigner.so
+rm -f %{buildroot}%{tde_libdir}/libkplato*.so
+rm -f %{buildroot}%{tde_libdir}/libkpresenter*.so
+rm -f %{buildroot}%{tde_libdir}/libkword*.so
+rm -f %{buildroot}%{tde_libdir}/libkross*.so
+rm -f %{buildroot}%{tde_libdir}/libkugar*.so
+
+
+%clean
+%__rm -rf %{buildroot}
+
+%post core
+touch --no-create %{tde_datadir}/icons/crystalsvg &> /dev/null || :
+touch --no-create %{tde_datadir}/icons/hicolor &> /dev/null || :
+touch --no-create %{tde_datadir}/icons/locolor &> /dev/null || :
+
+%postun core
+if [ $1 -eq 0 ]; then
+  gtk-update-icon-cache %{tde_datadir}/icons/crystalsvg &> /dev/null || :
+  gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || :
+  gtk-update-icon-cache %{tde_datadir}/icons/locolor &> /dev/null || :
+  update-desktop-database -q &> /dev/null ||:
+fi
+
+%posttrans core
+gtk-update-icon-cache %{tde_datadir}/icons/crystalsvg &> /dev/null || :
+gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || :
+gtk-update-icon-cache %{tde_datadir}/icons/locolor &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
+
+%post karbon
+/sbin/ldconfig || :
+
+%postun karbon
+/sbin/ldconfig || :
+
+%post kword
+/sbin/ldconfig || :
+
+%postun kword
+/sbin/ldconfig || :
+
+%posttrans kword
+update-desktop-database -q &> /dev/null ||:
+
+%post kpresenter
+/sbin/ldconfig || :
+
+%postun kpresenter
+/sbin/ldconfig || :
+
+%posttrans kpresenter
+update-desktop-database -q &> /dev/null ||:
+
+%post kugar
+/sbin/ldconfig || :
+
+%postun kugar
+/sbin/ldconfig || :
+
+%posttrans kugar
+update-desktop-database -q &> /dev/null ||:
+
+%post kexi
+/sbin/ldconfig || :
+
+%postun kexi
+/sbin/ldconfig || :
+
+%posttrans kexi
+update-desktop-database -q &> /dev/null ||:
+
+%post kchart
+/sbin/ldconfig || :
+
+%postun kchart
+/sbin/ldconfig || :
+
+%posttrans kchart
+update-desktop-database -q &> /dev/null ||:
+
+%post filters
+/sbin/ldconfig || :
+
+%postun filters
+/sbin/ldconfig || :
+
+%post libs
+/sbin/ldconfig || :
+
+%postun libs
+/sbin/ldconfig || :
+
+%post chalk
+/sbin/ldconfig || :
+
+%postun chalk
+/sbin/ldconfig || :
+
+%posttrans chalk
+update-desktop-database -q &> /dev/null ||:
+
+%files suite
+#empty => virtual package
+
+%files core
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING README
+%{tde_bindir}/koshell
+%{tde_bindir}/kthesaurus
+%{tde_bindir}/koconverter
+%{tde_libdir}/libkdeinit_koshell.so
+%{tde_libdir}/libkdeinit_kthesaurus.so
+%{tde_tdelibdir}/kfile_koffice.*
+%{tde_tdelibdir}/kfile_ooo.*
+%{tde_tdelibdir}/kfile_abiword.*
+%{tde_tdelibdir}/kfile_gnumeric.*
+%{tde_tdelibdir}/kodocinfopropspage.*
+%{tde_tdelibdir}/kofficescan.*
+%{tde_tdelibdir}/kofficethumbnail.*
+%{tde_tdelibdir}/koshell.*
+%{tde_tdelibdir}/kthesaurus.*
+%{tde_tdelibdir}/kwmailmerge_classic.*
+%{tde_tdelibdir}/kwmailmerge_kabc.*
+%{tde_tdelibdir}/kwmailmerge_qtsqldb_power.*
+%{tde_tdelibdir}/kwmailmerge_qtsqldb.*
+%{tde_tdelibdir}/libkounavailpart.*
+%{tde_tdelibdir}/libkprkword.*
+%{tde_tdelibdir}/libthesaurustool.*
+%{tde_tdelibdir}/clipartthumbnail.*
+%{tde_datadir}/apps/koffice/
+%{tde_datadir}/apps/konqueror/servicemenus/*
+%{tde_datadir}/apps/koshell/
+%{tde_datadir}/apps/thesaurus/
+%{tde_datadir}/config.kcfg/koshell.kcfg
+%{tde_tdedocdir}/HTML/en/koffice/
+%{tde_tdedocdir}/HTML/en/koshell/
+%{tde_tdedocdir}/HTML/en/thesaurus/
+%{tde_datadir}/icons/crystalsvg/*/*/*
+%{tde_datadir}/icons/hicolor/*/*/*
+%{tde_datadir}/icons/locolor/*/*/*
+%{tde_datadir}/services/clipartthumbnail.desktop
+%{tde_datadir}/services/kfile*.desktop
+%{tde_datadir}/services/kwmailmerge*.desktop
+%{tde_datadir}/services/kodocinfopropspage.desktop
+%{tde_datadir}/services/kofficethumbnail.desktop
+%{tde_datadir}/services/kounavail.desktop
+%{tde_datadir}/services/kprkword.desktop
+%{tde_datadir}/services/thesaurustool.desktop
+%{tde_datadir}/servicetypes/kochart.desktop
+%{tde_datadir}/servicetypes/kofficepart.desktop
+%{tde_datadir}/servicetypes/koplugin.desktop
+%{tde_datadir}/servicetypes/kwmailmerge.desktop
+%{tde_datadir}/servicetypes/widgetfactory.desktop
+%{tde_tdeappdir}/*koffice.desktop
+%{tde_tdeappdir}/*KThesaurus.desktop
+%{tde_tdeappdir}/*koshell.desktop
+%{tde_datadir}/apps/kofficewidgets/
+%if 0%{?with_kross} > 0
+%{tde_datadir}/apps/kross/
+%{tde_tdelibdir}/krosspython.*
+%if 0%{?with_ruby}
+%{tde_tdelibdir}/krossruby.*
+%endif
+%endif
+
+%files libs
+%defattr(-,root,root,-)
+%doc COPYING.LIB
+#_libdir/libk*common.so.*
+%{tde_libdir}/libkarboncommon.so.*
+%{tde_libdir}/libkspreadcommon.so.*
+%{tde_libdir}/libkdchart.so.*
+%{tde_libdir}/libkochart.so.*
+%{tde_libdir}/libkofficecore.so.*
+%{tde_libdir}/libkofficeui.so.*
+%{tde_libdir}/libkotext.so.*
+%{tde_libdir}/libkowmf.so.*
+%{tde_libdir}/libkopainter.so.*
+%{tde_libdir}/libkstore.so.*
+%{tde_libdir}/libkwmailmerge_interface.so.*
+%{tde_libdir}/libkwmf.so.*
+%{tde_libdir}/libkformulalib.so.*
+%{tde_libdir}/libkopalette.so.*
+%{tde_libdir}/libkoproperty.so.*
+%if 0%{?with_kross} > 0
+%{tde_libdir}/libkrossapi.so.*
+%{tde_libdir}/libkrossmain.so.*
+%endif
+
+%files devel
+%defattr(-,root,root,-)
+%lang(en) %{tde_tdedocdir}/HTML/en/koffice-apidocs/
+%{tde_includedir}/*
+# FIXME: include only shlib symlinks we know/want to export
+%{tde_libdir}/lib*.so
+%exclude %{tde_libdir}/libkdeinit_*.so
+%exclude %{tde_libdir}/libkudesignercore.so
+
+%files kword
+%defattr(-,root,root,-)
+%lang(en) %{tde_tdedocdir}/HTML/en/kword/
+%{tde_bindir}/kword
+%{tde_libdir}/libkdeinit_kword.so
+%{tde_libdir}/libkwordprivate.so.*
+%{tde_tdelibdir}/libkwordpart.*
+%{tde_tdelibdir}/kword.*
+%{tde_datadir}/apps/kword/
+%{tde_datadir}/services/kword*.desktop
+%{tde_datadir}/services/kwserial*.desktop
+%{tde_datadir}/templates/TextDocument.desktop
+%{tde_datadir}/templates/.source/TextDocument.kwt
+%{tde_tdeappdir}/*kword.desktop
+
+%files kspread
+%defattr(-,root,root,-)
+%lang(en) %{tde_tdedocdir}/HTML/en/kspread/
+%{tde_bindir}/kspread
+%{tde_libdir}/libkdeinit_kspread.so
+%{tde_tdelibdir}/kspread.*
+%{tde_tdelibdir}/libkspreadpart.*
+%{tde_tdelibdir}/kwmailmerge_kspread.*
+%{tde_tdelibdir}/libcsvexport.*
+%{tde_tdelibdir}/libcsvimport.*
+%{tde_tdelibdir}/libgnumericexport.*
+%{tde_tdelibdir}/libgnumericimport.*
+%{tde_tdelibdir}/libkspreadhtmlexport.*
+%{tde_tdelibdir}/libkspreadinsertcalendar.*
+%{tde_tdelibdir}/libopencalcexport.*
+%{tde_tdelibdir}/libopencalcimport.*
+%{tde_tdelibdir}/libqproimport.*
+%{tde_datadir}/apps/kspread/
+%{tde_datadir}/services/kspread*.desktop
+%{tde_datadir}/templates/SpreadSheet.desktop
+%{tde_datadir}/templates/.source/SpreadSheet.kst
+%{tde_tdeappdir}/*kspread.desktop
+%if 0%{?with_kross} > 0
+%{tde_tdelibdir}/kspreadscripting.*
+%{tde_tdelibdir}/krosskspreadcore.*
+%endif
+
+%files kpresenter
+%defattr(-,root,root,-)
+%lang(en) %{tde_tdedocdir}/HTML/en/kpresenter/
+%{tde_bindir}/kpresenter
+%{tde_bindir}/kprconverter.pl
+%{tde_libdir}/libkdeinit_kpresenter.so
+%{tde_libdir}/libkpresenterimageexport.so.*
+%{tde_libdir}/libkpresenterprivate.so.*
+%{tde_tdelibdir}/*kpresenter*.*
+%{tde_datadir}/apps/kpresenter/
+%{tde_datadir}/services/kpresenter*.desktop
+%{tde_datadir}/templates/Presentation.desktop
+%{tde_datadir}/templates/.source/Presentation.kpt
+%{tde_tdeappdir}/*kpresenter.desktop
+
+%files karbon
+%defattr(-,root,root,-)
+%lang(en) %{tde_tdedocdir}/HTML/en/karbon/
+%{tde_bindir}/karbon
+%{tde_libdir}/libkdeinit_karbon.so
+%{tde_tdelibdir}/*karbon*.*
+%{tde_tdelibdir}/libwmfexport.*
+%{tde_tdelibdir}/libwmfimport.*
+%{tde_datadir}/apps/karbon/
+%{tde_datadir}/services/karbon*
+%{tde_datadir}/servicetypes/karbon_module.desktop
+%{tde_datadir}/templates/Illustration.desktop
+%{tde_datadir}/templates/.source/Illustration.karbon
+%{tde_tdeappdir}/*karbon.desktop
+
+%files kugar
+%defattr(-,root,root,-)
+%lang(en) %{tde_tdedocdir}/HTML/en/kugar/
+%{tde_bindir}/kugar
+%{tde_bindir}/kudesigner
+%{tde_libdir}/libkdeinit_kugar.so
+%{tde_libdir}/libkdeinit_kudesigner.so
+%{tde_libdir}/libkugarlib.so.*
+%{tde_libdir}/libkudesignercore.so
+%{tde_tdelibdir}/kudesigner.*
+%{tde_tdelibdir}/kugar.*
+%{tde_tdelibdir}/libkudesignerpart.*
+%{tde_tdelibdir}/libkugarpart.*
+%{tde_datadir}/apps/kudesigner/
+%{tde_datadir}/apps/kugar/
+%{tde_datadir}/services/kugar*.desktop
+%{tde_tdeappdir}/*kugar.desktop
+%{tde_tdeappdir}/*kudesigner.desktop
+
+%files kexi
+%defattr(-,root,root,-)
+%lang(en) %{tde_tdedocdir}/HTML/en/kexi/
+%{tde_bindir}/kexi*
+%{tde_bindir}/ksqlite*
+%{tde_libdir}/libkdeinit_kexi.so
+%{tde_libdir}/libkexi*.so.*
+%{tde_libdir}/libkformdesigner.so.*
+%{tde_tdelibdir}/kformdesigner_*.*
+%{tde_tdelibdir}/kexidb_sqlite2driver.*
+%{tde_tdelibdir}/kexidb_sqlite3driver.*
+%{tde_tdelibdir}/kexihandler_*.*
+%{tde_tdelibdir}/kexi.*
+# moved here to workaround bug #394101, alternative is to move libkexi(db|dbparser|utils) to -libs)
+%{tde_tdelibdir}/libkspreadkexiimport.*
+%{tde_datadir}/config/kexirc
+%{tde_datadir}/config/magic/kexi.magic
+%{tde_datadir}/mimelnk/application/*
+%{tde_datadir}/servicetypes/kexi*.desktop
+%{tde_datadir}/services/kexi/
+%{tde_datadir}/apps/kexi/
+%{tde_datadir}/services/kformdesigner/*
+%{tde_tdeappdir}/*kexi.desktop
+%{tde_datadir}/services/kexidb_sqlite*driver.desktop
+%if 0%{?with_kross} > 0
+%{tde_bindir}/krossrunner
+%{tde_tdelibdir}/krosskexiapp.*
+%{tde_tdelibdir}/krosskexidb.*
+%endif
+
+%files kexi-driver-mysql
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/kexidb_mysqldriver.*
+%{tde_tdelibdir}/keximigrate_mysql.*
+%{tde_datadir}/services/keximigrate_mysql.desktop
+%{tde_datadir}/services/kexidb_mysqldriver.desktop
+
+%files kexi-driver-pgsql
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/kexidb_pqxxsqldriver.*
+%{tde_tdelibdir}/keximigrate_pqxx.*
+%{tde_datadir}/services/kexidb_pqxxsqldriver.desktop
+%{tde_datadir}/services/keximigrate_pqxx.desktop
+
+%files kchart
+%defattr(-,root,root,-)
+%lang(en) %{tde_tdedocdir}/HTML/en/kchart/
+%{tde_bindir}/kchart
+%{tde_libdir}/libkchart*.so.*
+%{tde_libdir}/libkdeinit_kchart.so
+%{tde_tdelibdir}/*kchart*.*
+%{tde_datadir}/apps/kchart/
+%{tde_datadir}/services/kchart*.desktop
+%{tde_tdeappdir}/*kchart.desktop
+
+%files kformula
+%defattr(-,root,root,-)
+%lang(en) %{tde_tdedocdir}/HTML/en/kformula/
+%{tde_bindir}/kformula
+%{tde_libdir}/libkdeinit_kformula.so
+%{tde_tdelibdir}/*kformula*.*
+%{tde_datadir}/apps/kformula/
+%{tde_datadir}/services/kformula*.desktop
+%{tde_tdeappdir}/*kformula.desktop
+
+%files kivio
+%defattr(-,root,root,-)
+%lang(en) %{tde_tdedocdir}/HTML/en/kivio/
+%{tde_bindir}/kivio
+%{tde_libdir}/libkdeinit_kivio.so
+%{tde_libdir}/libkiviocommon.so.*
+%{tde_tdelibdir}/*kivio*.*
+%{tde_tdelibdir}/straight_connector.*
+%{tde_datadir}/apps/kivio/
+%{tde_datadir}/config.kcfg/kivio.kcfg
+%{tde_datadir}/services/kivio*.desktop
+%{tde_tdeappdir}/*kivio.desktop
+
+%files filters
+%defattr(-,root,root,-)
+%{tde_libdir}/libkwordexportfilters.so.*
+%{tde_tdelibdir}/libabiwordexport.*
+%{tde_tdelibdir}/libabiwordimport.*
+%{tde_tdelibdir}/libamiproexport.*
+%{tde_tdelibdir}/libamiproimport.*
+%{tde_tdelibdir}/libapplixspreadimport.*
+%{tde_tdelibdir}/libapplixwordimport.*
+%{tde_tdelibdir}/libasciiexport.*
+%{tde_tdelibdir}/libasciiimport.*
+%{tde_tdelibdir}/libdbaseimport.*
+%{tde_tdelibdir}/libdocbookexport.*
+%{tde_tdelibdir}/libexcelimport.*
+%{tde_tdelibdir}/libgenerickofilter.*
+%{tde_tdelibdir}/libhtmlexport.*
+%{tde_tdelibdir}/libhtmlimport.*
+%{tde_tdelibdir}/libkarbonepsimport.*
+%{tde_tdelibdir}/libkfolatexexport.*
+%{tde_tdelibdir}/libkfomathmlexport.*
+%{tde_tdelibdir}/libkfomathmlimport.*
+%{tde_tdelibdir}/libkfopngexport.*
+%{tde_tdelibdir}/libkspreadlatexexport.*
+%{tde_tdelibdir}/libkugarnopimport.*
+%{tde_tdelibdir}/libkwordkword1dot3import.*
+%{tde_tdelibdir}/libkwordlatexexport.*
+%{tde_tdelibdir}/libmswriteexport.*
+%{tde_tdelibdir}/libmswriteimport.*
+%{tde_tdelibdir}/libooimpressexport.*
+%{tde_tdelibdir}/libooimpressimport.*
+%{tde_tdelibdir}/liboowriterexport.*
+%{tde_tdelibdir}/liboowriterimport.*
+%{tde_tdelibdir}/libpalmdocexport.*
+%{tde_tdelibdir}/libpalmdocimport.*
+%{tde_tdelibdir}/libpdfimport.*
+%{tde_tdelibdir}/librtfexport.*
+%{tde_tdelibdir}/librtfimport.*
+%{tde_tdelibdir}/libwmlexport.*
+%{tde_tdelibdir}/libwmlimport.*
+%{tde_tdelibdir}/libwpexport.*
+%{tde_tdelibdir}/libwpimport.*
+%{tde_tdelibdir}/libmswordimport.*
+%{tde_tdelibdir}/libxsltimport.*
+%{tde_tdelibdir}/libxsltexport.*
+%{tde_tdelibdir}/libhancomwordimport.*
+%{tde_tdelibdir}/libkfosvgexport.*
+%{tde_tdelibdir}/liboodrawimport.*
+%{tde_tdelibdir}/libolefilter.*
+%{tde_datadir}/apps/xsltfilter/
+%{tde_datadir}/services/generic_filter.desktop
+%{tde_datadir}/services/ole_powerpoint97_import.desktop
+%{tde_datadir}/services/xslt*.desktop
+%{tde_datadir}/servicetypes/kofilter*.desktop
+
+%files kplato
+%defattr(-,root,root,-)
+%lang(en) %{tde_tdedocdir}/HTML/en/kplato/
+%{tde_bindir}/kplato
+%{tde_libdir}/libkdeinit_kplato.so
+%{tde_tdelibdir}/kplato.*
+%{tde_tdelibdir}/libkplatopart.*
+%{tde_datadir}/apps/kplato/
+%{tde_datadir}/services/kplatopart.desktop
+%{tde_tdeappdir}/*kplato.desktop
+
+%files chalk
+%defattr(-,root,root,-)
+%{tde_bindir}/chalk
+%{tde_tdelibdir}/chalkblurfilter.la
+%{tde_tdelibdir}/chalkblurfilter.so
+%{tde_tdelibdir}/chalkbumpmap.la
+%{tde_tdelibdir}/chalkbumpmap.so
+%{tde_tdelibdir}/chalkcimg.la
+%{tde_tdelibdir}/chalkcimg.so
+%{tde_tdelibdir}/chalk_cmyk_*
+%{tde_tdelibdir}/chalkcmykplugin.la
+%{tde_tdelibdir}/chalkcmykplugin.so
+%{tde_tdelibdir}/chalkcolorify.la
+%{tde_tdelibdir}/chalkcolorify.so
+%{tde_tdelibdir}/chalkcolorrange.la
+%{tde_tdelibdir}/chalkcolorrange.so
+%{tde_tdelibdir}/chalkcolorsfilters.la
+%{tde_tdelibdir}/chalkcolorsfilters.so
+%{tde_tdelibdir}/chalkcolorspaceconversion.la
+%{tde_tdelibdir}/chalkcolorspaceconversion.so
+%{tde_tdelibdir}/chalkconvolutionfilters.la
+%{tde_tdelibdir}/chalkconvolutionfilters.so
+%{tde_tdelibdir}/chalkdefaultpaintops.la
+%{tde_tdelibdir}/chalkdefaultpaintops.so
+%{tde_tdelibdir}/chalkdefaulttools.la
+%{tde_tdelibdir}/chalkdefaulttools.so
+%{tde_tdelibdir}/chalkdropshadow.la
+%{tde_tdelibdir}/chalkdropshadow.so
+%{tde_tdelibdir}/chalkembossfilter.la
+%{tde_tdelibdir}/chalkembossfilter.so
+%{tde_tdelibdir}/chalkexample.la
+%{tde_tdelibdir}/chalkexample.so
+%{tde_tdelibdir}/chalkextensioncolorsfilters.la
+%{tde_tdelibdir}/chalkextensioncolorsfilters.so
+%{tde_tdelibdir}/chalkfastcolortransfer.la
+%{tde_tdelibdir}/chalkfastcolortransfer.so
+%{tde_tdelibdir}/chalkfiltersgallery.la
+%{tde_tdelibdir}/chalkfiltersgallery.so
+%{tde_tdelibdir}/chalk_gray_*
+%{tde_tdelibdir}/chalkgrayplugin.la
+%{tde_tdelibdir}/chalkgrayplugin.so
+%{tde_tdelibdir}/chalkhistogramdocker.la
+%{tde_tdelibdir}/chalkhistogramdocker.so
+%{tde_tdelibdir}/chalkhistogram.la
+%{tde_tdelibdir}/chalkhistogram.so
+%{tde_tdelibdir}/chalkimageenhancement.la
+%{tde_tdelibdir}/chalkimageenhancement.so
+%{tde_tdelibdir}/chalkimagesize.la
+%{tde_tdelibdir}/chalkimagesize.so
+%{tde_tdelibdir}/chalk.la
+%{tde_tdelibdir}/chalklenscorrectionfilter.la
+%{tde_tdelibdir}/chalklenscorrectionfilter.so
+%{tde_tdelibdir}/chalklevelfilter.la
+%{tde_tdelibdir}/chalklevelfilter.so
+%{tde_tdelibdir}/chalk_lms_*
+%{tde_tdelibdir}/chalkmodifyselection.la
+%{tde_tdelibdir}/chalkmodifyselection.so
+%{tde_tdelibdir}/chalknoisefilter.la
+%{tde_tdelibdir}/chalknoisefilter.so
+%{tde_tdelibdir}/chalkoilpaintfilter.la
+%{tde_tdelibdir}/chalkoilpaintfilter.so
+%{tde_tdelibdir}/chalkpixelizefilter.la
+%{tde_tdelibdir}/chalkpixelizefilter.so
+%{tde_tdelibdir}/chalkraindropsfilter.la
+%{tde_tdelibdir}/chalkraindropsfilter.so
+%{tde_tdelibdir}/chalkrandompickfilter.la
+%{tde_tdelibdir}/chalkrandompickfilter.so
+%{tde_tdelibdir}/chalk_rgb_*
+%{tde_tdelibdir}/chalkrgbplugin.la
+%{tde_tdelibdir}/chalkrgbplugin.so
+%{tde_tdelibdir}/chalkrotateimage.la
+%{tde_tdelibdir}/chalkrotateimage.so
+%{tde_tdelibdir}/chalkroundcornersfilter.la
+%{tde_tdelibdir}/chalkroundcornersfilter.so
+%{tde_tdelibdir}/chalkselectiontools.la
+%{tde_tdelibdir}/chalkselectiontools.so
+%{tde_tdelibdir}/chalkselectopaque.la
+%{tde_tdelibdir}/chalkselectopaque.so
+%{tde_tdelibdir}/chalkseparatechannels.la
+%{tde_tdelibdir}/chalkseparatechannels.so
+%{tde_tdelibdir}/chalkshearimage.la
+%{tde_tdelibdir}/chalkshearimage.so
+%{tde_tdelibdir}/chalksmalltilesfilter.la
+%{tde_tdelibdir}/chalksmalltilesfilter.so
+%{tde_tdelibdir}/chalk.so
+%{tde_tdelibdir}/chalkscreenshot.la
+%{tde_tdelibdir}/chalkscreenshot.so
+%{tde_tdelibdir}/chalksobelfilter.la
+%{tde_tdelibdir}/chalksobelfilter.so
+%{tde_tdelibdir}/chalksubstrate.la
+%{tde_tdelibdir}/chalksubstrate.so
+%{tde_tdelibdir}/chalktoolcrop.la
+%{tde_tdelibdir}/chalktoolcrop.so
+%{tde_tdelibdir}/chalktoolcurves.la
+%{tde_tdelibdir}/chalktoolcurves.so
+%{tde_tdelibdir}/chalktoolfilter.la
+%{tde_tdelibdir}/chalktoolfilter.so
+%{tde_tdelibdir}/chalktoolperspectivegrid.la
+%{tde_tdelibdir}/chalktoolperspectivegrid.so
+%{tde_tdelibdir}/chalktoolperspectivetransform.la
+%{tde_tdelibdir}/chalktoolperspectivetransform.so
+%{tde_tdelibdir}/chalktoolpolygon.la
+%{tde_tdelibdir}/chalktoolpolygon.so
+%{tde_tdelibdir}/chalktoolpolyline.la
+%{tde_tdelibdir}/chalktoolpolyline.so
+%{tde_tdelibdir}/chalktoolselectsimilar.la
+%{tde_tdelibdir}/chalktoolselectsimilar.so
+%{tde_tdelibdir}/chalktoolstar.la
+%{tde_tdelibdir}/chalktoolstar.so
+%{tde_tdelibdir}/chalktooltransform.la
+%{tde_tdelibdir}/chalktooltransform.so
+%{tde_tdelibdir}/chalkunsharpfilter.la
+%{tde_tdelibdir}/chalkunsharpfilter.so
+%{tde_tdelibdir}/chalkwavefilter.la
+%{tde_tdelibdir}/chalkwavefilter.so
+%{tde_tdelibdir}/chalkwetplugin.la
+%{tde_tdelibdir}/chalkwetplugin.so
+%{tde_tdelibdir}/chalk_ycbcr_*
+%{tde_tdelibdir}/libchalkgmagickexport.la
+%{tde_tdelibdir}/libchalkgmagickexport.so
+%{tde_tdelibdir}/libchalkgmagickimport.la
+%{tde_tdelibdir}/libchalkgmagickimport.so
+%{tde_tdelibdir}/libchalkjpegexport.la
+%{tde_tdelibdir}/libchalkjpegexport.so
+%{tde_tdelibdir}/libchalkjpegimport.la
+%{tde_tdelibdir}/libchalkjpegimport.so
+%{tde_tdelibdir}/libchalk_openexr_export.la
+%{tde_tdelibdir}/libchalk_openexr_export.so
+%{tde_tdelibdir}/libchalk_openexr_import.la
+%{tde_tdelibdir}/libchalk_openexr_import.so
+%{tde_tdelibdir}/libchalkpart.la
+%{tde_tdelibdir}/libchalkpart.so
+%{tde_tdelibdir}/libchalkpdfimport.la
+%{tde_tdelibdir}/libchalkpdfimport.so
+%{tde_tdelibdir}/libchalkpngexport.la
+%{tde_tdelibdir}/libchalkpngexport.so
+%{tde_tdelibdir}/libchalkpngimport.la
+%{tde_tdelibdir}/libchalkpngimport.so
+%{tde_tdelibdir}/libchalk_raw_import.la
+%{tde_tdelibdir}/libchalk_raw_import.so
+%{tde_tdelibdir}/libchalktiffexport.la
+%{tde_tdelibdir}/libchalktiffexport.so
+%{tde_tdelibdir}/libchalktiffimport.la
+%{tde_tdelibdir}/libchalktiffimport.so
+%{tde_libdir}/libkdeinit_chalk.so
+%{tde_libdir}/libchalk_cmyk_*.so.*
+%{tde_libdir}/libchalkcolor.so.*
+%{tde_libdir}/libchalkcommon.so.*
+%{tde_libdir}/libchalkgrayscale.so.*
+%{tde_libdir}/libchalk_gray_*.so.*
+%{tde_libdir}/libchalkimage.so.*
+%{tde_libdir}/libchalk_lms_*.so.*
+%{tde_libdir}/libchalk_rgb_*.so.*
+%{tde_libdir}/libchalkrgb.so.*
+%{tde_libdir}/libchalkui.so.*
+%{tde_libdir}/libchalk_ycbcr_*.so.*
+%if 0%{?with_kross} > 0
+%{tde_tdelibdir}/krosschalkcore.la
+%{tde_tdelibdir}/krosschalkcore.so
+%{tde_tdelibdir}/chalkscripting.la
+%{tde_tdelibdir}/chalkscripting.so
+%{tde_libdir}/libchalkscripting.so.*
+%endif
+
+%files chalk-data
+%{tde_tdeappdir}/chalk.desktop
+%{tde_datadir}/applnk/.hidden/chalk_*.desktop
+%{tde_datadir}/apps/konqueror/servicemenus/chalk_konqi.desktop
+%{tde_datadir}/apps/chalk
+%{tde_datadir}/apps/chalkplugins
+%lang(en) %{tde_tdedocdir}/HTML/en/chalk
+%{tde_datadir}/icons/hicolor/*/apps/chalk.png
+%{tde_datadir}/services/chalk*.desktop
+%{tde_datadir}/servicetypes/chalk*.desktop
+
+
+%changelog
+* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.3-5
+- Fix kformula dependancies (for RHEL6)
+- Fix FTBFS due to missing libraries [Bug #657] [Commit #5c69fcd3]
+  Clean up lib paths in LDFLAGS - moved to LIBADD
+  For KWord and and KPresenter added linking kspell2
+  For KSpread added linking kutils
+- Fix accidental conversions of binary files [Bug #1033] [Commit #dbe89307]
+
+* Thu Apr 26 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.3-4
+- Updates BuildRequires
+- Build for Fedora 17
+- Fix compilation with GCC 4.7 [Bug #958]
+- Fix compilation with Ruby 1.9 [Bug #735]
+- Fix compilation with libpng [Bug #603]
+
+* Sat Jan 07 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.3-3
+- Fix GraphicksMagick 1.3 support [Bug #353]
+- Various patches for kexi [Bug #777]
+
+* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 1.6.3-2
+- Fix HTML directory location
+
+* Tue Nov 22 2011 Francois Andriot <francois.andriot@free.fr> - 1.6.3-1
+- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Based on Spec file from Fedora 11 'koffice-2:1.6.3-25.20090306svn'
+- Removed 'krita', added 'chalk'
diff --git a/redhat/applications/koffice/trinity-koffice.spec b/redhat/applications/koffice/trinity-koffice.spec
deleted file mode 100644
index b89c1251f..000000000
--- a/redhat/applications/koffice/trinity-koffice.spec
+++ /dev/null
@@ -1,1033 +0,0 @@
-# Default version for this component
-%define kdecomp koffice
-%define version 1.6.3
-%define release 5
-
-# 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 %{_datadir}/doc
-%endif
-
-# TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_appdir %{_datadir}/applications/kde
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
-
-# Disable Kross support for RHEL <= 5 (python is too old)
-%if 0%{?fedora} > 0 || 0%{?rhel} >= 6
-%define with_kross 1
-%endif
-
-%if 0%{?fedora} >= 17
-%define with_ruby 0
-%else
-%define with_ruby 1
-%endif
-
-# Ruby 1.9 includes are located in strance directories ... (taken from ruby 1.9 spec file)
-%global	_normalized_cpu	%(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/;s/sparcv./sparc/;s/armv.*/arm/')
-
-
-Name:		trinity-%{kdecomp}
-Summary:        An integrated office suite
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
-
-Group:          Applications/Productivity
-License:        GPLv2+
-
-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:	%{kdecomp}-3.5.13.tar.gz
-Source100:      koshell.png
-
-# [koffice] Disable GraphicksMagick version >= 1.2.0 [Bug #353]
-Patch0:		koffice-3.5.13-disable_graphicksmagick.patch
-# [filters/chalk/pdf] Fix poppler-qt detection [Bug #783]
-Patch1:		koffice-3.5.13-fix_poppler_detect.patch
-# [lib/kross/python/scripts/RestrictedPython/Utilities.py] Syntax error [Bug #679]
-Patch2:		koffice-3.5.13-kross_utilities_syntax.patch
-# [koffice/chalk] Fix GraphicksMagick 1.3 support [Bug #353]
-Patch3:		koffice-3.5.13-chalk_gmagick.patch
-# [koffice/kexi] Various patches for kexi, found on the web [Bug # 777]
-Patch5:		kexi-fix-possible-crash-in-buffered-mode-sqlite-2.patch
-Patch6:		kexi-hide_hourglass-1.1.3-2.patch
-Patch7:		kexi-fix-support-for-boolean-types-in-migration.patch
-Patch8:		kexi-mysql_migrate_long_text-1.1.3.patch
-Patch9:		kexi-fix-support-for-boolean-types.patch
-Patch10:	kexi-thoushand_objects_support-1.1.3-2.patch
-Patch11:	kexi-fp_expressions-1.1.3.patch
-# [koffice] Fix compilation with GCC 4.7 [Bug #958]
-Patch12:	koffice-3.5.13-fix_gcc47_compilation.patch
-# [koffice] Fix compilation with Ruby 1.9 [Bug #735]
-Patch13:	koffice-3.5.13-fix_ruby_1.9.patch 
-# [koffice] Fix compilation with libpng [Bug #603]
-Patch14:	koffice-3.5.13-fix_libpng.patch
-# [koffice] Fix FTBFS due to missing libraries [Bug #657] [Commit #5c69fcd3]
-#  Clean up lib paths in LDFLAGS - moved to LIBADD
-#  For KWord and and KPresenter added linking kspell2
-#  For KSpread added linking kutils
-Patch15:	koffice-3.5.13-fix_bug_657.patch
-# [koffice] Fix accidental conversions of binary files [Bug #1033] [Commit #dbe89307]
-Source1:	koffice-3.5.13-damaged_binary_files.tar.gz
-
-
-# BuildRequires: world-devel ;)
-BuildRequires:  trinity-kdelibs-devel
-BuildRequires:  trinity-kdegraphics-devel
-BuildRequires:  automake libtool
-BuildRequires:  freetype-devel
-BuildRequires:  fontconfig-devel
-BuildRequires:  libart_lgpl-devel
-BuildRequires:  libpng-devel
-BuildRequires:  libtiff-devel
-BuildRequires:  libjpeg-devel
-BuildRequires:  ImageMagick-devel
-BuildRequires:  bzip2-devel
-BuildRequires:  zlib-devel
-BuildRequires:  openssl-devel
-BuildRequires:  python-devel
-BuildRequires:  pcre-devel
-BuildRequires:  lcms-devel
-BuildRequires:  gettext-devel
-BuildRequires:  mysql-devel
-BuildRequires:  desktop-file-utils
-BuildRequires:  perl
-BuildRequires:  doxygen
-BuildRequires:  aspell-devel
-BuildRequires:  libxslt-devel
-BuildRequires:  OpenEXR-devel
-BuildRequires:  libexif-devel
-BuildRequires:  libGL-devel libGLU-devel
-BuildRequires:  readline-devel
-%if 0%{?with_ruby}
-BuildRequires:  ruby ruby-devel >= 1.8.2
-%endif
-BuildRequires:  libpaper-devel
-BuildRequires:  libXi-devel
-BuildRequires:	libutempter-devel
-BuildRequires:	GraphicsMagick-devel >= 1.1.0
-
-BuildRequires:  trinity-wv2-devel
-BuildRequires:	trinity-libwpd-devel
-BuildRequires:  trinity-libpqxx-devel
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
-BuildRequires:	poppler-qt-devel >= 0.1.2
-%else
-BuildRequires:	trinity-poppler-qt3-devel >= 0.1.2
-%endif
-
-%description
-KOffice is an integrated office suite.
-
-%package suite
-Summary:        An integrated office suite
-Group:          Applications/Productivity
-Obsoletes:      %{name} <= %{version}-%{release}
-Obsoletes:      %{name}-i18n < 4:%{version}
-Requires:       %{name}-core = %{version}-%{release} 
-Requires:       %{name}-kword = %{version}-%{release} 
-Requires:       %{name}-kspread = %{version}-%{release} 
-Requires:       %{name}-kpresenter = %{version}-%{release}
-Requires:       %{name}-kivio = %{version}-%{release}
-Requires:       %{name}-karbon = %{version}-%{release}
-Requires:       %{name}-kugar = %{version}-%{release}
-Requires:       %{name}-kexi = %{version}-%{release}
-Requires:       %{name}-kexi-driver-mysql = %{version}-%{release}
-Requires:       %{name}-kexi-driver-pgsql = %{version}-%{release}
-Requires:       %{name}-kchart = %{version}-%{release}
-Requires:       %{name}-kformula = %{version}-%{release}
-Requires:       %{name}-filters = %{version}-%{release}
-Requires:       %{name}-kplato = %{version}-%{release}
-Requires:       %{name}-chalk = %{version}-%{release}
-
-%description suite
-KOffice is an integrated office suite.
-
-%package core
-Summary:        Core support files for %{name} 
-Group:          Applications/Productivity
-Requires:       %{name}-libs = %{version}-%{release}
-Requires:       perl
-Conflicts:      koffice-i18n < %{version}
-%description core
-%{summary}.
-
-%package libs
-Summary:        Runtime libraries for %{name} 
-Group:          System Environment/Libraries
-Conflicts:      %{name} <= %{version}-%{release}
-Requires:       trinity-kdelibs
-License:        LGPLv2+
-%description libs
-%{summary}.
-
-%package devel
-Summary:        Development files for %{name} 
-Group:          Development/Libraries
-Requires:       %{name}-libs = %{version}-%{release}
-License:        LGPLv2+
-%description devel
-%{summary}.
-
-%package kword
-Summary:	A frame-based word processor capable of professional standard documents
-Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
-%description kword
-%{summary}.
-
-%package kspread
-Summary:        A powerful spreadsheet application
-Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
-%description kspread
-%{summary}.
-
-%package kpresenter
-Summary:        A full-featured presentation program
-Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
-%description kpresenter
-%{summary}.
-
-%package kivio
-Summary:        A flowcharting application
-Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
-Obsoletes:      kivio < %{version}-%{release}
-%description kivio
-%{summary}.
-
-%package karbon
-Summary:        A vector drawing application
-Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
-%description karbon
-%{summary}.
-
-%package kugar
-Summary:        A tool for generating business quality reports
-Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
-%description kugar
-%{summary}.
-
-%package kexi
-Summary:        An integrated environment for managing data
-Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
-%description kexi
-%{summary}.
-For additional database drivers take a look at %{name}-kexi-driver-*
-
-%package kexi-driver-mysql
-Summary:        Mysql-driver for kexi
-Group:          Applications/Productivity
-Requires:       %{name}-kexi = %{version}-%{release}
-%description kexi-driver-mysql
-%{summary}.
-
-%package kexi-driver-pgsql
-Summary:        Postgresql driver for kexi
-Group:          Applications/Productivity
-Requires:       %{name}-kexi = %{version}-%{release}
-%description kexi-driver-pgsql
-%{summary}.
-
-%package kchart
-Summary:        An integrated graph and chart drawing tool
-Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
-%description kchart
-%{summary}.
-
-%package kformula
-Summary:        A powerful formula editor
-Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
-Requires:       lyx-cmex10-fonts
-%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
-Requires:       dejavu-lgc-sans-fonts
-%else
-Requires:       dejavu-lgc-fonts 
-%endif
-%description kformula
-%{summary}.
-
-%package filters
-Summary:        Import and Export Filters for KOffice
-Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
-%description filters
-%{summary}.
-
-%package kplato
-Summary:         An integrated project management and planning tool
-Group:           Applications/Productivity
-Requires:        %{name}-core = %{version}-%{release}
-%description kplato
-%{summary}.
-
-%package chalk
-Summary:		 pixel-based image manipulation program for the TDE Office Suite [Trinity]
-Group:           Applications/Productivity
-Requires:        %{name}-core = %{version}-%{release}
-Requires:        %{name}-chalk-data = %{version}-%{release}
-Requires:        %{name}-filters
-%description chalk
-Chalk is a painting and image editing application for KOffice. Chalk contains
-both ease-of-use and fun features like guided painting.
-
-This package is part of the TDE Office Suite.
-
-%package chalk-data
-Summary:		data files for Chalk painting program [Trinity]
-Group:           Applications/Productivity
-%description chalk-data
-This package contains architecture-independent data files for Chalk,
-the painting program shipped with the TDE Office Suite.
-
-See the chalk package for further information.
-
-This package is part of the TDE Office Suite.
-
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%setup -q -n applications/%{kdecomp} -a 1
-
-#patch0 -p1
-#patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch5 -p0
-%patch6 -p0
-%patch7 -p0
-%patch8 -p0
-%patch9 -p0
-%patch10 -p0
-%patch11 -p0
-%patch12 -p1 -b .gcc47
-%if 0%{?fedora} >= 17
-%patch13 -p1 -b .ruby
-%patch14 -p1 -b .libpng
-%endif
-%patch15 -p1
-
-# use LGC variant instead
-%__sed -i.dejavu-lgc \
-  -e 's|DejaVu Sans|DejaVu LGC Sans|' \
-  -e 's|dejavu sans|dejavu lgc sans|' \
-  lib/kformula/{contextstyle,fontstyle,symboltable}.cc 
-
-# 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|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/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 || : ; . /etc/profile.d/qt.sh
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
-
-%configure \
-  --disable-rpath --disable-dependency-tracking \
-  --enable-new-ldflags \
-  --disable-debug --disable-warnings \
-  --with-pic --enable-shared --disable-static \
-  --with-extra-libs=%{_libdir} \
-  --enable-final \
-  --with-extra-includes=%{_includedir}/tqt \
-  --enable-closure \
-  --disable-kexi-macros \
-  --with-pqxx-includes=%{_includedir} \
-  --with-pqxx-libraries=%{_libdir} \
-%if 0%{?with_kross} > 0
-  --enable-scripting \
-%else
-  --disable-scripting \
-%endif
-
-%__make %{?_smp_mflags}
-
-
-%install
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-[ ! -f %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/koshell.png ] && \
-%__install -p -D -m644 %{SOURCE100} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/koshell.png
-
-# Replace absolute symlinks with relative ones
-pushd %{buildroot}%{tde_docdir}/HTML
-for lang in *; do
-  if [ -d $lang ]; then
-    pushd $lang
-    for i in */*; do
-      [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../../common $i/common
-    done
-    popd
-  fi
-done
-popd
-
-desktop-file-install \
-  --dir=%{buildroot}%{tde_appdir} \
-  --vendor="" \
-  --delete-original \
-  %{buildroot}%{_datadir}/applnk/Office/*.desktop
-
-## Hack-in NoDisplay=True (http://bugzilla.redhat.com/245061)
-## until http://bugzilla.redhat.com/245190 is fixed
-for desktop_file in %{buildroot}%{_datadir}/applnk/.hidden/*.desktop ; do
-  grep "^NoDisplay=" ${desktop_file} || \
-    echo "NoDisplay=True" >> ${desktop_file}
-done
-
-## unpackaged files
-# fonts
-rm -rfv %{buildroot}%{_datadir}/apps/kformula/fonts/
-# libtool archives
-rm -f %{buildroot}%{_libdir}/lib*.la
-# shouldn't these be in koffice-l10n? 
-rm -f %{buildroot}%{_datadir}/locale/pl/LC_MESSAGES/kexi_{add,delete}_column_gui_transl_pl.sh
-# -devel symlinks to nuke
-rm -f %{buildroot}%{_libdir}/lib*common.so
-rm -f %{buildroot}%{_libdir}/lib*filters.so
-rm -f %{buildroot}%{_libdir}/lib*private.so
-rm -f %{buildroot}%{_libdir}/libkarbon*.so
-rm -f %{buildroot}%{_libdir}/libkchart*.so
-rm -f %{buildroot}%{_libdir}/libkexi*.so
-rm -f %{buildroot}%{_libdir}/libkisexiv2.so
-rm -f %{buildroot}%{_libdir}/libkformdesigner.so
-rm -f %{buildroot}%{_libdir}/libkplato*.so
-rm -f %{buildroot}%{_libdir}/libkpresenter*.so
-rm -f %{buildroot}%{_libdir}/libkword*.so
-rm -f %{buildroot}%{_libdir}/libkross*.so
-rm -f %{buildroot}%{_libdir}/libkugar*.so
-
-
-%clean
-%__rm -rf %{buildroot}
-
-%post core
-touch --no-create %{_datadir}/icons/crystalsvg &> /dev/null || :
-touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
-touch --no-create %{_datadir}/icons/locolor &> /dev/null || :
-
-%postun core
-if [ $1 -eq 0 ]; then
-  gtk-update-icon-cache %{_datadir}/icons/crystalsvg &> /dev/null || :
-  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
-  gtk-update-icon-cache %{_datadir}/icons/locolor &> /dev/null || :
-  update-desktop-database -q &> /dev/null ||:
-fi
-
-%posttrans core
-gtk-update-icon-cache %{_datadir}/icons/crystalsvg &> /dev/null || :
-gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
-gtk-update-icon-cache %{_datadir}/icons/locolor &> /dev/null || :
-update-desktop-database -q &> /dev/null ||:
-
-%post karbon -p /sbin/ldconfig
-
-%postun karbon -p /sbin/ldconfig
-
-%post kword -p /sbin/ldconfig
-
-%postun kword -p /sbin/ldconfig
-
-%posttrans kword
-update-desktop-database -q &> /dev/null ||:
-
-%post kpresenter -p /sbin/ldconfig
-
-%postun kpresenter -p /sbin/ldconfig
-
-%posttrans kpresenter
-update-desktop-database -q &> /dev/null ||:
-
-%post kugar -p /sbin/ldconfig
-
-%postun kugar -p /sbin/ldconfig
-
-%posttrans kugar
-update-desktop-database -q &> /dev/null ||:
-
-%post kexi -p /sbin/ldconfig
-
-%postun kexi -p /sbin/ldconfig
-
-%posttrans kexi
-update-desktop-database -q &> /dev/null ||:
-
-%post kchart -p /sbin/ldconfig
-
-%postun kchart -p /sbin/ldconfig
-
-%posttrans kchart
-update-desktop-database -q &> /dev/null ||:
-
-%post filters -p /sbin/ldconfig
-%postun filters -p /sbin/ldconfig 
-
-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
-
-%post chalk -p /sbin/ldconfig
-
-%postun chalk -p /sbin/ldconfig
-
-%posttrans chalk
-update-desktop-database -q &> /dev/null ||:
-
-%files suite
-#empty => virtual package
-
-%files core
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING README
-%{_bindir}/koshell
-%{_bindir}/kthesaurus
-%{_bindir}/koconverter
-%{_libdir}/libkdeinit_koshell.so
-%{_libdir}/libkdeinit_kthesaurus.so
-%{tde_libdir}/kfile_koffice.*
-%{tde_libdir}/kfile_ooo.*
-%{tde_libdir}/kfile_abiword.*
-%{tde_libdir}/kfile_gnumeric.*
-%{tde_libdir}/kodocinfopropspage.*
-%{tde_libdir}/kofficescan.*
-%{tde_libdir}/kofficethumbnail.*
-%{tde_libdir}/koshell.*
-%{tde_libdir}/kthesaurus.*
-%{tde_libdir}/kwmailmerge_classic.*
-%{tde_libdir}/kwmailmerge_kabc.*
-%{tde_libdir}/kwmailmerge_qtsqldb_power.*
-%{tde_libdir}/kwmailmerge_qtsqldb.*
-%{tde_libdir}/libkounavailpart.*
-%{tde_libdir}/libkprkword.*
-%{tde_libdir}/libthesaurustool.*
-%{tde_libdir}/clipartthumbnail.*
-%{_datadir}/apps/koffice/
-%{_datadir}/apps/konqueror/servicemenus/*
-%{_datadir}/apps/koshell/
-%{_datadir}/apps/thesaurus/
-%{_datadir}/config.kcfg/koshell.kcfg
-%{tde_docdir}/HTML/en/koffice/
-%{tde_docdir}/HTML/en/koshell/
-%{tde_docdir}/HTML/en/thesaurus/
-%{_datadir}/icons/crystalsvg/*/*/*
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/icons/locolor/*/*/*
-%{_datadir}/services/clipartthumbnail.desktop
-%{_datadir}/services/kfile*.desktop
-%{_datadir}/services/kwmailmerge*.desktop
-%{_datadir}/services/kodocinfopropspage.desktop
-%{_datadir}/services/kofficethumbnail.desktop
-%{_datadir}/services/kounavail.desktop
-%{_datadir}/services/kprkword.desktop
-%{_datadir}/services/thesaurustool.desktop
-%{_datadir}/servicetypes/kochart.desktop
-%{_datadir}/servicetypes/kofficepart.desktop
-%{_datadir}/servicetypes/koplugin.desktop
-%{_datadir}/servicetypes/kwmailmerge.desktop
-%{_datadir}/servicetypes/widgetfactory.desktop
-%{tde_appdir}/*koffice.desktop
-%{tde_appdir}/*KThesaurus.desktop
-%{tde_appdir}/*koshell.desktop
-%{_datadir}/apps/kofficewidgets/
-%if 0%{?with_kross} > 0
-%{_datadir}/apps/kross/
-%{tde_libdir}/krosspython.*
-%if 0%{?with_ruby}
-%{tde_libdir}/krossruby.*
-%endif
-%endif
-
-%files libs
-%defattr(-,root,root,-)
-%doc COPYING.LIB
-#_libdir/libk*common.so.*
-%{_libdir}/libkarboncommon.so.*
-%{_libdir}/libkspreadcommon.so.*
-%{_libdir}/libkdchart.so.*
-%{_libdir}/libkochart.so.*
-%{_libdir}/libkofficecore.so.*
-%{_libdir}/libkofficeui.so.*
-%{_libdir}/libkotext.so.*
-%{_libdir}/libkowmf.so.*
-%{_libdir}/libkopainter.so.*
-%{_libdir}/libkstore.so.*
-%{_libdir}/libkwmailmerge_interface.so.*
-%{_libdir}/libkwmf.so.*
-%{_libdir}/libkformulalib.so.*
-%{_libdir}/libkopalette.so.*
-%{_libdir}/libkoproperty.so.*
-%if 0%{?with_kross} > 0
-%{_libdir}/libkrossapi.so.*
-%{_libdir}/libkrossmain.so.*
-%endif
-
-%files devel
-%defattr(-,root,root,-)
-%lang(en) %{tde_docdir}/HTML/en/koffice-apidocs/
-%{_includedir}/*
-# FIXME: include only shlib symlinks we know/want to export
-%{_libdir}/lib*.so
-%exclude %{_libdir}/libkdeinit_*.so
-%exclude %{_libdir}/libkudesignercore.so
-
-%files kword
-%defattr(-,root,root,-)
-%lang(en) %{tde_docdir}/HTML/en/kword/
-%{_bindir}/kword
-%{_libdir}/libkdeinit_kword.so
-%{_libdir}/libkwordprivate.so.*
-%{tde_libdir}/libkwordpart.*
-%{tde_libdir}/kword.*
-%{_datadir}/apps/kword/
-%{_datadir}/services/kword*.desktop
-%{_datadir}/services/kwserial*.desktop
-%{_datadir}/templates/TextDocument.desktop
-%{_datadir}/templates/.source/TextDocument.kwt
-%{tde_appdir}/*kword.desktop
-
-%files kspread
-%defattr(-,root,root,-)
-%lang(en) %{tde_docdir}/HTML/en/kspread/
-%{_bindir}/kspread
-%{_libdir}/libkdeinit_kspread.so
-%{tde_libdir}/kspread.*
-%{tde_libdir}/libkspreadpart.*
-%{tde_libdir}/kwmailmerge_kspread.*
-%{tde_libdir}/libcsvexport.*
-%{tde_libdir}/libcsvimport.*
-%{tde_libdir}/libgnumericexport.*
-%{tde_libdir}/libgnumericimport.*
-%{tde_libdir}/libkspreadhtmlexport.*
-%{tde_libdir}/libkspreadinsertcalendar.*
-%{tde_libdir}/libopencalcexport.*
-%{tde_libdir}/libopencalcimport.*
-%{tde_libdir}/libqproimport.*
-%{_datadir}/apps/kspread/
-%{_datadir}/services/kspread*.desktop
-%{_datadir}/templates/SpreadSheet.desktop
-%{_datadir}/templates/.source/SpreadSheet.kst
-%{tde_appdir}/*kspread.desktop
-%if 0%{?with_kross} > 0
-%{tde_libdir}/kspreadscripting.*
-%{tde_libdir}/krosskspreadcore.*
-%endif
-
-%files kpresenter
-%defattr(-,root,root,-)
-%lang(en) %{tde_docdir}/HTML/en/kpresenter/
-%{_bindir}/kpresenter
-%{_bindir}/kprconverter.pl
-%{_libdir}/libkdeinit_kpresenter.so
-%{_libdir}/libkpresenterimageexport.so.*
-%{_libdir}/libkpresenterprivate.so.*
-%{tde_libdir}/*kpresenter*.*
-%{_datadir}/apps/kpresenter/
-%{_datadir}/services/kpresenter*.desktop
-%{_datadir}/templates/Presentation.desktop
-%{_datadir}/templates/.source/Presentation.kpt
-%{tde_appdir}/*kpresenter.desktop
-
-%files karbon
-%defattr(-,root,root,-)
-%lang(en) %{tde_docdir}/HTML/en/karbon/
-%{_bindir}/karbon
-%{_libdir}/libkdeinit_karbon.so
-%{tde_libdir}/*karbon*.*
-%{tde_libdir}/libwmfexport.*
-%{tde_libdir}/libwmfimport.*
-%{_datadir}/apps/karbon/
-%{_datadir}/services/karbon*
-%{_datadir}/servicetypes/karbon_module.desktop
-%{_datadir}/templates/Illustration.desktop
-%{_datadir}/templates/.source/Illustration.karbon
-%{tde_appdir}/*karbon.desktop
-
-%files kugar
-%defattr(-,root,root,-)
-%lang(en) %{tde_docdir}/HTML/en/kugar/
-%{_bindir}/kugar
-%{_bindir}/kudesigner
-%{_libdir}/libkdeinit_kugar.so
-%{_libdir}/libkdeinit_kudesigner.so
-%{_libdir}/libkugarlib.so.*
-%{_libdir}/libkudesignercore.so
-%{tde_libdir}/kudesigner.*
-%{tde_libdir}/kugar.*
-%{tde_libdir}/libkudesignerpart.*
-%{tde_libdir}/libkugarpart.*
-%{_datadir}/apps/kudesigner/
-%{_datadir}/apps/kugar/
-%{_datadir}/services/kugar*.desktop
-%{tde_appdir}/*kugar.desktop
-%{tde_appdir}/*kudesigner.desktop
-
-%files kexi
-%defattr(-,root,root,-)
-%lang(en) %{tde_docdir}/HTML/en/kexi/
-%{_bindir}/kexi*
-%{_bindir}/ksqlite*
-%{_libdir}/libkdeinit_kexi.so
-%{_libdir}/libkexi*.so.*
-%{_libdir}/libkformdesigner.so.*
-%{tde_libdir}/kformdesigner_*.*
-%{tde_libdir}/kexidb_sqlite2driver.*
-%{tde_libdir}/kexidb_sqlite3driver.*
-%{tde_libdir}/kexihandler_*.*
-%{tde_libdir}/kexi.*
-# moved here to workaround bug #394101, alternative is to move libkexi(db|dbparser|utils) to -libs)
-%{tde_libdir}/libkspreadkexiimport.*
-%{_datadir}/config/kexirc
-%{_datadir}/config/magic/kexi.magic
-%{_datadir}/mimelnk/application/*
-%{_datadir}/servicetypes/kexi*.desktop
-%{_datadir}/services/kexi/
-%{_datadir}/apps/kexi/
-%{_datadir}/services/kformdesigner/*
-%{tde_appdir}/*kexi.desktop
-%{_datadir}/services/kexidb_sqlite*driver.desktop
-%if 0%{?with_kross} > 0
-%{_bindir}/krossrunner
-%{tde_libdir}/krosskexiapp.*
-%{tde_libdir}/krosskexidb.*
-%endif
-
-%files kexi-driver-mysql
-%defattr(-,root,root,-)
-%{tde_libdir}/kexidb_mysqldriver.*
-%{tde_libdir}/keximigrate_mysql.*
-%{_datadir}/services/keximigrate_mysql.desktop
-%{_datadir}/services/kexidb_mysqldriver.desktop
-
-%files kexi-driver-pgsql
-%defattr(-,root,root,-)
-%{tde_libdir}/kexidb_pqxxsqldriver.*
-%{tde_libdir}/keximigrate_pqxx.*
-%{_datadir}/services/kexidb_pqxxsqldriver.desktop
-%{_datadir}/services/keximigrate_pqxx.desktop
-
-%files kchart
-%defattr(-,root,root,-)
-%lang(en) %{tde_docdir}/HTML/en/kchart/
-%{_bindir}/kchart
-%{_libdir}/libkchart*.so.*
-%{_libdir}/libkdeinit_kchart.so
-%{tde_libdir}/*kchart*.*
-%{_datadir}/apps/kchart/
-%{_datadir}/services/kchart*.desktop
-%{tde_appdir}/*kchart.desktop
-
-%files kformula
-%defattr(-,root,root,-)
-%lang(en) %{tde_docdir}/HTML/en/kformula/
-%{_bindir}/kformula
-%{_libdir}/libkdeinit_kformula.so
-%{tde_libdir}/*kformula*.*
-%{_datadir}/apps/kformula/
-%{_datadir}/services/kformula*.desktop
-%{tde_appdir}/*kformula.desktop
-
-%files kivio
-%defattr(-,root,root,-)
-%lang(en) %{tde_docdir}/HTML/en/kivio/
-%{_bindir}/kivio
-%{_libdir}/libkdeinit_kivio.so
-%{_libdir}/libkiviocommon.so.*
-%{tde_libdir}/*kivio*.*
-%{tde_libdir}/straight_connector.*
-%{_datadir}/apps/kivio/
-%{_datadir}/config.kcfg/kivio.kcfg
-%{_datadir}/services/kivio*.desktop
-%{tde_appdir}/*kivio.desktop
-
-%files filters
-%defattr(-,root,root,-)
-%{_libdir}/libkwordexportfilters.so.*
-%{tde_libdir}/libabiwordexport.*
-%{tde_libdir}/libabiwordimport.*
-%{tde_libdir}/libamiproexport.*
-%{tde_libdir}/libamiproimport.*
-%{tde_libdir}/libapplixspreadimport.*
-%{tde_libdir}/libapplixwordimport.*
-%{tde_libdir}/libasciiexport.*
-%{tde_libdir}/libasciiimport.*
-%{tde_libdir}/libdbaseimport.*
-%{tde_libdir}/libdocbookexport.*
-%{tde_libdir}/libexcelimport.*
-%{tde_libdir}/libgenerickofilter.*
-%{tde_libdir}/libhtmlexport.*
-%{tde_libdir}/libhtmlimport.*
-%{tde_libdir}/libkarbonepsimport.*
-%{tde_libdir}/libkfolatexexport.*
-%{tde_libdir}/libkfomathmlexport.*
-%{tde_libdir}/libkfomathmlimport.*
-%{tde_libdir}/libkfopngexport.*
-%{tde_libdir}/libkspreadlatexexport.*
-%{tde_libdir}/libkugarnopimport.*
-%{tde_libdir}/libkwordkword1dot3import.*
-%{tde_libdir}/libkwordlatexexport.*
-%{tde_libdir}/libmswriteexport.*
-%{tde_libdir}/libmswriteimport.*
-%{tde_libdir}/libooimpressexport.*
-%{tde_libdir}/libooimpressimport.*
-%{tde_libdir}/liboowriterexport.*
-%{tde_libdir}/liboowriterimport.*
-%{tde_libdir}/libpalmdocexport.*
-%{tde_libdir}/libpalmdocimport.*
-%{tde_libdir}/libpdfimport.*
-%{tde_libdir}/librtfexport.*
-%{tde_libdir}/librtfimport.*
-%{tde_libdir}/libwmlexport.*
-%{tde_libdir}/libwmlimport.*
-%{tde_libdir}/libwpexport.*
-%{tde_libdir}/libwpimport.*
-%{tde_libdir}/libmswordimport.*
-%{tde_libdir}/libxsltimport.*
-%{tde_libdir}/libxsltexport.*
-%{tde_libdir}/libhancomwordimport.*
-%{tde_libdir}/libkfosvgexport.*
-%{tde_libdir}/liboodrawimport.*
-%{tde_libdir}/libolefilter.*
-%{_datadir}/apps/xsltfilter/
-%{_datadir}/services/generic_filter.desktop
-%{_datadir}/services/ole_powerpoint97_import.desktop
-%{_datadir}/services/xslt*.desktop
-%{_datadir}/servicetypes/kofilter*.desktop
-
-%files kplato
-%defattr(-,root,root,-)
-%lang(en) %{tde_docdir}/HTML/en/kplato/
-%{_bindir}/kplato
-%{_libdir}/libkdeinit_kplato.so
-%{tde_libdir}/kplato.*
-%{tde_libdir}/libkplatopart.*
-%{_datadir}/apps/kplato/
-%{_datadir}/services/kplatopart.desktop
-%{tde_appdir}/*kplato.desktop
-
-%files chalk
-%defattr(-,root,root,-)
-%{_bindir}/chalk
-%{tde_libdir}/chalkblurfilter.la
-%{tde_libdir}/chalkblurfilter.so
-%{tde_libdir}/chalkbumpmap.la
-%{tde_libdir}/chalkbumpmap.so
-%{tde_libdir}/chalkcimg.la
-%{tde_libdir}/chalkcimg.so
-%{tde_libdir}/chalk_cmyk_*
-%{tde_libdir}/chalkcmykplugin.la
-%{tde_libdir}/chalkcmykplugin.so
-%{tde_libdir}/chalkcolorify.la
-%{tde_libdir}/chalkcolorify.so
-%{tde_libdir}/chalkcolorrange.la
-%{tde_libdir}/chalkcolorrange.so
-%{tde_libdir}/chalkcolorsfilters.la
-%{tde_libdir}/chalkcolorsfilters.so
-%{tde_libdir}/chalkcolorspaceconversion.la
-%{tde_libdir}/chalkcolorspaceconversion.so
-%{tde_libdir}/chalkconvolutionfilters.la
-%{tde_libdir}/chalkconvolutionfilters.so
-%{tde_libdir}/chalkdefaultpaintops.la
-%{tde_libdir}/chalkdefaultpaintops.so
-%{tde_libdir}/chalkdefaulttools.la
-%{tde_libdir}/chalkdefaulttools.so
-%{tde_libdir}/chalkdropshadow.la
-%{tde_libdir}/chalkdropshadow.so
-%{tde_libdir}/chalkembossfilter.la
-%{tde_libdir}/chalkembossfilter.so
-%{tde_libdir}/chalkexample.la
-%{tde_libdir}/chalkexample.so
-%{tde_libdir}/chalkextensioncolorsfilters.la
-%{tde_libdir}/chalkextensioncolorsfilters.so
-%{tde_libdir}/chalkfastcolortransfer.la
-%{tde_libdir}/chalkfastcolortransfer.so
-%{tde_libdir}/chalkfiltersgallery.la
-%{tde_libdir}/chalkfiltersgallery.so
-%{tde_libdir}/chalk_gray_*
-%{tde_libdir}/chalkgrayplugin.la
-%{tde_libdir}/chalkgrayplugin.so
-%{tde_libdir}/chalkhistogramdocker.la
-%{tde_libdir}/chalkhistogramdocker.so
-%{tde_libdir}/chalkhistogram.la
-%{tde_libdir}/chalkhistogram.so
-%{tde_libdir}/chalkimageenhancement.la
-%{tde_libdir}/chalkimageenhancement.so
-%{tde_libdir}/chalkimagesize.la
-%{tde_libdir}/chalkimagesize.so
-%{tde_libdir}/chalk.la
-%{tde_libdir}/chalklenscorrectionfilter.la
-%{tde_libdir}/chalklenscorrectionfilter.so
-%{tde_libdir}/chalklevelfilter.la
-%{tde_libdir}/chalklevelfilter.so
-%{tde_libdir}/chalk_lms_*
-%{tde_libdir}/chalkmodifyselection.la
-%{tde_libdir}/chalkmodifyselection.so
-%{tde_libdir}/chalknoisefilter.la
-%{tde_libdir}/chalknoisefilter.so
-%{tde_libdir}/chalkoilpaintfilter.la
-%{tde_libdir}/chalkoilpaintfilter.so
-%{tde_libdir}/chalkpixelizefilter.la
-%{tde_libdir}/chalkpixelizefilter.so
-%{tde_libdir}/chalkraindropsfilter.la
-%{tde_libdir}/chalkraindropsfilter.so
-%{tde_libdir}/chalkrandompickfilter.la
-%{tde_libdir}/chalkrandompickfilter.so
-%{tde_libdir}/chalk_rgb_*
-%{tde_libdir}/chalkrgbplugin.la
-%{tde_libdir}/chalkrgbplugin.so
-%{tde_libdir}/chalkrotateimage.la
-%{tde_libdir}/chalkrotateimage.so
-%{tde_libdir}/chalkroundcornersfilter.la
-%{tde_libdir}/chalkroundcornersfilter.so
-%{tde_libdir}/chalkselectiontools.la
-%{tde_libdir}/chalkselectiontools.so
-%{tde_libdir}/chalkselectopaque.la
-%{tde_libdir}/chalkselectopaque.so
-%{tde_libdir}/chalkseparatechannels.la
-%{tde_libdir}/chalkseparatechannels.so
-%{tde_libdir}/chalkshearimage.la
-%{tde_libdir}/chalkshearimage.so
-%{tde_libdir}/chalksmalltilesfilter.la
-%{tde_libdir}/chalksmalltilesfilter.so
-%{tde_libdir}/chalk.so
-%{tde_libdir}/chalkscreenshot.la
-%{tde_libdir}/chalkscreenshot.so
-%{tde_libdir}/chalksobelfilter.la
-%{tde_libdir}/chalksobelfilter.so
-%{tde_libdir}/chalksubstrate.la
-%{tde_libdir}/chalksubstrate.so
-%{tde_libdir}/chalktoolcrop.la
-%{tde_libdir}/chalktoolcrop.so
-%{tde_libdir}/chalktoolcurves.la
-%{tde_libdir}/chalktoolcurves.so
-%{tde_libdir}/chalktoolfilter.la
-%{tde_libdir}/chalktoolfilter.so
-%{tde_libdir}/chalktoolperspectivegrid.la
-%{tde_libdir}/chalktoolperspectivegrid.so
-%{tde_libdir}/chalktoolperspectivetransform.la
-%{tde_libdir}/chalktoolperspectivetransform.so
-%{tde_libdir}/chalktoolpolygon.la
-%{tde_libdir}/chalktoolpolygon.so
-%{tde_libdir}/chalktoolpolyline.la
-%{tde_libdir}/chalktoolpolyline.so
-%{tde_libdir}/chalktoolselectsimilar.la
-%{tde_libdir}/chalktoolselectsimilar.so
-%{tde_libdir}/chalktoolstar.la
-%{tde_libdir}/chalktoolstar.so
-%{tde_libdir}/chalktooltransform.la
-%{tde_libdir}/chalktooltransform.so
-%{tde_libdir}/chalkunsharpfilter.la
-%{tde_libdir}/chalkunsharpfilter.so
-%{tde_libdir}/chalkwavefilter.la
-%{tde_libdir}/chalkwavefilter.so
-%{tde_libdir}/chalkwetplugin.la
-%{tde_libdir}/chalkwetplugin.so
-%{tde_libdir}/chalk_ycbcr_*
-%{tde_libdir}/libchalkgmagickexport.la
-%{tde_libdir}/libchalkgmagickexport.so
-%{tde_libdir}/libchalkgmagickimport.la
-%{tde_libdir}/libchalkgmagickimport.so
-%{tde_libdir}/libchalkjpegexport.la
-%{tde_libdir}/libchalkjpegexport.so
-%{tde_libdir}/libchalkjpegimport.la
-%{tde_libdir}/libchalkjpegimport.so
-%{tde_libdir}/libchalk_openexr_export.la
-%{tde_libdir}/libchalk_openexr_export.so
-%{tde_libdir}/libchalk_openexr_import.la
-%{tde_libdir}/libchalk_openexr_import.so
-%{tde_libdir}/libchalkpart.la
-%{tde_libdir}/libchalkpart.so
-%{tde_libdir}/libchalkpdfimport.la
-%{tde_libdir}/libchalkpdfimport.so
-%{tde_libdir}/libchalkpngexport.la
-%{tde_libdir}/libchalkpngexport.so
-%{tde_libdir}/libchalkpngimport.la
-%{tde_libdir}/libchalkpngimport.so
-%{tde_libdir}/libchalk_raw_import.la
-%{tde_libdir}/libchalk_raw_import.so
-%{tde_libdir}/libchalktiffexport.la
-%{tde_libdir}/libchalktiffexport.so
-%{tde_libdir}/libchalktiffimport.la
-%{tde_libdir}/libchalktiffimport.so
-%{_libdir}/libkdeinit_chalk.so
-%{_libdir}/libchalk_cmyk_*.so.*
-%{_libdir}/libchalkcolor.so.*
-%{_libdir}/libchalkcommon.so.*
-%{_libdir}/libchalkgrayscale.so.*
-%{_libdir}/libchalk_gray_*.so.*
-%{_libdir}/libchalkimage.so.*
-%{_libdir}/libchalk_lms_*.so.*
-%{_libdir}/libchalk_rgb_*.so.*
-%{_libdir}/libchalkrgb.so.*
-%{_libdir}/libchalkui.so.*
-%{_libdir}/libchalk_ycbcr_*.so.*
-%if 0%{?with_kross} > 0
-%{tde_libdir}/krosschalkcore.la
-%{tde_libdir}/krosschalkcore.so
-%{tde_libdir}/chalkscripting.la
-%{tde_libdir}/chalkscripting.so
-%{_libdir}/libchalkscripting.so.*
-%endif
-
-%files chalk-data
-%{tde_appdir}/chalk.desktop
-%{_datadir}/applnk/.hidden/chalk_*.desktop
-%{_datadir}/apps/konqueror/servicemenus/chalk_konqi.desktop
-%{_datadir}/apps/chalk
-%{_datadir}/apps/chalkplugins
-%lang(en) %{tde_docdir}/HTML/en/chalk
-%{_datadir}/icons/hicolor/*/apps/chalk.png
-%{_datadir}/services/chalk*.desktop
-%{_datadir}/servicetypes/chalk*.desktop
-
-
-%changelog
-* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.3-5
-- Fix kformula dependancies (for RHEL6)
-- Fix FTBFS due to missing libraries [Bug #657] [Commit #5c69fcd3]
-  Clean up lib paths in LDFLAGS - moved to LIBADD
-  For KWord and and KPresenter added linking kspell2
-  For KSpread added linking kutils
-- Fix accidental conversions of binary files [Bug #1033] [Commit #dbe89307]
-
-* Thu Apr 26 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.3-4
-- Updates BuildRequires
-- Build for Fedora 17
-- Fix compilation with GCC 4.7 [Bug #958]
-- Fix compilation with Ruby 1.9 [Bug #735]
-- Fix compilation with libpng [Bug #603]
-
-* Sat Jan 07 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.3-3
-- Fix GraphicksMagick 1.3 support [Bug #353]
-- Various patches for kexi [Bug #777]
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 1.6.3-2
-- Fix HTML directory location
-
-* Tue Nov 22 2011 Francois Andriot <francois.andriot@free.fr> - 1.6.3-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-- Based on Spec file from Fedora 11 'koffice-2:1.6.3-25.20090306svn'
-- Removed 'krita', added 'chalk'
diff --git a/redhat/applications/konversation/trinity-konversation-3.5.13.spec b/redhat/applications/konversation/trinity-konversation-3.5.13.spec
index c99927475..730ed8433 100644
--- a/redhat/applications/konversation/trinity-konversation-3.5.13.spec
+++ b/redhat/applications/konversation/trinity-konversation-3.5.13.spec
@@ -1,25 +1,32 @@
 # Default version for this component
 %define kdecomp konversation
-%define version 1.1
-%define release 2
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_datadir}/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/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-%{kdecomp}
 Summary:	user friendly Internet Relay Chat (IRC) client for KDE [Trinity]
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	1.1
+Release:	2%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -28,7 +35,7 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org/
 
-Prefix:    %{_prefix}
+Prefix:    %{tde_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
@@ -47,15 +54,19 @@ Patch5:		bp004-ca3d6cef.diff
 
 BuildRequires: tqtinterface-devel
 BuildRequires: trinity-arts-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
+BuildRequires: trinity-tdelibs-devel
+BuildRequires: trinity-tdebase-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 
-BuildRequires: libxslt
+BuildRequires: libxslt-devel
 BuildRequires: docbook-style-xsl
-BuildRequires: libXi-devel
 
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}xi-devel
+%else
+BuildRequires: libXi-devel
+%endif
 
 %description
 Konversation is a client for the Internet Relay Chat (IRC) protocol.
@@ -89,8 +100,8 @@ and experienced users alike will appreciate its many features:
 # 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|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+  -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"
@@ -99,50 +110,76 @@ and experienced users alike will appreciate its many features:
 
 %build
 unset QTDIR || : ; source /etc/profile.d/qt.sh
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt \
-    --enable-closure
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --includedir=%{tde_tdeincludedir} \
+  --disable-rpath \
+  --with-extra-includes=%{tde_includedir}/tqt \
+  --enable-closure
 
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
-
+%find_lang %{kdecomp}
 
 %clean
 %__rm -rf %{buildroot}
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 
-%files
+%files -f %{kdecomp}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
-%{_bindir}/*
-%{_datadir}/applications/*/*.desktop
-%{_datadir}/locale/*/LC_MESSAGES/konversation.mo
-%{_datadir}/config.kcfg/konversation.kcfg
-%{_datadir}/services/*.protocol
-#%{_datadir}/servicetypes/digikamimageplugin.desktop
-%{_datadir}/apps/*/
-%{tde_docdir}/HTML/*/konversation/
-%{_datadir}/icons/*/*/*/*
-#%{_mandir}/man*/*
+%{tde_bindir}/konversation
+%{tde_tdeappdir}/konversation.desktop
+%{tde_datadir}/apps/kconf_update/konversation-0.19-appearance.pl
+%{tde_datadir}/apps/kconf_update/konversation-0.19-colorcodes.pl
+%{tde_datadir}/apps/kconf_update/konversation-0.19-colors.pl
+%{tde_datadir}/apps/kconf_update/konversation-0.19-custombrowser.pl
+%{tde_datadir}/apps/kconf_update/konversation-0.19-notifylists.pl
+%{tde_datadir}/apps/kconf_update/konversation-0.19-sortorder.pl
+%{tde_datadir}/apps/kconf_update/konversation-0.19-tabplacement.pl
+%{tde_datadir}/apps/kconf_update/konversation-0.20-customfonts.pl
+%{tde_datadir}/apps/kconf_update/konversation-0.20-quickbuttons.pl
+%{tde_datadir}/apps/kconf_update/konversation.upd
+%{tde_datadir}/apps/konversation/
+%{tde_datadir}/config.kcfg/konversation.kcfg
+%{tde_datadir}/services/konvirc.protocol
+%{tde_datadir}/services/konvirc6.protocol
+%{tde_tdedocdir}/HTML/*/konversation/
+%{tde_datadir}/icons/crystalsvg/*/actions/kimproxyaway.png
+%{tde_datadir}/icons/crystalsvg/*/actions/kimproxyoffline.png
+%{tde_datadir}/icons/crystalsvg/*/actions/kimproxyonline.png
+%{tde_datadir}/icons/crystalsvg/*/actions/char.png
+%{tde_datadir}/icons/crystalsvg/*/actions/konv_message.png
+%{tde_datadir}/icons/crystalsvg/scalable/actions/kimproxyaway.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/actions/kimproxyoffline.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/actions/kimproxyonline.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/actions/konv_message.svgz
+%{tde_datadir}/icons/hicolor/*/apps/konversation.png
+%{tde_datadir}/icons/hicolor/scalable/apps/konversation.svgz
+
 
 %Changelog
 * Sat May 05 2012 Francois Andriot <francois.andriot@free.fr> - 1.1-2
diff --git a/redhat/applications/kopete-otr/trinity-kopete-otr.spec b/redhat/applications/kopete-otr/trinity-kopete-otr.spec
index ec87c5a5e..c5a11710b 100644
--- a/redhat/applications/kopete-otr/trinity-kopete-otr.spec
+++ b/redhat/applications/kopete-otr/trinity-kopete-otr.spec
@@ -1,25 +1,35 @@
 # Default version for this component
 %define kdecomp kopete-otr
-%define version 0.7
-%define release 2
+
+# Required for Mageia 2: removes the ldflag '--no-undefined'
+%define _disable_ld_no_undefined 1
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_prefix}/share/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/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-%{kdecomp}
 Summary:	Off-The-Record encryption for Kopete [Trinity]
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	0.7
+Release:	2%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -28,20 +38,20 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org/
 
-Prefix:		%{_prefix}
+Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
 
 
 BuildRequires: tqtinterface-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
+BuildRequires: trinity-tdelibs-devel
+BuildRequires: trinity-tdebase-devel
 BuildRequires: desktop-file-utils
 
 # Kopete is provided by kdenetwork
-BuildRequires:	trinity-kdenetwork-devel
-Requires:		trinity-kdenetwork
+BuildRequires:	trinity-tdenetwork-devel
+Requires:		trinity-tdenetwork
 BuildRequires:	libotr-devel
 
 %description
@@ -51,14 +61,13 @@ users with IM-Cients supporting the OTR encryption method.
 
 
 %prep
-unset QTDIR; . /etc/profile.d/qt.sh
 %setup -q -n applications/%{kdecomp}
 
 # 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|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
+  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
 %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@@ -66,57 +75,65 @@ unset QTDIR; . /etc/profile.d/qt.sh
 
 
 %build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt \
-    --enable-closure
-
-%__make %{?_smp_mflags}
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --includedir=%{tde_tdeincludedir} \
+  --disable-rpath \
+  --with-extra-includes=%{tde_includedir}/tqt \
+  --enable-closure
+
+%__make %{_smp_mflags}
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
+# Unwanted files
+%__rm -f %{?buildroot}%{tde_libdir}/libkotr.so
+
+%find_lang kopete_otr
 
 %clean
 %__rm -rf %{buildroot}
 
 
 %post
-touch --no-create %{_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
+touch --no-create %{tde_datadir}/icons/crystalsvg || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
 /sbin/ldconfig || :
 
 %postun
-touch --no-create %{_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
+touch --no-create %{tde_datadir}/icons/crystalsvg || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
 /sbin/ldconfig || :
 
 
-%files
+%files -f kopete_otr.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
-%{_libdir}/libkotr.la
-%{_libdir}/libkotr.so
-%{_libdir}/libkotr.so.0
-%{_libdir}/libkotr.so.0.0.0
-%{tde_libdir}/kcm_kopete_otr.la
-%{tde_libdir}/kcm_kopete_otr.so
-%{tde_libdir}/kopete_otr.la
-%{tde_libdir}/kopete_otr.so
-%{_datadir}/apps/kopete_otr
-%{_datadir}/config.kcfg/kopete_otr.kcfg
-%{tde_docdir}/HTML/en/kopete_otr/common
-%{tde_docdir}/HTML/en/kopete_otr/index.cache.bz2
-%{tde_docdir}/HTML/en/kopete_otr/index.docbook
-%{_datadir}/icons/crystalsvg/16x16/apps/kopete_otr.png
-%{_datadir}/locale/de/LC_MESSAGES/kopete_otr.mo
-%{_datadir}/services/kconfiguredialog/kopete_otr_config.desktop
-%{_datadir}/services/kopete_otr.desktop
+%{tde_libdir}/libkotr.la
+%{tde_libdir}/libkotr.so.0
+%{tde_libdir}/libkotr.so.0.0.0
+%{tde_tdelibdir}/kcm_kopete_otr.la
+%{tde_tdelibdir}/kcm_kopete_otr.so
+%{tde_tdelibdir}/kopete_otr.la
+%{tde_tdelibdir}/kopete_otr.so
+%{tde_datadir}/apps/kopete_otr
+%{tde_datadir}/config.kcfg/kopete_otr.kcfg
+%{tde_tdedocdir}/HTML/en/kopete_otr/
+%{tde_datadir}/icons/crystalsvg/16x16/apps/kopete_otr.png
+%{tde_datadir}/services/kconfiguredialog/kopete_otr_config.desktop
+%{tde_datadir}/services/kopete_otr.desktop
 
 
 %Changelog
diff --git a/redhat/applications/kpicosim/kpicosim-3.5.13-fix_not_a_string_literal_error.patch b/redhat/applications/kpicosim/kpicosim-3.5.13-fix_not_a_string_literal_error.patch
new file mode 100644
index 000000000..fa2f57859
--- /dev/null
+++ b/redhat/applications/kpicosim/kpicosim-3.5.13-fix_not_a_string_literal_error.patch
@@ -0,0 +1,11 @@
+--- kpicosim/src/cassembler.cpp.ORI	2012-08-05 23:39:09.061007283 +0200
++++ kpicosim/src/cassembler.cpp	2012-08-05 23:42:53.639017712 +0200
+@@ -575,7 +575,7 @@
+ 					for( j = 31 ; j >= 0 ; j-- )
+ 		 				fprintf( outfile, "%02X", INITP[ j ][ line ] ) ;
+ 			} else if ( strcmp( "name", varname ) == 0 ) {
+-				fprintf( outfile, entityName.c_str() ) ;				
++				fprintf( outfile, "%s", entityName.c_str() ) ;				
+ 			} else if ( strcmp( "begin template", varname ) == 0 ) {
+ 				copy = true ;
+ 			}
diff --git a/redhat/applications/kpicosim/trinity-kpicosim.spec b/redhat/applications/kpicosim/trinity-kpicosim.spec
index e6fcf0466..43c024ed5 100644
--- a/redhat/applications/kpicosim/trinity-kpicosim.spec
+++ b/redhat/applications/kpicosim/trinity-kpicosim.spec
@@ -1,25 +1,32 @@
 # Default version for this component
 %define kdecomp kpicosim
-%define version 0.6a
-%define release 1
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_datadir}/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/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-%{kdecomp}
 Summary:	IDE and simulator for the Xilinx PicoBlaze-3 [Trinity]
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	0.6a
+Release:	1%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -28,14 +35,17 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org
 
-Prefix:    %{_prefix}
+Prefix:    %{tde_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
 
+# [kpicosim] Fix "not a string literal" error
+Patch1:		kpicosim-3.5.13-fix_not_a_string_literal_error.patch
+
 BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-kdelibs-devel
-BuildRequires:	trinity-kdebase-devel
+BuildRequires:	trinity-tdelibs-devel
+BuildRequires:	trinity-tdebase-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
@@ -49,12 +59,13 @@ simulator and export functions to VHDL, HEX and MEM files.
 
 %prep
 %setup -q -n applications/%{kdecomp}
+%patch1 -p1
 
 # 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|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
+  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
 %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@@ -62,19 +73,27 @@ simulator and export functions to VHDL, HEX and MEM files.
 
 
 %build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt:%{tde_includedir}
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --includedir=%{tde_tdeincludedir} \
+  --disable-rpath \
+  --with-extra-includes=%{tde_includedir}/tqt:%{tde_tdeincludedir}
 
 # SMP safe !
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
@@ -88,23 +107,23 @@ export PATH="%{_bindir}:${PATH}"
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 
 %files -f %{kdecomp}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
-%{_bindir}/kpicosim
-%{_datadir}/applnk/Development/kpicosim.desktop
-%{_datadir}/apps/katepart/syntax/psm.xml
-%{_datadir}/apps/kpicosim
-%{tde_docdir}/HTML/en/kpicosim
-%{_datadir}/icons/hicolor/*/apps/kpicosim.png
+%{tde_bindir}/kpicosim
+%{tde_datadir}/applnk/Development/kpicosim.desktop
+%{tde_datadir}/apps/katepart/syntax/psm.xml
+%{tde_datadir}/apps/kpicosim
+%{tde_tdedocdir}/HTML/en/kpicosim
+%{tde_datadir}/icons/hicolor/*/apps/kpicosim.png
 
 
 %Changelog
diff --git a/redhat/applications/kpilot/kpilot-3.5.13-missing_ldflags.patch b/redhat/applications/kpilot/kpilot-3.5.13-missing_ldflags.patch
new file mode 100644
index 000000000..c655bbeb4
--- /dev/null
+++ b/redhat/applications/kpilot/kpilot-3.5.13-missing_ldflags.patch
@@ -0,0 +1,11 @@
+--- kpilot/lib/Makefile.am.ORI	2012-08-05 23:51:32.492490057 +0200
++++ kpilot/lib/Makefile.am	2012-08-05 23:51:42.771261684 +0200
+@@ -29,7 +29,7 @@
+ 	pilotTodoEntry.cc
+ 
+ libkpilot_la_LDFLAGS = $(PISOCK_LDFLAGS) -no-undefined $(all_libraries) $(KDE_EXTRA_RPATH) $(KDE_RPATH)
+-libkpilot_la_LIBADD = $(PISOCK_LIB) $(LIB_KDEUI) $(LIB_KABC) -lkcal
++libkpilot_la_LIBADD = $(PISOCK_LIB) $(LIB_KDEUI) $(LIB_KABC) -lkcal $(LIB_QT) $(LIB_KDECORE) -lDCOP $(LIB_KIO)
+ 
+ kpilotincludedir = $(includedir)/kpilot
+ kpilotinclude_HEADERS = \
diff --git a/redhat/applications/kpilot/trinity-kpilot.spec b/redhat/applications/kpilot/trinity-kpilot.spec
index ad078e091..1c2fff802 100644
--- a/redhat/applications/kpilot/trinity-kpilot.spec
+++ b/redhat/applications/kpilot/trinity-kpilot.spec
@@ -1,25 +1,32 @@
 # Default version for this component
 %define kdecomp kpilot
-%define version 0.7
-%define release 2
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_prefix}/share/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/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-%{kdecomp}
 Summary:	TDE Palm Pilot hot-sync tool
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	0.7
+Release:	2%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -28,7 +35,7 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org
 
-Prefix:    %{_prefix}
+Prefix:    %{tde_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
@@ -36,9 +43,12 @@ Source0:	%{kdecomp}-3.5.13.tar.gz
 # Fix FTBFS
 Patch0:		kpilot-3.5.13-ftbfs.patch
 
+# [kpilot] Missing LDFLAGS cause FTBFS on Mageia / Mandriva
+Patch1:		kpilot-3.5.13-missing_ldflags.patch
+
 BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-kdelibs-devel
-BuildRequires:	trinity-kdebase-devel
+BuildRequires:	trinity-tdelibs-devel
+BuildRequires:	trinity-tdebase-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
@@ -55,12 +65,13 @@ and synchronize the built-in applications with their KDE counterparts.
 %prep
 %setup -q -n applications/%{kdecomp}
 %patch0 -p1
+%patch1 -p1 -b .ldflags
 
 # 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|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
+  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
 %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@@ -68,24 +79,34 @@ and synchronize the built-in applications with their KDE counterparts.
 
 
 %build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt:%{tde_includedir}
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --includedir=%{tde_tdeincludedir} \
+  --disable-rpath \
+  --with-extra-includes=%{tde_includedir}/tqt:%{tde_tdeincludedir}
 
 # SMP safe !
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
+# Unwanted files
+%__rm -f %{?buildroot}%{tde_libdir}/libkpilot.so
 
-%find_lang %{kdecomp} || touch %{kdecomp}.lang
+%find_lang %{kdecomp}
 
 
 
@@ -94,65 +115,66 @@ export PATH="%{_bindir}:${PATH}"
 
 
 %post
+update-desktop-database %{tde_appdir} > /dev/null
 for f in hicolor locolor crystalsvg; do
-  touch --no-create %{_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+  touch --no-create %{tde_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
 done
 /sbin/ldconfig || :
 
 %postun
+update-desktop-database %{tde_appdir} > /dev/null
 for f in hicolor locolor crystalsvg; do
-  touch --no-create %{_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+  touch --no-create %{tde_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
 done
 /sbin/ldconfig || :
 
 
 %files -f %{kdecomp}.lang
 %defattr(-,root,root,-)
-%{_bindir}/kpalmdoc
-%{_bindir}/kpilot
-%{_bindir}/kpilotDaemon
-%{_includedir}/kpilot
-%{_libdir}/libkpilot.la
-%{_libdir}/libkpilot.so
-%{_libdir}/libkpilot.so.0
-%{_libdir}/libkpilot.so.0.0.0
-%{tde_libdir}/conduit_address.la
-%{tde_libdir}/conduit_address.so
-%{tde_libdir}/conduit_doc.la
-%{tde_libdir}/conduit_doc.so
-%{tde_libdir}/conduit_knotes.la
-%{tde_libdir}/conduit_knotes.so
-%{tde_libdir}/conduit_memofile.la
-%{tde_libdir}/conduit_memofile.so
-%{tde_libdir}/conduit_notepad.la
-%{tde_libdir}/conduit_notepad.so
-%{tde_libdir}/conduit_popmail.la
-%{tde_libdir}/conduit_popmail.so
-%{tde_libdir}/conduit_sysinfo.la
-%{tde_libdir}/conduit_sysinfo.so
-%{tde_libdir}/conduit_time.la
-%{tde_libdir}/conduit_time.so
-%{tde_libdir}/conduit_todo.la
-%{tde_libdir}/conduit_todo.so
-%{tde_libdir}/conduit_vcal.la
-%{tde_libdir}/conduit_vcal.so
-%{tde_libdir}/kcm_kpilot.la
-%{tde_libdir}/kcm_kpilot.so
-%{_datadir}/applications/kde/kpalmdoc.desktop
-%{_datadir}/applications/kde/kpilot.desktop
-%{_datadir}/applications/kde/kpilotdaemon.desktop
-%{_datadir}/apps/kaddressbook/contacteditorpages/KPilotCustomFieldEditor.ui
-%{_datadir}/apps/kconf_update/kpalmdoc.upd
-%{_datadir}/apps/kconf_update/kpilot.upd
-%{_datadir}/apps/kpilot
-%{_datadir}/config.kcfg/*.kcfg
-%{_datadir}/icons/crystalsvg/*/apps/*.png
-%{_datadir}/icons/hicolor/*/apps/*.png
-%{_datadir}/icons/locolor/*/apps/*.png
-%{_datadir}/services/*.desktop
-%{_datadir}/servicetypes/kpilotconduit.desktop
+%{tde_bindir}/kpalmdoc
+%{tde_bindir}/kpilot
+%{tde_bindir}/kpilotDaemon
+%{tde_tdeincludedir}/kpilot
+%{tde_libdir}/libkpilot.la
+%{tde_libdir}/libkpilot.so.0
+%{tde_libdir}/libkpilot.so.0.0.0
+%{tde_tdelibdir}/conduit_address.la
+%{tde_tdelibdir}/conduit_address.so
+%{tde_tdelibdir}/conduit_doc.la
+%{tde_tdelibdir}/conduit_doc.so
+%{tde_tdelibdir}/conduit_knotes.la
+%{tde_tdelibdir}/conduit_knotes.so
+%{tde_tdelibdir}/conduit_memofile.la
+%{tde_tdelibdir}/conduit_memofile.so
+%{tde_tdelibdir}/conduit_notepad.la
+%{tde_tdelibdir}/conduit_notepad.so
+%{tde_tdelibdir}/conduit_popmail.la
+%{tde_tdelibdir}/conduit_popmail.so
+%{tde_tdelibdir}/conduit_sysinfo.la
+%{tde_tdelibdir}/conduit_sysinfo.so
+%{tde_tdelibdir}/conduit_time.la
+%{tde_tdelibdir}/conduit_time.so
+%{tde_tdelibdir}/conduit_todo.la
+%{tde_tdelibdir}/conduit_todo.so
+%{tde_tdelibdir}/conduit_vcal.la
+%{tde_tdelibdir}/conduit_vcal.so
+%{tde_tdelibdir}/kcm_kpilot.la
+%{tde_tdelibdir}/kcm_kpilot.so
+%{tde_tdeappdir}/kpalmdoc.desktop
+%{tde_tdeappdir}/kpilot.desktop
+%{tde_tdeappdir}/kpilotdaemon.desktop
+%{tde_datadir}/apps/kaddressbook/contacteditorpages/KPilotCustomFieldEditor.ui
+%{tde_datadir}/apps/kconf_update/kpalmdoc.upd
+%{tde_datadir}/apps/kconf_update/kpilot.upd
+%{tde_datadir}/apps/kpilot
+%{tde_datadir}/config.kcfg/*.kcfg
+%{tde_datadir}/icons/crystalsvg/*/apps/*.png
+%{tde_datadir}/icons/hicolor/*/apps/*.png
+%{tde_datadir}/icons/locolor/*/apps/*.png
+%{tde_datadir}/services/*.desktop
+%{tde_datadir}/servicetypes/kpilotconduit.desktop
 
 
 %Changelog
diff --git a/redhat/applications/kpowersave/trinity-kpowersave.spec b/redhat/applications/kpowersave/trinity-kpowersave.spec
index 427d621c8..b496d3af6 100644
--- a/redhat/applications/kpowersave/trinity-kpowersave.spec
+++ b/redhat/applications/kpowersave/trinity-kpowersave.spec
@@ -1,24 +1,31 @@
 # Default version for this component
 %define kdecomp kpowersave
-%define version 0.7.3
-%define release 2
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_datadir}/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/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-%{kdecomp}
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	0.7.3
+Release:	2%{?dist}%{?_variant}
 Summary:	HAL based power management applet for Trinityfiles or directories.
 
 License:	GPLv2+
@@ -28,15 +35,15 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org/
 
-Prefix:    %{_prefix}
+Prefix:    %{tde_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
 
 
 BuildRequires: tqtinterface-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
+BuildRequires: trinity-tdelibs-devel
+BuildRequires: trinity-tdebase-devel
 BuildRequires: desktop-file-utils
 
 %description
@@ -75,18 +82,29 @@ settings for:
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
+
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
 	
-%__mkdir build
+%if 0%{?rhel} || 0%{?fedora}
+%__mkdir_p build
 cd build
+%endif
+
 %cmake \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  -DCMAKE_SKIP_RPATH="OFF" \
 	..
 
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot} -C build
 
@@ -96,30 +114,32 @@ export PATH="%{_bindir}:${PATH}"
 
 
 %post
+update-desktop-database %{tde_appdir} > /dev/null
 /sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 %postun
+update-desktop-database %{tde_appdir} > /dev/null
 /sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{_bindir}/kpowersave
-%{_libdir}/libkdeinit_kpowersave.la
-%{_libdir}/libkdeinit_kpowersave.so
-%{tde_libdir}/kpowersave.la
-%{tde_libdir}/kpowersave.so
-%{_datadir}/applications/kde/kpowersave.desktop
-%{_datadir}/apps/kpowersave/eventsrc
-%{_datadir}/apps/kpowersave/icons/*/*/*/*.png
-%{_datadir}/icons/hicolor/*/*/*.png
-%{_datadir}/autostart/kpowersave-autostart.desktop
-%{_datadir}/config/kpowersaverc
+%{tde_bindir}/kpowersave
+%{tde_libdir}/libkdeinit_kpowersave.la
+%{tde_libdir}/libkdeinit_kpowersave.so
+%{tde_tdelibdir}/kpowersave.la
+%{tde_tdelibdir}/kpowersave.so
+%{tde_tdeappdir}/kpowersave.desktop
+%{tde_datadir}/apps/kpowersave/eventsrc
+%{tde_datadir}/apps/kpowersave/icons/*/*/*/*.png
+%{tde_datadir}/icons/hicolor/*/*/*.png
+%{tde_datadir}/autostart/kpowersave-autostart.desktop
+%{tde_datadir}/config/kpowersaverc
 
 %Changelog
 * Sat Nov 26 2011 Francois Andriot <francois.andriot@free.fr> - 0.7.3-2
diff --git a/redhat/applications/kradio/trinity-kradio.spec b/redhat/applications/kradio/trinity-kradio.spec
index efec2fec8..dfaedd47d 100644
--- a/redhat/applications/kradio/trinity-kradio.spec
+++ b/redhat/applications/kradio/trinity-kradio.spec
@@ -2,17 +2,25 @@
 %define kdecomp kradio
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_datadir}/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_appdir %{_datadir}/applications/kde
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/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-%{kdecomp}
@@ -27,20 +35,25 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org/
 
-Prefix:    %{_prefix}
+Prefix:    %{tde_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
 
 BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-kdelibs-devel
-BuildRequires:	trinity-kdebase-devel
+BuildRequires:	trinity-tdelibs-devel
+BuildRequires:	trinity-tdebase-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
 BuildRequires:	libsndfile-devel
 BuildRequires:	lirc-devel
+
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}twolame-devel
+%else
 BuildRequires:	lame-devel
+%endif
 
 %description
 KRadio is a comfortable radio application for Trinity with support for 
@@ -69,8 +82,8 @@ of new plugins (e.g. Internet Radio Streams, new cool GUIs) are welcome.
 # 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|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
+  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
 %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@@ -78,18 +91,32 @@ of new plugins (e.g. Internet Radio Streams, new cool GUIs) are welcome.
 
 
 %build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --includedir=%{tde_tdeincludedir} \
+  --disable-rpath \
+  --with-extra-includes=%{tde_includedir}/tqt \
+  --enable-lirc \
+  --enable-v4l2 \
+  --enable-lame \
+  --enable-ogg \
+  --enable-alsa \
+  --enable-oss
 
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
@@ -101,28 +128,28 @@ export PATH="%{_bindir}:${PATH}"
 
 %post
 for f in hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+  touch --no-create %{tde_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
 done
-update-desktop-database -q &> /dev/null ||:
+update-desktop-database %{tde_appdir} -q &> /dev/null ||:
 
 %postun
 for f in hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+  touch --no-create %{tde_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
 done
-update-desktop-database -q &> /dev/null ||:
+update-desktop-database %{tde_appdir} -q &> /dev/null ||:
 
 
 %files -f %{kdecomp}.lang
 %defattr(-,root,root,-)
-%{_bindir}/convert-presets
-%{_bindir}/kradio
-%{_libdir}/kradio/plugins/*.la
-%{_libdir}/kradio/plugins/*.so
-%{tde_appdir}/kradio.desktop
-%{_datadir}/apps/kradio/
-%{_datadir}/locale/*/LC_MESSAGES/kradio-*.mo
+%{tde_bindir}/convert-presets
+%{tde_bindir}/kradio
+%{tde_libdir}/kradio/plugins/*.la
+%{tde_libdir}/kradio/plugins/*.so
+%{tde_tdeappdir}/kradio.desktop
+%{tde_datadir}/apps/kradio/
+%{tde_datadir}/locale/*/LC_MESSAGES/kradio-*.mo
 
 %Changelog
 * Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-3
diff --git a/redhat/applications/krename/trinity-krename-3.5.12.spec b/redhat/applications/krename/trinity-krename-3.5.12.spec
index 37fc9e1c5..d76ed0723 100644
--- a/redhat/applications/krename/trinity-krename-3.5.12.spec
+++ b/redhat/applications/krename/trinity-krename-3.5.12.spec
@@ -6,14 +6,14 @@
 # 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
+%define _docdir %{tde_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
+%define tde_includedir %{tde_includedir}/kde
+%define tde_libdir %{tde_libdir}/kde3
 
 
 Name:		trinity-%{kdecomp}
@@ -31,8 +31,8 @@ URL:		http://www.trinitydesktop.org/
 Source0:	%{kdecomp}-3.5.12.tar.gz
 
 BuildRequires: tqtinterface-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
+BuildRequires: trinity-tdelibs-devel
+BuildRequires: trinity-tdebase-devel
 BuildRequires: desktop-file-utils
 BuildRequires: imlib-devel
 
@@ -51,19 +51,20 @@ or Exif informations of an image.
 
 
 %build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
 	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt \
+    --with-extra-includes=%{tde_includedir}/tqt \
     --enable-closure
 
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %make_install
 
@@ -73,23 +74,23 @@ export PATH="%{_bindir}:${PATH}"
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
-%{_bindir}/*
-%{_datadir}/applications/*/*.desktop
-%{_datadir}/apps/*/
-%{tde_docdir}/HTML/en/*/
-%{_datadir}/icons/*/*/*/*
-%{_datadir}/locale/*/*/*.mo
+%{tde_bindir}/*
+%{tde_datadir}/applications/*/*.desktop
+%{tde_datadir}/apps/*/
+%{tde_tdedocdir}/HTML/en/*/
+%{tde_datadir}/icons/*/*/*/*
+%{tde_datadir}/locale/*/*/*.mo
 
 
 %Changelog
diff --git a/redhat/applications/krename/trinity-krename-3.5.13.spec b/redhat/applications/krename/trinity-krename-3.5.13.spec
index 1b0a6929e..bb74edf1d 100644
--- a/redhat/applications/krename/trinity-krename-3.5.13.spec
+++ b/redhat/applications/krename/trinity-krename-3.5.13.spec
@@ -1,25 +1,32 @@
 # Default version for this component
 %define kdecomp krename
-%define version 3.0.14
-%define release 4
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_datadir}/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/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-%{kdecomp}
 Summary:	A TDE batch file renaming utility. 
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	3.0.14
+Release:	4%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -28,14 +35,14 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org/
 
-Prefix:    %{_prefix}
+Prefix:    %{tde_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
 
 BuildRequires: tqtinterface-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
+BuildRequires: trinity-tdelibs-devel
+BuildRequires: trinity-tdebase-devel
 BuildRequires: desktop-file-utils
 BuildRequires: imlib-devel
 
@@ -51,8 +58,8 @@ or Exif informations of an image.
 # 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|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
+  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
 %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@@ -60,19 +67,27 @@ or Exif informations of an image.
 
 
 %build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt \
-    --enable-closure
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --includedir=%{tde_tdeincludedir} \
+  --disable-rpath \
+  --with-extra-includes=%{tde_includedir}/tqt \
+  --enable-closure
 
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
@@ -85,26 +100,29 @@ export PATH="%{_bindir}:${PATH}"
 
 %post
 for f in hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+  touch --no-create %{tde_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
 done
+update-desktop-database %{tde_appdir} &> /dev/null
 
 %postun
 for f in hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+  touch --no-create %{tde_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
 done
-
+update-desktop-database %{tde_appdir} &> /dev/null
 
 %files -f %{kdecomp}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
-%{_bindir}/*
-%{_datadir}/applications/*/*.desktop
-%{_datadir}/apps/*/
-%{tde_docdir}/HTML/en/*/
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/icons/locolor/*/*/*
+%{tde_bindir}/krename
+%{tde_tdeappdir}/krename.desktop
+%{tde_datadir}/apps/konqueror/servicemenus/krename_dir.desktop
+%{tde_datadir}/apps/konqueror/servicemenus/krenameservicemenu.desktop
+%{tde_datadir}/apps/krename/
+%{tde_tdedocdir}/HTML/en/krename/
+%{tde_datadir}/icons/hicolor/*/apps/krename.png
+%{tde_datadir}/icons/locolor/*/apps/krename.png
 
 
 %Changelog
diff --git a/redhat/applications/krusader/krusader-3.5.13-fix_not_a_string_literal_error.patch b/redhat/applications/krusader/krusader-3.5.13-fix_not_a_string_literal_error.patch
new file mode 100644
index 000000000..754544dc3
--- /dev/null
+++ b/redhat/applications/krusader/krusader-3.5.13-fix_not_a_string_literal_error.patch
@@ -0,0 +1,11 @@
+--- krusader/krusader/main.cpp.ORI	2012-08-06 00:19:36.475622376 +0200
++++ krusader/krusader/main.cpp	2012-08-06 00:19:48.867387323 +0200
+@@ -199,7 +199,7 @@
+        exit( 0 );
+     TQCString regName = client->registerAs( KApplication::kApplication() ->name(), !singleInstanceMode );
+     if( singleInstanceMode && regName != KApplication::kApplication()->name() ) {
+-      fprintf( stderr, i18n( "Application already running!\n" ).ascii() );
++      fprintf( stderr, "%s", i18n( "Application already running!\n" ).ascii() );
+ 
+       DCOPClient::mainClient()->send( KApplication::kApplication() ->name(), "Krusader-Interface",
+                                     "moveToTop()", TQByteArray() );
diff --git a/redhat/applications/krusader/trinity-krusader.spec b/redhat/applications/krusader/trinity-krusader.spec
index 13beeab6b..d4e84f369 100644
--- a/redhat/applications/krusader/trinity-krusader.spec
+++ b/redhat/applications/krusader/trinity-krusader.spec
@@ -2,17 +2,25 @@
 %define kdecomp krusader
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_datadir}/doc
-%define _mandir %{_datadir}/man
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/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-%{kdecomp}
@@ -27,20 +35,22 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org/
 
-Prefix:    %{_prefix}
+Prefix:    %{tde_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
 
 # [krusader] GCC 4.7 fixes. [Commit #fdf6d340]
 Patch1:		krusader-3.5.13-fix_gcc47_compilation.patch
+# [krusader] Fix "not a string literal" error
+Patch2:		krusader-3.5.13-fix_not_a_string_literal_error.patch
 
 BuildRequires: tqtinterface-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
+BuildRequires: trinity-tdelibs-devel
+BuildRequires: trinity-tdebase-devel
 BuildRequires: desktop-file-utils
 
-BuildRequires:	trinity-kdebindings-devel
+BuildRequires:	trinity-tdebindings-devel
 
 %description
 Krusader is a simple, easy, powerful, twin-panel (commander-style) file
@@ -65,12 +75,13 @@ great on your desktop.
 %prep
 %setup -q -n applications/%{kdecomp}
 %patch1 -p1
+%patch2 -p1
 
 # 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|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
+  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
 %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@@ -78,18 +89,26 @@ great on your desktop.
 
 
 %build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt:%{tde_includedir}
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --includedir=%{tde_tdeincludedir} \
+  --disable-rpath \
+  --with-extra-includes=%{tde_includedir}/tqt
 
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
@@ -100,36 +119,38 @@ export PATH="%{_bindir}:${PATH}"
 
 
 %post
+update-desktop-database %{tde_appdir} > /dev/null
 for f in crystalsvg locolor ; do
-  touch --no-create %{_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+  touch --no-create %{tde_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
 done
 
 %postun
+update-desktop-database %{tde_appdir} > /dev/null
 for f in crystalsvg locolor ; do
-  touch --no-create %{_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+  touch --no-create %{tde_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
 done
 
 
 %files -f %{kdecomp}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING FAQ README TODO
-%{_bindir}/krusader
-%{tde_libdir}/kio_krarc.la
-%{tde_libdir}/kio_krarc.so
-%{tde_libdir}/kio_virt.la
-%{tde_libdir}/kio_virt.so
-%{_datadir}/applications/kde/krusader.desktop
-%{_datadir}/applications/kde/krusader_root-mode.desktop
-%{_datadir}/apps/krusader
-%{tde_docdir}/HTML/en/krusader/
-%lang(ru) %{tde_docdir}/HTML/ru/krusader/
-%{_datadir}/icons/crystalsvg/*/apps/*.png
-%{_datadir}/icons/locolor/*/apps/*.png
-%{_datadir}/services/krarc.protocol
-%{_datadir}/services/virt.protocol
-%{_mandir}/man1/krusader.1
+%{tde_bindir}/krusader
+%{tde_tdelibdir}/kio_krarc.la
+%{tde_tdelibdir}/kio_krarc.so
+%{tde_tdelibdir}/kio_virt.la
+%{tde_tdelibdir}/kio_virt.so
+%{tde_tdeappdir}/krusader.desktop
+%{tde_tdeappdir}/krusader_root-mode.desktop
+%{tde_datadir}/apps/krusader
+%{tde_tdedocdir}/HTML/en/krusader/
+%lang(ru) %{tde_tdedocdir}/HTML/ru/krusader/
+%{tde_datadir}/icons/crystalsvg/*/apps/*.png
+%{tde_datadir}/icons/locolor/*/apps/*.png
+%{tde_datadir}/services/krarc.protocol
+%{tde_datadir}/services/virt.protocol
+%{tde_mandir}/man1/krusader.1
 
 
 %Changelog
diff --git a/redhat/applications/ksplash-engine-moodin/trinity-ksplash-engine-moodin.spec b/redhat/applications/ksplash-engine-moodin/trinity-ksplash-engine-moodin.spec
index 5fc9e7c07..192bf9cc3 100644
--- a/redhat/applications/ksplash-engine-moodin/trinity-ksplash-engine-moodin.spec
+++ b/redhat/applications/ksplash-engine-moodin/trinity-ksplash-engine-moodin.spec
@@ -1,25 +1,32 @@
 # Default version for this component
 %define kdecomp ksplash-engine-moodin
-%define version 0.4.2
-%define release 2
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_prefix}/share/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/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-%{kdecomp}
 Summary:	fading splash screen engine for Trinity
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	0.4.2
+Release:	2%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -28,14 +35,14 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org/
 
-Prefix:    %{_prefix}
+Prefix:    %{tde_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
 
 BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-kdelibs-devel
-BuildRequires:	trinity-kdebase-devel
+BuildRequires:	trinity-tdelibs-devel
+BuildRequires:	trinity-tdebase-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
@@ -64,8 +71,8 @@ Homepage: http://moodwrod.com
 # 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|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
+  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
 %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@@ -73,18 +80,26 @@ Homepage: http://moodwrod.com
 
 
 %build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --includedir=%{tde_tdeincludedir} \
+  --disable-rpath \
+  --with-extra-includes=%{tde_includedir}/tqt
 
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
@@ -95,10 +110,11 @@ export PATH="%{_bindir}:${PATH}"
 
 %files
 %defattr(-,root,root,-)
-%{tde_libdir}/ksplashmoodin.la
-%{tde_libdir}/ksplashmoodin.so
-%{_datadir}/apps/ksplash
-%{_datadir}/services/ksplashmoodin.desktop
+%{tde_tdelibdir}/ksplashmoodin.la
+%{tde_tdelibdir}/ksplashmoodin.so
+%{tde_datadir}/apps/ksplash/Themes/FingerPrint/
+%{tde_datadir}/apps/ksplash/Themes/MoodinKDE/
+%{tde_datadir}/services/ksplashmoodin.desktop
 
 
 %Changelog
diff --git a/redhat/applications/ksquirrel/trinity-ksquirrel.spec b/redhat/applications/ksquirrel/trinity-ksquirrel.spec
index 945628cfb..90abc45cd 100644
--- a/redhat/applications/ksquirrel/trinity-ksquirrel.spec
+++ b/redhat/applications/ksquirrel/trinity-ksquirrel.spec
@@ -1,26 +1,32 @@
 # Default version for this component
 %define kdecomp ksquirrel
-%define version 0.8.0
-%define release 2
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_datadir}/doc
-%define _mandir %{_datadir}/man
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/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-%{kdecomp}
 Summary:	Powerful Trinity image viewer
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	0.8.0
+Release:	2%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Amusements/Games
@@ -29,14 +35,14 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org/
 
-Prefix:    %{_prefix}
+Prefix:    %{tde_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
 
 BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-kdelibs-devel
-BuildRequires:	trinity-kdebase-devel
+BuildRequires:	trinity-tdelibs-devel
+BuildRequires:	trinity-tdebase-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
@@ -59,8 +65,8 @@ OpenGL and dynamic format support.
 # 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|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
+  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
 %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@@ -68,18 +74,26 @@ OpenGL and dynamic format support.
 
 
 %build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --includedir=%{tde_tdeincludedir} \
+  --disable-rpath \
+  --with-extra-includes=%{tde_includedir}/tqt
 
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
@@ -90,36 +104,38 @@ export PATH="%{_bindir}:${PATH}"
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+update-desktop-database %{tde_appdir} > /dev/null
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+update-desktop-database %{tde_appdir} > /dev/null
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 
 %files -f %{kdecomp}
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING LICENSE LICENSE.GFDL LICENSE.LGPL README TODO
-%{_bindir}/ksquirrel
-%{_bindir}/ksquirrel-libs-configurator
-%{_bindir}/ksquirrel-libs-configurator-real
-%{tde_libdir}/libksquirrelpart.la
-%{tde_libdir}/libksquirrelpart.so
-%{_datadir}/applications/kde/ksquirrel.desktop
-%{_datadir}/apps/dolphin/servicemenus/dolphksquirrel-dir.desktop
-%{_datadir}/apps/konqueror/servicemenus/konqksquirrel-dir.desktop
-%{_datadir}/apps/ksquirrel/
-%{_datadir}/apps/ksquirrelpart/ksquirrelpart.rc
-%{_datadir}/config/magic/x-ras.magic
-%{_datadir}/config/magic/x-sun.magic
-%{_datadir}/config/magic/x-utah.magic
-%{tde_docdir}/HTML/*/ksquirrel
-%{_datadir}/icons/hicolor/*/apps/ksquirrel.png
-%{_datadir}/mimelnk/image/*.desktop
-%{_datadir}/services/ksquirrelpart.desktop
-%{_datadir}/locale/*/LC_MESSAGES/ksquirrel.mo
-%{_mandir}/man1/ksquirrel.1
+%{tde_bindir}/ksquirrel
+%{tde_bindir}/ksquirrel-libs-configurator
+%{tde_bindir}/ksquirrel-libs-configurator-real
+%{tde_tdelibdir}/libksquirrelpart.la
+%{tde_tdelibdir}/libksquirrelpart.so
+%{tde_tdeappdir}/ksquirrel.desktop
+%{tde_datadir}/apps/dolphin/servicemenus/dolphksquirrel-dir.desktop
+%{tde_datadir}/apps/konqueror/servicemenus/konqksquirrel-dir.desktop
+%{tde_datadir}/apps/ksquirrel/
+%{tde_datadir}/apps/ksquirrelpart/ksquirrelpart.rc
+%{tde_datadir}/config/magic/x-ras.magic
+%{tde_datadir}/config/magic/x-sun.magic
+%{tde_datadir}/config/magic/x-utah.magic
+%{tde_tdedocdir}/HTML/*/ksquirrel
+%{tde_datadir}/icons/hicolor/*/apps/ksquirrel.png
+%{tde_datadir}/mimelnk/image/*.desktop
+%{tde_datadir}/services/ksquirrelpart.desktop
+%{tde_datadir}/locale/*/LC_MESSAGES/ksquirrel.mo
+%{tde_mandir}/man1/ksquirrel.1
 
 %Changelog
 * Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.1-2
diff --git a/redhat/applications/kstreamripper/kstreamripper-3.5.13-fix_doc_directory.patch b/redhat/applications/kstreamripper/kstreamripper-3.5.13-fix_doc_directory.patch
new file mode 100644
index 000000000..c0bf88288
--- /dev/null
+++ b/redhat/applications/kstreamripper/kstreamripper-3.5.13-fix_doc_directory.patch
@@ -0,0 +1,9 @@
+--- kstreamripper/doc/SConscript.ORI	2012-08-06 10:50:27.856547193 +0200
++++ kstreamripper/doc/SConscript	2012-08-06 10:50:34.599402333 +0200
+@@ -79,5 +79,5 @@
+ 	myenv.KDEinstall( 'KDEDOC', lang+'/'+destination, folder+'/index.cache.bz2' )
+ 
+ ## Use processfolder for each documentation directory
+-processfolder('en/', 'en')
++processfolder('en/', 'en', 'kstreamripper')
+ 
diff --git a/redhat/applications/kstreamripper/kstreamripper-3.5.13-missing_ldflags.patch b/redhat/applications/kstreamripper/kstreamripper-3.5.13-missing_ldflags.patch
new file mode 100644
index 000000000..dbdaae544
--- /dev/null
+++ b/redhat/applications/kstreamripper/kstreamripper-3.5.13-missing_ldflags.patch
@@ -0,0 +1,11 @@
+--- kstreamripper/src/SConscript.ORI	2012-08-06 10:46:01.509252125 +0200
++++ kstreamripper/src/SConscript	2012-08-06 10:46:10.021070424 +0200
+@@ -43,7 +43,7 @@
+ myenv.KDEaddpaths_includes( ['./', '../'] )
+ 
+ ## Necessary libraries to link against
+-myenv.KDEaddlibs( ['tqt', 'kio', 'kdeui'] )
++myenv.KDEaddlibs( ['tqt', 'kio', 'kdeui', 'qt-mt'] )
+ if env['KDEm2']>3: myenv.KDEaddlibs( ['kdnssd'])
+ #############################
+ ## Data to install
diff --git a/redhat/applications/kstreamripper/trinity-kstreamripper-3.5.13.spec b/redhat/applications/kstreamripper/trinity-kstreamripper-3.5.13.spec
index 8ac29215a..792fa0495 100644
--- a/redhat/applications/kstreamripper/trinity-kstreamripper-3.5.13.spec
+++ b/redhat/applications/kstreamripper/trinity-kstreamripper-3.5.13.spec
@@ -2,16 +2,25 @@
 %define kdecomp kstreamripper
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_datadir}/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/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-%{kdecomp}
@@ -27,17 +36,23 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org/
 
-Prefix:    %{_prefix}
+Prefix:    %{tde_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
 
 Patch0:		kstreamripper-3.5.13-missing_include_tqt.patch
 
+# [kstreamripper] Missing LDFLAGS cause FTBFS on Mageia / Mandriva
+Patch1:		kstreamripper-3.5.13-missing_ldflags.patch
+
+# [kstreamripper] Fix directory of HTML documentation
+Patch2:		kstreamripper-3.5.13-fix_doc_directory.patch
+
 BuildRequires: tqtinterface-devel
 BuildRequires: trinity-arts-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
+BuildRequires: trinity-tdelibs-devel
+BuildRequires: trinity-tdebase-devel
 BuildRequires: desktop-file-utils
 BuildRequires: scons
 
@@ -52,18 +67,21 @@ you with managing/ripping your preferred streams.
 %prep
 %setup -q -n applications/%{kdecomp}
 %patch0 -p1
+%patch1 -p1 -b .ldflags
+%patch2 -p1 -b .doc
 
 %build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
-export CXXFLAGS="-I%{_includedir}/tqt"
+export CXXFLAGS="-I%{tde_includedir}/tqt"
 
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
@@ -95,10 +113,10 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%{_bindir}/kstreamripper
-%{_datadir}/applnk/Utilities/kstreamripper.desktop
-%{_datadir}/apps/kstreamripper/kstreamripperui.rc
-%{tde_docdir}/HTML/en/en/index.cache.bz2
+%{tde_bindir}/kstreamripper
+%{tde_datadir}/applnk/Utilities/kstreamripper.desktop
+%{tde_datadir}/apps/kstreamripper/kstreamripperui.rc
+%{tde_tdedocdir}/HTML/en/kstreamripper/
 
 
 
diff --git a/redhat/applications/ksystemlog/trinity-ksystemlog.spec b/redhat/applications/ksystemlog/trinity-ksystemlog.spec
index 8c2e00269..9f74d8b0a 100644
--- a/redhat/applications/ksystemlog/trinity-ksystemlog.spec
+++ b/redhat/applications/ksystemlog/trinity-ksystemlog.spec
@@ -1,25 +1,32 @@
 # Default version for this component
 %define kdecomp ksystemlog
-%define version 0.3.2
-%define release 1
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_prefix}/share/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/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-%{kdecomp}
 Summary:	system log viewer tool for Trinity
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	0.3.2
+Release:	1%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/System
@@ -28,15 +35,15 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://ksystemlog.forum-software.org
 
-Prefix:		%{_prefix}
+Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
 
 
 BuildRequires: tqtinterface-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
+BuildRequires: trinity-tdelibs-devel
+BuildRequires: trinity-tdebase-devel
 BuildRequires: desktop-file-utils
 
 
@@ -50,14 +57,13 @@ quickly see problems occuring on their server.
 
 
 %prep
-unset QTDIR; . /etc/profile.d/qt.sh
 %setup -q -n applications/%{kdecomp}
 
 # 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|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
+  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
 %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@@ -65,19 +71,27 @@ unset QTDIR; . /etc/profile.d/qt.sh
 
 
 %build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt \
-    --enable-closure
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --includedir=%{tde_tdeincludedir} \
+  --disable-rpath \
+  --with-extra-includes=%{tde_includedir}/tqt \
+  --enable-closure
 
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
@@ -87,23 +101,23 @@ export PATH="%{_bindir}:${PATH}"
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
-%{_bindir}/ksystemlog
-%{_datadir}/applnk/Utilities/ksystemlog.desktop
-%{_datadir}/apps/ksystemlog/ksystemlogui.rc
-%{_datadir}/config.kcfg/ksystemlog.kcfg
-%{_datadir}/icons/hicolor/*/apps/ksystemlog.png
-%{_datadir}/icons/hicolor/*/apps/ksystemlog.svgz
+%{tde_bindir}/ksystemlog
+%{tde_datadir}/applnk/Utilities/ksystemlog.desktop
+%{tde_datadir}/apps/ksystemlog/ksystemlogui.rc
+%{tde_datadir}/config.kcfg/ksystemlog.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/ksystemlog.png
+%{tde_datadir}/icons/hicolor/*/apps/ksystemlog.svgz
 
 
 %Changelog
diff --git a/redhat/applications/ktechlab/ktechlab-3.5.13-missing_ldflags.patch b/redhat/applications/ktechlab/ktechlab-3.5.13-missing_ldflags.patch
new file mode 100644
index 000000000..5c9ee7e8a
--- /dev/null
+++ b/redhat/applications/ktechlab/ktechlab-3.5.13-missing_ldflags.patch
@@ -0,0 +1,11 @@
+--- ktechlab/src/Makefile.am.ORI	2012-08-06 11:04:54.798218350 +0200
++++ ktechlab/src/Makefile.am	2012-08-06 11:05:01.909069510 +0200
+@@ -19,7 +19,7 @@
+ 	$(top_builddir)/src/mechanics/libmechanics.la $(top_builddir)/src/electronics/libelectronics.la \
+ 	$(top_builddir)/src/electronics/simulation/libelements.la $(top_builddir)/src/electronics/components/libcomponents.la \
+ 	$(top_builddir)/src/languages/liblanguages.la $(top_builddir)/src/drawparts/libdrawparts.la \
+-	$(top_builddir)/src/core/libcore.la -lkutils $(LIB_GPSIM) -lktexteditor $(LIB_KFILE) $(LIB_KDEPRINT)
++	$(top_builddir)/src/core/libcore.la -lkutils $(LIB_GPSIM) -lktexteditor $(LIB_KFILE) $(LIB_KDEPRINT) $(LIB_QT)
+ 
+ # which sources should be compiled for ktechlab
+ ktechlab_SOURCES = ktechlab.cpp node.cpp connector.cpp itemlibrary.cpp \
diff --git a/redhat/applications/ktechlab/trinity-ktechlab.spec b/redhat/applications/ktechlab/trinity-ktechlab.spec
index f6b421450..45134f847 100644
--- a/redhat/applications/ktechlab/trinity-ktechlab.spec
+++ b/redhat/applications/ktechlab/trinity-ktechlab.spec
@@ -1,25 +1,32 @@
 # Default version for this component
 %define kdecomp ktechlab
-%define version 0.3
-%define release 2
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_datadir}/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/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-%{kdecomp}
 Summary:	circuit simulator for microcontrollers and electronics [Trinity]
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	0.3
+Release:	2%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -28,17 +35,19 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org/
 
-Prefix:    %{_prefix}
+Prefix:    %{tde_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
 
 # [ktechlab] Fix list of icons to install [Bug #990]
 Patch0:		ktechlab-3.5.13-duplicate_icons.patch
+# [ktechlab] Missing LDFLAGS cause FTBFS
+Patch1:		ktechlab-3.5.13-missing_ldflags.patch
 
 BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-kdelibs-devel
-BuildRequires:	trinity-kdebase-devel
+BuildRequires:	trinity-tdelibs-devel
+BuildRequires:	trinity-tdebase-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
@@ -54,12 +63,13 @@ Homepage: http://ktechlab.org/
 %prep
 %setup -q -n applications/%{kdecomp}
 %patch0 -p1
+%patch1 -p1
 
 # 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|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+  -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"
@@ -67,18 +77,26 @@ Homepage: http://ktechlab.org/
 
 
 %build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --includedir=%{tde_tdeincludedir} \
+  --disable-rpath \
+  --with-extra-includes=%{tde_includedir}/tqt
 
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
@@ -89,28 +107,28 @@ export PATH="%{_bindir}:${PATH}"
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 
 %files -f %{kdecomp}.lang
 %defattr(-,root,root,-)
-%{_bindir}/ktechlab
-%{_bindir}/microbe
-%{_datadir}/applnk/Development/ktechlab.desktop
-%{_datadir}/apps/katepart/syntax/microbe.xml
-%{_datadir}/apps/ktechlab
-%{_datadir}/config.kcfg/ktechlab.kcfg
-%{tde_docdir}/HTML/en/ktechlab/
-%{_datadir}/icons/hicolor/*/*/*.png
-%{_datadir}/mimelnk/application/x-circuit.desktop
-%{_datadir}/mimelnk/application/x-flowcode.desktop
-%{_datadir}/mimelnk/application/x-ktechlab.desktop
-%{_datadir}/mimelnk/application/x-microbe.desktop
+%{tde_bindir}/ktechlab
+%{tde_bindir}/microbe
+%{tde_datadir}/applnk/Development/ktechlab.desktop
+%{tde_datadir}/apps/katepart/syntax/microbe.xml
+%{tde_datadir}/apps/ktechlab
+%{tde_datadir}/config.kcfg/ktechlab.kcfg
+%{tde_tdedocdir}/HTML/en/ktechlab/
+%{tde_datadir}/icons/hicolor/*/*/*.png
+%{tde_datadir}/mimelnk/application/x-circuit.desktop
+%{tde_datadir}/mimelnk/application/x-flowcode.desktop
+%{tde_datadir}/mimelnk/application/x-ktechlab.desktop
+%{tde_datadir}/mimelnk/application/x-microbe.desktop
 
 
 %Changelog
diff --git a/redhat/applications/ktorrent/ktorrent-3.5.13-missing_ldflags.patch b/redhat/applications/ktorrent/ktorrent-3.5.13-missing_ldflags.patch
new file mode 100644
index 000000000..ef85a74f8
--- /dev/null
+++ b/redhat/applications/ktorrent/ktorrent-3.5.13-missing_ldflags.patch
@@ -0,0 +1,9 @@
+--- ktorrent/libktorrent/Makefile.am.ORI	2012-08-06 11:11:35.700759480 +0200
++++ ktorrent/libktorrent/Makefile.am	2012-08-06 11:11:44.437574091 +0200
+@@ -18,5 +18,5 @@
+ libktorrent_la_LIBADD = ../libktorrent/net/libnet.la \
+ 	../libktorrent/datachecker/libdatachecker.la ../libktorrent/mse/libmse.la ../libktorrent/migrate/libmigrate.la \
+ 	../libktorrent/util/libutil.la ../libktorrent/torrent/libtorrent.la \
+-	../libktorrent/kademlia/libkademlia.la ../libktorrent/interfaces/libinterfaces.la $(LIB_KPARTS)
++	../libktorrent/kademlia/libkademlia.la ../libktorrent/interfaces/libinterfaces.la $(LIB_KPARTS) $(LIB_KIO) $(LIB_KDECORE) $(LIB_QT) $(LIB_KDEUI)
+ KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI)
diff --git a/redhat/applications/ktorrent/trinity-ktorrent.spec b/redhat/applications/ktorrent/trinity-ktorrent.spec
index 73e1bacf6..cee7ff745 100644
--- a/redhat/applications/ktorrent/trinity-ktorrent.spec
+++ b/redhat/applications/ktorrent/trinity-ktorrent.spec
@@ -1,25 +1,32 @@
 # Default version for this component
 %define kdecomp ktorrent
-%define version 2.2.8
-%define release 1
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_datadir}/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/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-%{kdecomp}
 Summary:	BitTorrent client for Trinity
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	2.2.8
+Release:	1%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -28,7 +35,7 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://ktorrent.org
 
-Prefix:    %{_prefix}
+Prefix:    %{tde_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
@@ -51,11 +58,12 @@ Patch6:		ktorrent-3.5.13-5dcbbbba-partial.diff
 Patch7:		bp006-5af9907f.diff
 # [ktorrent] Change default configuration to use external geoip database when found and use internal database only when external database is not found. [Bug #443] [Commit #355c6b69]
 Patch8:		bp007-355c6b69.diff
-
+# [ktorrent] Missing LDFLAGS cause FTBFS on Mageia / Mandriva
+Patch9:		ktorrent-3.5.13-missing_ldflags.patch
 
 BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-kdelibs-devel
-BuildRequires:	trinity-kdebase-devel
+BuildRequires:	trinity-tdelibs-devel
+BuildRequires:	trinity-tdebase-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
@@ -78,12 +86,13 @@ enabling background downloading.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 # 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|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+  -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"
@@ -91,12 +100,20 @@ enabling background downloading.
 
 
 %build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --includedir=%{tde_tdeincludedir} \
+  --disable-rpath \
+  --with-extra-includes=%{tde_includedir}/tqt
 
 
 # Not SMP safe !
@@ -104,68 +121,72 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
 
 %find_lang %{kdecomp}
 
+# Unwanted files
+%__rm -f %{?buildroot}%{tde_libdir}/libktorrent.so
+
 
 %clean
 %__rm -rf %{buildroot}
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+update-desktop-database %{tde_appdir} > /dev/null
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 /sbin/ldconfig || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+update-desktop-database %{tde_appdir} > /dev/null
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 /sbin/ldconfig || :
 
 
 %files -f %{kdecomp}.lang
 %defattr(-,root,root,-)
-%{_bindir}/ktcachecheck
-%{_bindir}/ktorrent
-%{_bindir}/ktshell
-%{_bindir}/kttorinfo
-%{_bindir}/ktupnptest
-%{_libdir}/libktorrent-%{version}.so
-%{_libdir}/libktorrent.la
-%{_libdir}/libktorrent.so
-%{tde_libdir}/ktinfowidgetplugin.la
-%{tde_libdir}/ktinfowidgetplugin.so
-%{tde_libdir}/ktipfilterplugin.la
-%{tde_libdir}/ktipfilterplugin.so
-%{tde_libdir}/ktlogviewerplugin.la
-%{tde_libdir}/ktlogviewerplugin.so
-%{tde_libdir}/ktpartfileimportplugin.la
-%{tde_libdir}/ktpartfileimportplugin.so
-%{tde_libdir}/ktrssfeedplugin.la
-%{tde_libdir}/ktrssfeedplugin.so
-%{tde_libdir}/ktscanfolderplugin.la
-%{tde_libdir}/ktscanfolderplugin.so
-%{tde_libdir}/ktschedulerplugin.la
-%{tde_libdir}/ktschedulerplugin.so
-%{tde_libdir}/ktsearchplugin.la
-%{tde_libdir}/ktsearchplugin.so
-%{tde_libdir}/ktstatsplugin.la
-%{tde_libdir}/ktstatsplugin.so
-%{tde_libdir}/ktupnpplugin.la
-%{tde_libdir}/ktupnpplugin.so
-%{tde_libdir}/ktwebinterfaceplugin.la
-%{tde_libdir}/ktwebinterfaceplugin.so
-%{_datadir}/applications/kde/ktorrent.desktop
-%{_datadir}/apps/ktorrent
-%{_datadir}/config.kcfg/*.kcfg
-%{_datadir}/icons/hicolor/*/*/*.png
-%{_datadir}/icons/hicolor/*/*/*.svgz
-%{_datadir}/services/*.desktop
-%{_datadir}/servicetypes/ktorrentplugin.desktop
+%{tde_bindir}/ktcachecheck
+%{tde_bindir}/ktorrent
+%{tde_bindir}/ktshell
+%{tde_bindir}/kttorinfo
+%{tde_bindir}/ktupnptest
+%{tde_libdir}/libktorrent-%{version}.so
+%{tde_libdir}/libktorrent.la
+%{tde_tdelibdir}/ktinfowidgetplugin.la
+%{tde_tdelibdir}/ktinfowidgetplugin.so
+%{tde_tdelibdir}/ktipfilterplugin.la
+%{tde_tdelibdir}/ktipfilterplugin.so
+%{tde_tdelibdir}/ktlogviewerplugin.la
+%{tde_tdelibdir}/ktlogviewerplugin.so
+%{tde_tdelibdir}/ktpartfileimportplugin.la
+%{tde_tdelibdir}/ktpartfileimportplugin.so
+%{tde_tdelibdir}/ktrssfeedplugin.la
+%{tde_tdelibdir}/ktrssfeedplugin.so
+%{tde_tdelibdir}/ktscanfolderplugin.la
+%{tde_tdelibdir}/ktscanfolderplugin.so
+%{tde_tdelibdir}/ktschedulerplugin.la
+%{tde_tdelibdir}/ktschedulerplugin.so
+%{tde_tdelibdir}/ktsearchplugin.la
+%{tde_tdelibdir}/ktsearchplugin.so
+%{tde_tdelibdir}/ktstatsplugin.la
+%{tde_tdelibdir}/ktstatsplugin.so
+%{tde_tdelibdir}/ktupnpplugin.la
+%{tde_tdelibdir}/ktupnpplugin.so
+%{tde_tdelibdir}/ktwebinterfaceplugin.la
+%{tde_tdelibdir}/ktwebinterfaceplugin.so
+%{tde_tdeappdir}/ktorrent.desktop
+%{tde_datadir}/apps/ktorrent
+%{tde_datadir}/config.kcfg/*.kcfg
+%{tde_datadir}/icons/hicolor/*/*/*.png
+%{tde_datadir}/icons/hicolor/*/*/*.svgz
+%{tde_datadir}/services/*.desktop
+%{tde_datadir}/servicetypes/ktorrentplugin.desktop
 
 
 %Changelog
diff --git a/redhat/applications/kuickshow/kuickshow-3.5.13-missing_ldflags.patch b/redhat/applications/kuickshow/kuickshow-3.5.13-missing_ldflags.patch
new file mode 100644
index 000000000..8028d1941
--- /dev/null
+++ b/redhat/applications/kuickshow/kuickshow-3.5.13-missing_ldflags.patch
@@ -0,0 +1,11 @@
+--- kuickshow/kuickshow/src/Makefile.am.ORI	2012-08-06 11:35:57.271341272 +0200
++++ kuickshow/kuickshow/src/Makefile.am	2012-08-06 11:36:20.916830749 +0200
+@@ -10,7 +10,7 @@
+ METASOURCES = AUTO
+ 
+ kuickshow_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-kuickshow_la_LIBADD  = $(LIB_KDEPRINT) $(LIB_IMLIB)
++kuickshow_la_LIBADD  = $(LIB_KDEPRINT) $(LIB_IMLIB) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO)
+ kuickshow_la_SOURCES =	kuickshow.cpp \
+ 	aboutwidget.cpp     generalwidget.cpp  kuickconfigdlg.cpp  main.cpp \
+ 	defaultswidget.cpp  imagewindow.cpp    kuickdata.cpp  \
diff --git a/redhat/applications/kuickshow/trinity-kuickshow-3.5.12.spec b/redhat/applications/kuickshow/trinity-kuickshow-3.5.12.spec
index 307f9f0cc..bf7c79c3b 100644
--- a/redhat/applications/kuickshow/trinity-kuickshow-3.5.12.spec
+++ b/redhat/applications/kuickshow/trinity-kuickshow-3.5.12.spec
@@ -6,14 +6,14 @@
 # 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
+%define _docdir %{tde_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
+%define tde_includedir %{tde_includedir}/kde
+%define tde_libdir %{tde_libdir}/kde3
 
 
 Name:		trinity-%{kdecomp}
@@ -33,8 +33,8 @@ Source0:	%{kdecomp}-3.5.12.tar.gz
 Conflicts:	trinity-kdegraphics
 
 BuildRequires: tqtinterface-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
+BuildRequires: trinity-tdelibs-devel
+BuildRequires: trinity-tdebase-devel
 BuildRequires: desktop-file-utils
 BuildRequires: imlib-devel
 
@@ -53,19 +53,20 @@ Clicking on an image shows the image in its normal size.
 
 
 %build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
 	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt \
+    --with-extra-includes=%{tde_includedir}/tqt \
     --enable-closure
 
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %make_install
 
@@ -75,26 +76,26 @@ export PATH="%{_bindir}:${PATH}"
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
-%{_bindir}/*
-%{_datadir}/applications/*/*.desktop
-%{_datadir}/apps/*/
-%{tde_docdir}/HTML/en/*/
-%{_datadir}/icons/*/*/*/*
-%{_libdir}/libkdeinit_%{kdecomp}.so
-
-%exclude %{_libdir}/*.la
-%exclude %{_libdir}/*/*.so
-%exclude %{_libdir}/*/*.la
+%{tde_bindir}/*
+%{tde_datadir}/applications/*/*.desktop
+%{tde_datadir}/apps/*/
+%{tde_tdedocdir}/HTML/en/*/
+%{tde_datadir}/icons/*/*/*/*
+%{tde_libdir}/libkdeinit_%{kdecomp}.so
+
+%exclude %{tde_libdir}/*.la
+%exclude %{tde_libdir}/*/*.so
+%exclude %{tde_libdir}/*/*.la
 
 
 %Changelog
diff --git a/redhat/applications/kuickshow/trinity-kuickshow-3.5.13.spec b/redhat/applications/kuickshow/trinity-kuickshow-3.5.13.spec
index 88a8e2fec..aa01c55fb 100644
--- a/redhat/applications/kuickshow/trinity-kuickshow-3.5.13.spec
+++ b/redhat/applications/kuickshow/trinity-kuickshow-3.5.13.spec
@@ -2,16 +2,25 @@
 %define kdecomp kuickshow
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_datadir}/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/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-%{kdecomp}
@@ -38,10 +47,12 @@ Patch1:		bp001-28d9c774.diff
 Patch2:		bp002-bdeb8b3a.diff
 # [kuickshow] Remove inadvertent renaming [Commit #d97e403f] [Bug #863]
 Patch3:		bp003-d97e403f.diff
+# [kuickshow] Missing LDFLAGS cause FTBFS on Mageia / Mandriva
+Patch4:		kuickshow-3.5.13-missing_ldflags.patch
 
 BuildRequires: tqtinterface-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
+BuildRequires: trinity-tdelibs-devel
+BuildRequires: trinity-tdebase-devel
 BuildRequires: desktop-file-utils
 BuildRequires: imlib-devel
 
@@ -57,12 +68,13 @@ Clicking on an image shows the image in its normal size.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1 -b .ldflags
 
 # 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|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+  -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"
@@ -70,19 +82,27 @@ Clicking on an image shows the image in its normal size.
 
 
 %build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt \
-    --enable-closure
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --includedir=%{tde_tdeincludedir} \
+  --disable-rpath \
+  --with-extra-includes=%{tde_includedir}/tqt \
+  --enable-closure
 
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{?buildroot}
 
@@ -92,27 +112,27 @@ export PATH="%{_bindir}:${PATH}"
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 /sbin/ldconfig
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
-%{_bindir}/*
-%{_datadir}/applications/*/*.desktop
-%{_datadir}/apps/*/
-%{_datadir}/icons/hicolor/*/*/*
-%{_libdir}/lib[kt]deinit_%{kdecomp}.so
-%{_libdir}/*.la
-%{tde_libdir}/*.so
+%{tde_bindir}/*
+%{tde_datadir}/applications/*/*.desktop
+%{tde_datadir}/apps/*/
+%{tde_datadir}/icons/hicolor/*/*/*
+%{tde_libdir}/lib[kt]deinit_%{kdecomp}.so
 %{tde_libdir}/*.la
-%{tde_docdir}/HTML/en/*/
+%{tde_tdelibdir}/*.so
+%{tde_tdelibdir}/*.la
+%{tde_tdedocdir}/HTML/en/*/
 
 
 %Changelog
diff --git a/redhat/applications/kvirc/kvirc-3.5.13-directories.patch b/redhat/applications/kvirc/kvirc-3.5.13-directories.patch
index 021671fee..ab633568b 100644
--- a/redhat/applications/kvirc/kvirc-3.5.13-directories.patch
+++ b/redhat/applications/kvirc/kvirc-3.5.13-directories.patch
@@ -13,3 +13,14 @@
  	AC_SUBST(modulelibdir)
  
  	defscriptdir="\${globalkvircdir}/defscript"
+--- kvirc/configure.in.ORI	2012-08-06 13:48:54.586710376 +0200
++++ kvirc/configure.in	2012-08-06 13:50:31.344841522 +0200
+@@ -100,7 +100,7 @@
+ 
+ AC_SS_HEADER([Checking KDE])
+ 
+-SS_KDE_GENERAL_FILE_TO_SEARCH="include/kwin.h"
++SS_KDE_GENERAL_FILE_TO_SEARCH="include/kwin.h include/kde/kwin.h"
+ SS_KDE_INCLUDE_FILE_TO_SEARCH="kwin.h"
+ 
+ AC_SS_FIND_KDE
diff --git a/redhat/applications/kvirc/kvirc-3.5.13-fix_acinclude_m4.patch b/redhat/applications/kvirc/kvirc-3.5.13-fix_acinclude_m4.patch
index b06570d73..d838ce911 100644
--- a/redhat/applications/kvirc/kvirc-3.5.13-fix_acinclude_m4.patch
+++ b/redhat/applications/kvirc/kvirc-3.5.13-fix_acinclude_m4.patch
@@ -1,6 +1,5 @@
-diff -u a/acinclude.m4 b/acinclude.m4
---- a/acinclude.m4
-+++ b/acinclude.m4
+--- kvirc/admin/acinclude.m4.in.ORI	2012-08-06 12:20:40.350261853 +0200
++++ kvirc/admin/acinclude.m4.in	2012-08-06 12:21:34.061121107 +0200
 @@ -2149,7 +2149,7 @@
  	if test -n "$KDEDIR"; then
  		ss_kde_general_test_dirs="$KDEDIR $ss_kde_general_test_dirs"
@@ -19,48 +18,3 @@ diff -u a/acinclude.m4 b/acinclude.m4
  		SS_RPATH="$SS_RPATH -rpath $SS_OTHER_LIBDIRS"
  	fi
  
-diff -u a/admin/acinclude.m4.in b/admin/acinclude.m4.in
---- a/admin/acinclude.m4.in
-+++ b/admin/acinclude.m4.in
-@@ -2149,7 +2149,7 @@
- 	if test -n "$KDEDIR"; then
- 		ss_kde_general_test_dirs="$KDEDIR $ss_kde_general_test_dirs"
- 	fi
--	ss_kde_general_test_path_suffix="kde kde3.0 kde3 KDE Kde KDE3 kde3 ."
-+	ss_kde_general_test_path_suffix="trinity kde kde3.0 kde3 KDE Kde KDE3 kde3 ."
- 
- 	AC_SS_FIND_FILE_PATH_EXT($SS_KDE_GENERAL_FILE_TO_SEARCH,$ss_kde_general_test_dirs,$ss_kde_general_test_path_suffix,SS_KDE_GENERAL_DIR)
- 
-@@ -2524,7 +2524,7 @@
- 
- 	if test -n "$SS_OTHER_LIBDIRS"; then
- 		SS_LIBDIRS="$SS_LIBDIRS $SS_OTHER_LIBDIRS"
--		$SS_OTHER_LIBDIRS=`echo "$SS_OTHER_LIBDIRS" | sed -e s/-L//g`
-+		SS_OTHER_LIBDIRS=`echo "$SS_OTHER_LIBDIRS" | sed -e s/-L//g`
- 		SS_RPATH="$SS_RPATH -rpath $SS_OTHER_LIBDIRS"
- 	fi
- 
-diff -u a/src/modules/mediaplayer/Makefile.am b/src/modules/mediaplayer/Makefile.am
---- a/src/modules/mediaplayer/Makefile.am
-+++ b/src/modules/mediaplayer/Makefile.am
-@@ -10,7 +10,7 @@
- #%.moc: %.h
- #	$(SS_QT_MOC) $< -o $@
- 
--libkvimediaplayer_la_LDFLAGS = -avoid-version -module
-+libkvimediaplayer_la_LDFLAGS = -avoid-version -module $(SS_LDFLAGS) $(SS_LIBDIRS)
- 
- libkvimediaplayer_la_SOURCES = libkvimediaplayer.cpp \
- 		mp_amarokinterface.cpp \
-diff -u a/src/modules/torrent/Makefile.am b/src/modules/torrent/Makefile.am
---- a/src/modules/torrent/Makefile.am
-+++ b/src/modules/torrent/Makefile.am
-@@ -10,7 +10,7 @@
- #%.moc: %.h
- #	$(SS_QT_MOC) $< -o $@
- 
--libkvitorrent_la_LDFLAGS = -avoid-version -module
-+libkvitorrent_la_LDFLAGS = -avoid-version -module $(SS_LDFLAGS) $(SS_LIBDIRS)
- 
- libkvitorrent_la_SOURCES = libkvitorrent.cpp \
- 		tc_interface.cpp \
diff --git a/redhat/applications/kvirc/kvirc-3.5.13-missing_ldflags.patch b/redhat/applications/kvirc/kvirc-3.5.13-missing_ldflags.patch
new file mode 100644
index 000000000..55f2be2e7
--- /dev/null
+++ b/redhat/applications/kvirc/kvirc-3.5.13-missing_ldflags.patch
@@ -0,0 +1,22 @@
+--- kvirc/src/kvilib/build/Makefile.am.ORI	2012-08-06 12:13:32.982315876 +0200
++++ kvirc/src/kvilib/build/Makefile.am	2012-08-06 12:13:44.438073791 +0200
+@@ -9,7 +9,7 @@
+ 
+ lib_LTLIBRARIES      = libkvilib.la
+ libkvilib_la_LDFLAGS = $(SS_LDFLAGS) -version-info 3:0:0 $(SS_LIBDIRS)
+-libkvilib_la_LIBADD  = $(SS_LIBLINK)
++libkvilib_la_LIBADD  = $(SS_LIBLINK) -lkio -lDCOP
+ 
+ #
+ # Command useful to find out all the sources
+--- kvirc/src/kvirc/build/Makefile.am.ORI	2011-11-26 22:37:04.065565368 +0100
++++ kvirc/src/kvirc/build/Makefile.am	2011-11-26 22:37:17.139565032 +0100
+@@ -8,7 +8,7 @@
+ AM_CPPFLAGS = -I$(SS_TOPSRCDIR)/src/kvilib/include/ -I$(SS_TOPSRCDIR)/src/kvirc/include/ \
+ $(SS_INCDIRS) $(SS_CPPFLAGS) -DGLOBAL_KVIRC_DIR=\"$(globalkvircdir)\"
+ 
+-kvirc_LDFLAGS = -export-dynamic $(SS_LDFLAGS) $(SS_LIBDIRS) $(SS_RPATH)
++kvirc_LDFLAGS = -export-dynamic $(SS_LDFLAGS) $(SS_LIBDIRS) $(SS_RPATH) -lDCOP -lkdefx -lkio
+ kvirc_LDADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la
+ 
+ bin_PROGRAMS = kvirc
diff --git a/redhat/applications/kvirc/trinity-kvirc.spec b/redhat/applications/kvirc/trinity-kvirc-3.5.13.spec
index 4da540dee..b41ead906 100644
--- a/redhat/applications/kvirc/trinity-kvirc.spec
+++ b/redhat/applications/kvirc/trinity-kvirc-3.5.13.spec
@@ -1,26 +1,32 @@
 # Default version for this component
 %define kdecomp kvirc
-%define version 3.4.0
-%define release 2
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_datadir}/doc
-%define _mandir %{_datadir}/man
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/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-%{kdecomp}
 Summary:	Trinity based next generation IRC client with module support
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	3.4.0
+Release:	2%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -29,7 +35,7 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://kvirc.net/
 
-Prefix:    %{_prefix}
+Prefix:    %{tde_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
@@ -56,10 +62,10 @@ Patch8:		bp006-51bbe9e5.diff
 Patch9:		bp007-a24a8595.diff
 # [kvirc] Fix "acinclude.m4" file [Bug #980]
 Patch10:	kvirc-3.5.13-fix_acinclude_m4.patch
-    
+
 BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-kdelibs-devel
-BuildRequires:	trinity-kdebase-devel
+BuildRequires:	trinity-tdelibs-devel
+BuildRequires:	trinity-tdebase-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
@@ -121,14 +127,14 @@ with the K Desktop Environment version 3.
 # 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|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
+  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
 
 # Hardcoded absolute PATH to KDEDIR in source code ! That sucks !
 %__sed -i "src/kvirc/kernel/kvi_app_fs.cpp" \
-  -e "s|/opt/kde3/lib|%{_prefix}/%{_lib}|g"
+  -e "s|/opt/kde3/lib|%{tde_prefix}/%{_lib}|g"
 %__sed -i "src/kvirc/kernel/kvi_app_setup.cpp" \
-  -e "s|/opt/kde3|%{_prefix}|g"
+  -e "s|/opt/kde3|%{tde_prefix}|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"
@@ -136,20 +142,32 @@ with the K Desktop Environment version 3.
 
 
 %build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
-export KDEDIR=%{_prefix}
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
+export KDEDIR=%{tde_prefix}
+
+#export CXXFLAGS="${CXXFLAGS} -I%{tde_includedir} -lqt-mt"
 
 %configure \
-	--disable-rpath \
-	--with-fno-rtti --with-aa-fonts --with-big-channels \
-	--enable-perl --with-pic --enable-wall \
-	--with-ix86-asm \
-	--with-qt-moc=%{_bindir}/tmoc \
-	--with-extra-includes=%{_includedir}/tqt \
-	--with-kde-services-dir=%{_datadir}/services \
-	--with-kde-library-dir=%{_libdir} \
-	--with-kde-include-dir=%{_includedir}
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --includedir=%{tde_tdeincludedir} \
+  --disable-rpath \
+  --with-fno-rtti --with-aa-fonts --with-big-channels \
+  --enable-perl --with-pic --enable-wall \
+  --with-ix86-asm \
+  --with-extra-includes=%{tde_includedir}/tqt:%{tde_includedir} \
+  --with-kde-services-dir=%{tde_datadir}/services \
+  --with-kde-library-dir=%{tde_libdir} \
+  --with-kde-include-dir=%{tde_tdeincludedir} \
+  --with-qt-library-dir=${QTLIB} \
+  --with-qt-include-dir=${QTINC} \
+  --with-qt-moc=${QTDIR}/bin/moc
 
 # Symbolic links must exist prior to parallel building
 %__make symlinks -C src/kvilib/build
@@ -159,14 +177,14 @@ export KDEDIR=%{_prefix}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
 # Debian maintainer has renamed 'COPYING' file to 'EULA', so we do the same ...
 %__mv \
-  %{?buildroot}%{_datadir}/kvirc/3.4/license/COPYING \
-  %{?buildroot}%{_datadir}/kvirc/3.4/license/EULA
+  %{?buildroot}%{tde_datadir}/kvirc/3.4/license/COPYING \
+  %{?buildroot}%{tde_datadir}/kvirc/3.4/license/EULA
 
 %clean
 %__rm -rf %{buildroot}
@@ -174,41 +192,41 @@ export PATH="%{_bindir}:${PATH}"
 
 %post
 /sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 %postun
 /sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog FAQ README TODO
-%{_bindir}/kvirc
-%{_libdir}/*.so.*
-%{_libdir}/kvirc/*/modules/*.so
+%{tde_bindir}/kvirc
+%{tde_libdir}/*.so.*
+%{tde_libdir}/kvirc/*/modules/*.so
 
 %files data
 %defattr(-,root,root,-)
-%{_bindir}/kvi_run_netscape
-%{_bindir}/kvi_search_help
-%{_libdir}/kvirc/*/modules/caps/
-%{_datadir}/applnk/Internet/kvirc.desktop
-%{_datadir}/icons/hicolor/*
-%{_datadir}/kvirc
-%{_datadir}/mimelnk/text/*.desktop
-%{_datadir}/services/*.protocol
-%{_mandir}/man1/kvirc.1
+%{tde_bindir}/kvi_run_netscape
+%{tde_bindir}/kvi_search_help
+%{tde_libdir}/kvirc/*/modules/caps/
+%{tde_datadir}/applnk/Internet/kvirc.desktop
+%{tde_datadir}/icons/hicolor/*
+%{tde_datadir}/kvirc
+%{tde_datadir}/mimelnk/text/*.desktop
+%{tde_datadir}/services/*.protocol
+%{tde_mandir}/man1/kvirc.1
 
 %files devel
 %defattr(-,root,root,-)
-%{_bindir}/kvirc-config
-%{_includedir}/kvirc/
-%{_libdir}/*.la
-%{_libdir}/*.so
-%{_libdir}/kvirc/*/modules/*.la
+%{tde_bindir}/kvirc-config
+%{tde_includedir}/kvirc/
+%{tde_libdir}/*.la
+%{tde_libdir}/*.so
+%{tde_libdir}/kvirc/*/modules/*.la
 
 
 %Changelog
diff --git a/redhat/applications/kvkbd/trinity-kvkbd.spec b/redhat/applications/kvkbd/trinity-kvkbd.spec
index 110cbbb9e..cd5159319 100644
--- a/redhat/applications/kvkbd/trinity-kvkbd.spec
+++ b/redhat/applications/kvkbd/trinity-kvkbd.spec
@@ -1,25 +1,32 @@
 # Default version for this component
 %define kdecomp kvkbd
-%define version 0.4.8
-%define release 1
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_datadir}/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/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-%{kdecomp}
 Summary:	Virtual keyboard for KDE [Trinity]
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	0.4.8
+Release:	1%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/System
@@ -28,14 +35,14 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://pan4os.info/main/index.php
 
-Prefix:		%{_prefix}
+Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
 
 BuildRequires: tqtinterface-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
+BuildRequires: trinity-tdelibs-devel
+BuildRequires: trinity-tdebase-devel
 BuildRequires: desktop-file-utils
 
 
@@ -50,8 +57,8 @@ a systray widget as well as a dockwidget.
 # 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|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+  -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"
@@ -60,19 +67,26 @@ a systray widget as well as a dockwidget.
 
 %build
 unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt \
-    --enable-closure
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --includedir=%{tde_tdeincludedir} \
+  --disable-rpath \
+  --with-extra-includes=%{tde_includedir}/tqt \
+  --enable-closure
     
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
@@ -82,23 +96,22 @@ export PATH="%{_bindir}:${PATH}"
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{_bindir}/kvkbd
-%{_datadir}/applnk/Utilities/kvkbd.desktop
-%{_datadir}/apps/kvkbd/pics/dock.png
-%{_datadir}/apps/kvkbd/pics/tray.png
-%{_datadir}/icons/hicolor/16x16/apps/kvkbd.png
-%{_datadir}/icons/hicolor/32x32/apps/kvkbd.png
+%{tde_bindir}/kvkbd
+%{tde_datadir}/applnk/Utilities/kvkbd.desktop
+%{tde_datadir}/apps/kvkbd/pics/dock.png
+%{tde_datadir}/apps/kvkbd/pics/tray.png
+%{tde_datadir}/icons/hicolor/*/apps/kvkbd.png
 
 
 %Changelog
diff --git a/redhat/applications/kwin-style-crystal/trinity-kwin-style-crystal-3.5.12.spec b/redhat/applications/kwin-style-crystal/trinity-kwin-style-crystal-3.5.12.spec
index feb901d13..624249bf0 100644
--- a/redhat/applications/kwin-style-crystal/trinity-kwin-style-crystal-3.5.12.spec
+++ b/redhat/applications/kwin-style-crystal/trinity-kwin-style-crystal-3.5.12.spec
@@ -6,14 +6,14 @@
 # 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
+%define _docdir %{tde_prefix}/share/doc
 %endif
 
 # TDE 3.5.13 specific building variables
 BuildRequires: autoconf automake libtool m4
 %define tde_docdir %{_docdir}
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/kde3
+%define tde_includedir %{tde_includedir}/kde
+%define tde_libdir %{tde_libdir}/kde3
 
 
 Name:		trinity-%{kdecomp}
@@ -28,14 +28,14 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org/
 
-Prefix:    %{_prefix}
+Prefix:    %{tde_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.12.tar.gz
 
 BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-kdelibs-devel
-BuildRequires:	trinity-kdebase-devel
+BuildRequires:	trinity-tdelibs-devel
+BuildRequires:	trinity-tdebase-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
@@ -56,7 +56,7 @@ And it is of course nice to look at. Upstream says:
 # 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,%{_includedir}/tqt,g"
+  -e "s,/usr/include/tqt,%{tde_includedir}/tqt,g"
 
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
 %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
@@ -65,18 +65,18 @@ sed -i admin/acinclude.m4.in \
 
 %build
 unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
 	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt
+    --with-extra-includes=%{tde_includedir}/tqt
 
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
@@ -86,22 +86,22 @@ export PATH="%{_bindir}:${PATH}"
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
-%{tde_libdir}/kwin3_crystal.la
-%{tde_libdir}/kwin3_crystal.so
-%{tde_libdir}/kwin_crystal_config.la
-%{tde_libdir}/kwin_crystal_config.so
-%{_datadir}/apps/kwin/crystal.desktop
+%{tde_tdelibdir}/kwin3_crystal.la
+%{tde_tdelibdir}/kwin3_crystal.so
+%{tde_tdelibdir}/kwin_crystal_config.la
+%{tde_tdelibdir}/kwin_crystal_config.so
+%{tde_datadir}/apps/kwin/crystal.desktop
 
 
 %Changelog
diff --git a/redhat/applications/kwin-style-crystal/trinity-kwin-style-crystal-3.5.13.spec b/redhat/applications/kwin-style-crystal/trinity-kwin-style-crystal-3.5.13.spec
index fdfe31fbc..0febc8eb1 100644
--- a/redhat/applications/kwin-style-crystal/trinity-kwin-style-crystal-3.5.13.spec
+++ b/redhat/applications/kwin-style-crystal/trinity-kwin-style-crystal-3.5.13.spec
@@ -1,25 +1,32 @@
 # Default version for this component
 %define kdecomp kwin-style-crystal
-%define version 1.0.5
-%define release 1
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_datadir}/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/kde
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_tdedocdir}
 
 
 Name:		trinity-%{kdecomp}
 Summary:	Semi transparant window decoration for Trinity.
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	1.0.5
+Release:	1%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -28,14 +35,14 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org/
 
-Prefix:    %{_prefix}
+Prefix:    %{tde_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
 
 BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-kdelibs-devel
-BuildRequires:	trinity-kdebase-devel
+BuildRequires:	trinity-tdelibs-devel
+BuildRequires:	trinity-tdebase-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
@@ -56,8 +63,8 @@ And it is of course nice to look at. Upstream says:
 # 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|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+  -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"
@@ -66,18 +73,25 @@ And it is of course nice to look at. Upstream says:
 
 %build
 unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --includedir=%{tde_includedir} \
+  --disable-rpath \
+  --with-extra-includes=%{tde_includedir}/tqt
 
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
@@ -90,11 +104,11 @@ export PATH="%{_bindir}:${PATH}"
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
-%{tde_libdir}/kwin3_crystal.la
-%{tde_libdir}/kwin3_crystal.so
-%{tde_libdir}/kwin_crystal_config.la
-%{tde_libdir}/kwin_crystal_config.so
-%{_datadir}/apps/kwin/crystal.desktop
+%{tde_tdelibdir}/kwin3_crystal.la
+%{tde_tdelibdir}/kwin3_crystal.so
+%{tde_tdelibdir}/kwin_crystal_config.la
+%{tde_tdelibdir}/kwin_crystal_config.so
+%{tde_datadir}/apps/kwin/crystal.desktop
 
 
 %Changelog
diff --git a/redhat/applications/piklab/trinity-piklab.spec b/redhat/applications/piklab/trinity-piklab.spec
index f1ccb45be..93fd28370 100644
--- a/redhat/applications/piklab/trinity-piklab.spec
+++ b/redhat/applications/piklab/trinity-piklab.spec
@@ -1,26 +1,32 @@
 # Default version for this component
 %define kdecomp piklab
-%define version 0.15.2
-%define release 3
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_datadir}/doc
-%define _mandir %{_datadir}/man
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/kde
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_tdedocdir}
 
 
 Name:		trinity-%{kdecomp}
 Summary:	IDE for PIC-microcontroller development [Trinity]
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	0.15.2
+Release:	3%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -29,7 +35,7 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org/
 
-Prefix:    %{_prefix}
+Prefix:    %{tde_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
@@ -38,8 +44,8 @@ Source0:	%{kdecomp}-3.5.13.tar.gz
 Patch1:		piklab-3.5.13-fix_gcc47_compilation.patch
 
 BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-kdelibs-devel
-BuildRequires:	trinity-kdebase-devel
+BuildRequires:	trinity-tdelibs-devel
+BuildRequires:	trinity-tdebase-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
@@ -62,8 +68,8 @@ are supported. A command-line programmer and debugger are also available.
 # 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|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+  -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"
@@ -71,23 +77,31 @@ are supported. A command-line programmer and debugger are also available.
 
 
 %build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --includedir=%{tde_includedir} \
+  --disable-rpath \
+  --with-extra-includes=%{tde_includedir}/tqt
 
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
 # Incorrect extension on manpage
-%__mv -f %{buildroot}%{_mandir}/man1/piklab.1x %{buildroot}%{_mandir}/man1/piklab.1
+%__mv -f %{buildroot}%{tde_mandir}/man1/piklab.1x %{buildroot}%{tde_mandir}/man1/piklab.1
 
 %find_lang %{kdecomp}
 
@@ -96,33 +110,35 @@ export PATH="%{_bindir}:${PATH}"
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+update-desktop-database %{tde_appdir} > /dev/null
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+update-desktop-database %{tde_appdir} > /dev/null
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 
 %files -f %{kdecomp}.lang
 %defattr(-,root,root,-)
-%{_bindir}/piklab
-%{_bindir}/piklab-coff
-%{_bindir}/piklab-hex
-%{_bindir}/piklab-prog
-%{_datadir}/applications/kde/piklab.desktop
-%{_datadir}/apps/katepart/syntax/asm-pic.xml
-%{_datadir}/apps/katepart/syntax/coff-c-pic.xml
-%{_datadir}/apps/katepart/syntax/coff-pic.xml
-%{_datadir}/apps/katepart/syntax/jal-pic.xml
-%{_datadir}/apps/piklab
-%{tde_docdir}/HTML/en/piklab
-%{_datadir}/icons/hicolor/*/*/*.png
-%{_datadir}/mimelnk/application/x-piklab.desktop
-%{_mandir}/man1/piklab-coff.1
-%{_mandir}/man1/piklab-hex.1
-%{_mandir}/man1/piklab-prog.1
-%{_mandir}/man1/piklab.1
+%{tde_bindir}/piklab
+%{tde_bindir}/piklab-coff
+%{tde_bindir}/piklab-hex
+%{tde_bindir}/piklab-prog
+%{tde_tdeappdir}/piklab.desktop
+%{tde_datadir}/apps/katepart/syntax/asm-pic.xml
+%{tde_datadir}/apps/katepart/syntax/coff-c-pic.xml
+%{tde_datadir}/apps/katepart/syntax/coff-pic.xml
+%{tde_datadir}/apps/katepart/syntax/jal-pic.xml
+%{tde_datadir}/apps/piklab
+%{tde_tdedocdir}/HTML/en/piklab
+%{tde_datadir}/icons/hicolor/*/*/*.png
+%{tde_datadir}/mimelnk/application/x-piklab.desktop
+%{tde_mandir}/man1/piklab-coff.1
+%{tde_mandir}/man1/piklab-hex.1
+%{tde_mandir}/man1/piklab-prog.1
+%{tde_mandir}/man1/piklab.1
 
 
 %Changelog
diff --git a/redhat/applications/potracegui/trinity-potracegui.spec b/redhat/applications/potracegui/trinity-potracegui.spec
index 96c5c8da0..a90649337 100644
--- a/redhat/applications/potracegui/trinity-potracegui.spec
+++ b/redhat/applications/potracegui/trinity-potracegui.spec
@@ -1,25 +1,32 @@
 # Default version for this component
 %define kdecomp potracegui
-%define version 1.3
-%define release 1
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_datadir}/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/kde
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_tdedocdir}
 
 
 Name:		trinity-%{kdecomp}
 Summary:	KDE frontend for potrace [Trinity]
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	1.3
+Release:	1%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Multimedia
@@ -28,14 +35,14 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://potracegui.sourceforge.net
 
-Prefix:		%{_prefix}
+Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
 
 BuildRequires: tqtinterface-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
+BuildRequires: trinity-tdelibs-devel
+BuildRequires: trinity-tdebase-devel
 BuildRequires: desktop-file-utils
 
 
@@ -47,14 +54,13 @@ remote files (web, ftp, ...) is also supported.
 
 
 %prep
-unset QTDIR; . /etc/profile.d/qt.sh
 %setup -q -n applications/%{kdecomp}
 
 # 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|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+  -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"
@@ -62,19 +68,27 @@ unset QTDIR; . /etc/profile.d/qt.sh
 
 
 %build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt \
-    --enable-closure
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --includedir=%{tde_includedir} \
+  --disable-rpath \
+  --with-extra-includes=%{tde_includedir}/tqt \
+  --enable-closure
    
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
@@ -84,26 +98,26 @@ export PATH="%{_bindir}:${PATH}"
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{_bindir}/potracegui
-%{_datadir}/applnk/Utilities/potracegui.desktop
-%{_datadir}/apps/potracegui/potraceguiui.rc
-%{tde_docdir}/HTML/en/potracegui/common
-%{tde_docdir}/HTML/en/potracegui/index.cache.bz2
-%{tde_docdir}/HTML/en/potracegui/index.docbook
-%{_datadir}/icons/hicolor/16x16/apps/potracegui.png
-%{_datadir}/icons/hicolor/32x32/apps/potracegui.png
-%lang(de) %{_datadir}/locale/de/LC_MESSAGES/potracegui.mo
+%{tde_bindir}/potracegui
+%{tde_datadir}/applnk/Utilities/potracegui.desktop
+%{tde_datadir}/apps/potracegui/potraceguiui.rc
+%{tde_tdedocdir}/HTML/en/potracegui/common
+%{tde_tdedocdir}/HTML/en/potracegui/index.cache.bz2
+%{tde_tdedocdir}/HTML/en/potracegui/index.docbook
+%{tde_datadir}/icons/hicolor/16x16/apps/potracegui.png
+%{tde_datadir}/icons/hicolor/32x32/apps/potracegui.png
+%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/potracegui.mo
 
 
 %Changelog
diff --git a/redhat/applications/rosegarden/rosegarden-3.5.13-missing_ldflags.patch b/redhat/applications/rosegarden/rosegarden-3.5.13-missing_ldflags.patch
new file mode 100644
index 000000000..f4e7d4b98
--- /dev/null
+++ b/redhat/applications/rosegarden/rosegarden-3.5.13-missing_ldflags.patch
@@ -0,0 +1,15 @@
+--- rosegarden/src/CMakeLists.txt.ORI	2012-08-06 15:14:11.135307943 +0200
++++ rosegarden/src/CMakeLists.txt	2012-08-06 15:14:13.950244825 +0200
+@@ -150,11 +150,11 @@
+ TARGET_LINK_LIBRARIES(rosegarden
+     dl
+     lo
++    ${XFT_LIBS}
+     ${QT_AND_KDECORE_LIBS} 
+     ${LIBLO_LIBS}
+     ${LRDF_LIBS}
+     ${FFTW3F_LIBS}
+-    ${XFT_LIBS}
+     ${LIRC_LIBS}
+     ${JACK_LIBS}
+     kio
diff --git a/redhat/applications/rosegarden/trinity-rosegarden-3.5.13-sru.spec b/redhat/applications/rosegarden/trinity-rosegarden-3.5.13-sru.spec
new file mode 100644
index 000000000..be4ca0f1f
--- /dev/null
+++ b/redhat/applications/rosegarden/trinity-rosegarden-3.5.13-sru.spec
@@ -0,0 +1,208 @@
+# Default version for this component
+%define kdecomp rosegarden
+
+# 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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/kde
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_tdedocdir}
+
+
+Name:		trinity-%{kdecomp}
+Summary:	music editor and MIDI/audio sequencer [Trinity]
+Version:	1.7.0
+Release:	3%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group: 	    Applications/Multimedia
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.rosegardenmusic.com/
+
+Prefix:    %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+
+# [rosegarden] Version 3.5.13-sru
+Patch0:		rosegarden-3.5.13-sru-20120806.patch
+# [rosegarden] Missing LDFLAGS cause FTBFS
+Patch1:		rosegarden-3.5.13-missing_ldflags.patch
+
+BuildRequires:	tqtinterface-devel
+BuildRequires:	trinity-tdelibs-devel
+BuildRequires:	trinity-tdebase-devel
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	fftw-devel
+BuildRequires:	dssi-devel
+BuildRequires:	liblo-devel
+BuildRequires:	liblrdf-devel
+BuildRequires:	fontconfig-devel
+
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}jack-devel
+%else
+BuildRequires:	jack-audio-connection-kit-devel
+%endif
+
+Requires:	lilypond
+Requires:	perl-XML-Twig
+Requires:	libsndfile-utils
+
+# LIRC does not exist on RHEL.
+%if 0%{?fedora} > 0
+BuildRequires:	lirc-devel
+%endif
+
+Requires:	%{name}-data == %{version}-%{release}
+
+%description
+Rosegarden is a KDE application which provides a mixed Audio/MIDI
+sequencer (for playback and recording), a multi-track editor, music
+editing using both piano-roll and score notation, MIDI file IO,
+lilypond and Csound files export, etc.
+
+%package data
+Group: 	    Applications/Multimedia
+Requires:	%{name} == %{version}-%{release}
+Summary:	music editor and MIDI/audio sequencer data files [Trinity]
+
+%description data
+Rosegarden is a KDE application which provides a mixed Audio/MIDI
+sequencer (for playback and recording), a multi-track editor, music
+editing using both piano-roll and score notation, MIDI file IO,
+lilypond and Csound files export, etc.
+
+This package provides the data files necessary for running Rosegarden
+
+
+%prep
+%setup -q -n applications/%{kdecomp}
+%patch0 -p1
+%patch1 -p1
+
+# Hard-coded path to TQT binaries spotted !!!
+%__sed -i CMakeLists.txt \
+	-e "s|/usr/bin/uic-tqt|%{tde_bindir}/uic-tqt|g" \
+	-e "s|/usr/bin/tmoc|%{tde_bindir}/tmoc|g" \
+	-e "s|/usr/include/tqt|%{tde_includedir}/tqt|g"
+
+%build
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
+export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt:%{tde_tdeincludedir}"
+
+# Enables "messages" (debug)
+%__sed -i CMakeLists.txt -e "s|#MESSAGE|MESSAGE|g"
+
+%if 0%{?rhel} || 0%{?fedora}
+%__mkdir_p build
+cd build
+%endif
+
+%cmake \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  -DCMAKE_SKIP_RPATH="OFF" \
+  -DWANT_DEBUG=OFF \
+  -DWANT_FULLDBG=OFF \
+  -DWANT_SOUND=ON \
+  -DWANT_JACK=ON \
+  -DWANT_DSSI=ON \
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+  -DWANT_LIRC=ON \
+%else
+  -DWANT_LIRC=OFF \
+%endif
+  -DWANT_PCH=OFF \
+  -DWANT_TEST=OFF \
+  -DBUILD_ALL=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make VERBOSE=1
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+
+%find_lang %{kdecomp}
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+update-desktop-database %{tde_appdir} > /dev/null
+for f in hicolor locolor; do
+  touch --no-create %{tde_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
+done
+
+%postun
+update-desktop-database %{tde_appdir} > /dev/null
+for f in hicolor locolor; do
+  touch --no-create %{tde_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
+done
+
+
+%files
+%defattr(-,root,root,-)
+%{tde_bindir}/rosegarden
+%{tde_bindir}/rosegarden-audiofile-importer
+%{tde_bindir}/rosegarden-lilypondview
+%{tde_bindir}/rosegarden-project-package
+%{tde_bindir}/rosegardensequencer
+
+%files data -f %{kdecomp}.lang
+%defattr(-,root,root,-)
+%{tde_tdeappdir}/rosegarden.desktop
+%{tde_datadir}/apps/profiles/rosegarden.profile.xml
+%lang(en) %{tde_tdedocdir}/HTML/en/rosegarden
+%lang(es) %{tde_tdedocdir}/HTML/es/rosegarden
+%lang(ja) %{tde_tdedocdir}/HTML/ja/rosegarden
+%lang(sv) %{tde_tdedocdir}/HTML/sv/rosegarden
+%{tde_datadir}/apps/rosegarden
+%{tde_datadir}/icons/hicolor/*/*/*
+%{tde_datadir}/icons/locolor/*/*/*
+%{tde_datadir}/mimelnk/audio/x-rosegarden-device.desktop
+%{tde_datadir}/mimelnk/audio/x-rosegarden.desktop
+%{tde_datadir}/mimelnk/audio/x-rosegarden21.desktop
+%{tde_datadir}/mimelnk/audio/x-soundfont.desktop
+
+
+%Changelog
+* Mon Aug 06 2012 Francois Andriot <francois.andriot@free.fr> - 1.7.0-3
+- Switch to branch 3.5.13-sru
+ 
+* Sun Apr 06 2012 Francois Andriot <francois.andriot@free.fr> - 1.7.0-2
+- Updated to build with gcc 4.7. [Commit #15276f36]
+- Enables JACK support
+
+* Sat Nov 26 2011 Francois Andriot <francois.andriot@free.fr> - 1.7.0-1
+- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/rosegarden/trinity-rosegarden-3.5.13.spec b/redhat/applications/rosegarden/trinity-rosegarden-3.5.13.spec
new file mode 100644
index 000000000..9ef78c80a
--- /dev/null
+++ b/redhat/applications/rosegarden/trinity-rosegarden-3.5.13.spec
@@ -0,0 +1,221 @@
+# Default version for this component
+%define kdecomp rosegarden
+
+# Required for Mageia 2: removes the ldflag '--no-undefined'
+%define _disable_ld_no_undefined 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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/kde
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_tdedocdir}
+
+
+Name:		trinity-%{kdecomp}
+Summary:	music editor and MIDI/audio sequencer [Trinity]
+Version:	1.7.0
+Release:	2%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group: 	    Applications/Multimedia
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.rosegardenmusic.com/
+
+Prefix:    %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+
+Patch0:		rosegarden-3.5.13-ftbfs.patch
+
+# [rosegarden] Updated to build with gcc 4.7. [Commit #15276f36]
+Patch1:		rosegarden-3.5.13-fix_gcc47_compilation.patch
+
+# [rosegarden] Updated to build with gcc 4.7. [Bug #958]
+Patch2:		rosegarden-3.5.13-fix_gcc47_compilation_2.patch
+
+BuildRequires:	tqtinterface-devel
+BuildRequires:	trinity-tdelibs-devel
+BuildRequires:	trinity-tdebase-devel
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	fftw-devel
+BuildRequires:	dssi-devel
+BuildRequires:	liblo-devel
+BuildRequires:	liblrdf-devel
+BuildRequires:	fontconfig-devel
+
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}jack-devel
+%else
+BuildRequires:	jack-audio-connection-kit-devel
+%endif
+
+Requires:	lilypond
+Requires:	perl-XML-Twig
+
+%if 0%{?mgaversion} || 0%{?mdkversion}
+Requires:	libsndfile-progs
+%else
+%if 0%{?rhel}
+Requires:	libsndfile
+%else
+Requires:	libsndfile-utils
+%endif
+%endif
+
+# LIRC does not exist on RHEL.
+%if 0%{?fedora} > 0
+BuildRequires:	lirc-devel
+%endif
+
+Requires:	%{name}-data == %{version}-%{release}
+
+%description
+Rosegarden is a KDE application which provides a mixed Audio/MIDI
+sequencer (for playback and recording), a multi-track editor, music
+editing using both piano-roll and score notation, MIDI file IO,
+lilypond and Csound files export, etc.
+
+%package data
+Group: 	    Applications/Multimedia
+Requires:	%{name} == %{version}-%{release}
+Summary:	music editor and MIDI/audio sequencer data files [Trinity]
+
+%description data
+Rosegarden is a KDE application which provides a mixed Audio/MIDI
+sequencer (for playback and recording), a multi-track editor, music
+editing using both piano-roll and score notation, MIDI file IO,
+lilypond and Csound files export, etc.
+
+This package provides the data files necessary for running Rosegarden
+
+
+%prep
+%setup -q -n applications/%{kdecomp}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+
+# Hard-coded path to TQT binaries spotted !!!
+%__sed -i CMakeLists.txt \
+	-e "s|/usr/bin/uic-tqt|%{tde_bindir}/uic-tqt|g" \
+	-e "s|/usr/bin/tmoc|%{tde_bindir}/tmoc|g" \
+	-e "s|/usr/include/tqt|%{tde_includedir}/tqt|g"
+
+%build
+unset QTDIR && . %{_sysconfdir}/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
+export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt:%{tde_tdeincludedir}"
+
+%if 0%{?rhel} || 0%{?fedora}
+%__mkdir_p build
+cd build
+%endif
+
+### FIXME FIXME FIXME !!! FTBFS on Mageia 2 / Mandriva 2011
+export LDFLAGS="${LDFLAGS} -lXft -lfontconfig -lkio -lkdeprint -llrdf -lfftw3f -llirc_client -ljack"
+
+%cmake \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  -DCMAKE_SKIP_RPATH="OFF" \
+  -DWANT_DEBUG=OFF \
+  -DWANT_FULLDBG=OFF \
+  -DWANT_SOUND=ON \
+  -DWANT_JACK=ON \
+  -DWANT_DSSI=ON \
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+  -DWANT_LIRC=ON \
+%else
+  -DWANT_LIRC=OFF \
+%endif
+  -DWANT_PCH=OFF \
+  -DWANT_TEST=OFF \
+  -DBUILD_ALL=ON \
+  ..
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+
+%find_lang %{kdecomp}
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+update-desktop-database %{tde_appdir} > /dev/null
+for f in hicolor locolor; do
+  touch --no-create %{tde_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
+done
+
+%postun
+update-desktop-database %{tde_appdir} > /dev/null
+for f in hicolor locolor; do
+  touch --no-create %{tde_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
+done
+
+
+%files
+%defattr(-,root,root,-)
+%{tde_bindir}/rosegarden
+%{tde_bindir}/rosegarden-audiofile-importer
+%{tde_bindir}/rosegarden-lilypondview
+%{tde_bindir}/rosegarden-project-package
+%{tde_bindir}/rosegardensequencer
+
+%files data -f %{kdecomp}.lang
+%defattr(-,root,root,-)
+%{tde_tdeappdir}/rosegarden.desktop
+%{tde_datadir}/apps/profiles/rosegarden.profile.xml
+%lang(en) %{tde_tdedocdir}/HTML/en/rosegarden
+%lang(es) %{tde_tdedocdir}/HTML/es/rosegarden
+%lang(ja) %{tde_tdedocdir}/HTML/ja/rosegarden
+%lang(sv) %{tde_tdedocdir}/HTML/sv/rosegarden
+%{tde_datadir}/apps/rosegarden
+%{tde_datadir}/icons/hicolor/*/*/*
+%{tde_datadir}/icons/locolor/*/*/*
+%{tde_datadir}/mimelnk/audio/x-rosegarden-device.desktop
+%{tde_datadir}/mimelnk/audio/x-rosegarden.desktop
+%{tde_datadir}/mimelnk/audio/x-rosegarden21.desktop
+%{tde_datadir}/mimelnk/audio/x-soundfont.desktop
+
+
+%Changelog
+* Sun Apr 06 2012 Francois Andriot <francois.andriot@free.fr> - 1.7.0-2
+- Updated to build with gcc 4.7. [Commit #15276f36]
+- Enables JACK support
+
+* Sat Nov 26 2011 Francois Andriot <francois.andriot@free.fr> - 1.7.0-1
+- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/rosegarden/trinity-rosegarden.spec b/redhat/applications/rosegarden/trinity-rosegarden.spec
deleted file mode 100644
index e7c45d260..000000000
--- a/redhat/applications/rosegarden/trinity-rosegarden.spec
+++ /dev/null
@@ -1,183 +0,0 @@
-# Default version for this component
-%define kdecomp rosegarden
-%define version 1.7.0
-%define release 2
-
-# 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 %{_datadir}/doc
-%endif
-
-# TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
-
-
-Name:		trinity-%{kdecomp}
-Summary:	music editor and MIDI/audio sequencer [Trinity]
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group: 	    Applications/Multimedia
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.rosegardenmusic.com/
-
-Prefix:    %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-Patch0:		rosegarden-3.5.13-ftbfs.patch
-
-# [rosegarden] Updated to build with gcc 4.7. [Commit #15276f36]
-Patch1:		rosegarden-3.5.13-fix_gcc47_compilation.patch
-
-# [rosegarden] Updated to build with gcc 4.7. [Bug #958]
-Patch2:		rosegarden-3.5.13-fix_gcc47_compilation_2.patch
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-kdelibs-devel
-BuildRequires:	trinity-kdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	fftw-devel
-BuildRequires:	dssi-devel
-BuildRequires:	liblo-devel
-BuildRequires:	liblrdf-devel
-BuildRequires:	fontconfig-devel
-BuildRequires:	jack-audio-connection-kit-devel
-
-Requires:	lilypond
-Requires:	perl-XML-Twig
-Requires:	libsndfile-utils
-
-# LIRC does not exist on RHEL.
-%if 0%{?fedora} > 0
-BuildRequires:	lirc-devel
-%endif
-
-Requires:	%{name}-data == %{version}-%{release}
-
-%description
-Rosegarden is a KDE application which provides a mixed Audio/MIDI
-sequencer (for playback and recording), a multi-track editor, music
-editing using both piano-roll and score notation, MIDI file IO,
-lilypond and Csound files export, etc.
-
-%package data
-Group: 	    Applications/Multimedia
-Requires:	%{name} == %{version}-%{release}
-Summary:	music editor and MIDI/audio sequencer data files [Trinity]
-
-%description data
-Rosegarden is a KDE application which provides a mixed Audio/MIDI
-sequencer (for playback and recording), a multi-track editor, music
-editing using both piano-roll and score notation, MIDI file IO,
-lilypond and Csound files export, etc.
-
-This package provides the data files necessary for running Rosegarden
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-
-# Hard-coded path to TQT binaries spotted !!!
-%__sed -i CMakeLists.txt \
-	-e "s|/usr/bin/uic-tqt|%{_bindir}/uic-tqt|g" \
-	-e "s|/usr/bin/tmoc|%{_bindir}/tmoc|g" \
-	-e "s|/usr/include/tqt|%{_includedir}/tqt|g"
-
-%build
-unset QTDIR && . %{_sysconfdir}/profile.d/qt.sh
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
-export CMAKE_INCLUDE_PATH="%{_includedir}:%{_includedir}/tqt"
-
-%__mkdir_p build
-cd build
-%cmake \
-	-DWANT_DEBUG=OFF \
-	-DWANT_FULLDBG=OFF \
-	-DWANT_SOUND=ON \
-	-DWANT_JACK=ON \
-	-DWANT_DSSI=ON \
-%if 0%{?fedora} > 0
-	-DWANT_LIRC=ON \
-%else
-	-DWANT_LIRC=OFF \
-%endif
-	-DWANT_PCH=OFF \
-	-DWANT_TEST=OFF \
- 	-DBUILD_ALL=ON \
-	..
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-
-%find_lang %{kdecomp}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in hicolor locolor; do
-  touch --no-create %{_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
-done
-
-%postun
-for f in hicolor locolor; do
-  touch --no-create %{_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
-done
-
-
-%files
-%defattr(-,root,root,-)
-%{_bindir}/rosegarden
-%{_bindir}/rosegarden-audiofile-importer
-%{_bindir}/rosegarden-lilypondview
-%{_bindir}/rosegarden-project-package
-%{_bindir}/rosegardensequencer
-
-%files data -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%{_datadir}/applications/kde/rosegarden.desktop
-%{_datadir}/apps/profiles/rosegarden.profile.xml
-%lang(en) %{tde_docdir}/HTML/en/rosegarden
-%lang(es) %{tde_docdir}/HTML/es/rosegarden
-%lang(ja) %{tde_docdir}/HTML/ja/rosegarden
-%lang(sv) %{tde_docdir}/HTML/sv/rosegarden
-%{_datadir}/apps/rosegarden
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/icons/locolor/*/*/*
-%{_datadir}/mimelnk/audio/x-rosegarden-device.desktop
-%{_datadir}/mimelnk/audio/x-rosegarden.desktop
-%{_datadir}/mimelnk/audio/x-rosegarden21.desktop
-%{_datadir}/mimelnk/audio/x-soundfont.desktop
-
-
-%Changelog
-* Sun Apr 06 2012 Francois Andriot <francois.andriot@free.fr> - 1.7.0-2
-- Updated to build with gcc 4.7. [Commit #15276f36]
-- Enables JACK support
-
-* Sat Nov 26 2011 Francois Andriot <francois.andriot@free.fr> - 1.7.0-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/smartcardauth/trinity-smartcardauth.spec b/redhat/applications/smartcardauth/trinity-smartcardauth.spec
index c4416109b..9cbfc6941 100644
--- a/redhat/applications/smartcardauth/trinity-smartcardauth.spec
+++ b/redhat/applications/smartcardauth/trinity-smartcardauth.spec
@@ -1,25 +1,32 @@
 # Default version for this component
 %define kdecomp smartcardauth
-%define version 1.0
-%define release 1
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_datadir}/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/kde
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_tdedocdir}
 
 
 Name:		trinity-%{kdecomp}
 Summary:	SmartCard Login and LUKS Decrypt, Setup Utility
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	1.0
+Release:	1%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/System
@@ -28,19 +35,23 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org/
 
-Prefix:		%{_prefix}
+Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
 Patch0:		smartcardauth-3.5.13-ftbfs.patch
 
 BuildRequires: tqtinterface-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
+BuildRequires: trinity-tdelibs-devel
+BuildRequires: trinity-tdebase-devel
 BuildRequires: desktop-file-utils
 
 #BuildRequires:	perl-PAR-Packer
+%if 0%{?mgaversion} || 0%{?mdkversion}
+Requires:		perl-pcsc-perl
+%else
 Requires:		pcsc-perl
+%endif
 
 %description
 This utility will allow you to set up your computer to accept a SmartCard as an authentication source for:
@@ -65,28 +76,28 @@ unset QTDIR; . /etc/profile.d/qt.sh
 # Ugly hack to modify TQT include directory inside autoconf files.
 # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
 %__sed -i "src/Makefile" \
-	-e "s|/usr/include/tqt|%{_includedir}/tqt|g" \
+	-e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
 	-e "s|/usr/include/qt3|${QTINC}|g"
 
 %__sed -i "Makefile" \
 	-e "s|/usr/lib/perl5/Chipcard|/usr/lib64/perl5/vendor_perl/Chipcard|g"
 
 %build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 ./build_ckpasswd
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 
-%__install -D -m 755 scriptor_standalone.pl %{buildroot}%{_bindir}/scriptor.pl
-%__install -D -m 755 src/ckpasswd %{buildroot}%{_bindir}/smartauthckpasswd
-#%__install -D -m 755 src/ckpasswd %{buildroot}%{_bindir}/smartauthmon
-%__ln_s smartauthckpasswd %{buildroot}%{_bindir}/smartauthmon
-%__cp -Rp usr/*  %{buildroot}%{_prefix}
+%__install -D -m 755 scriptor_standalone.pl %{buildroot}%{tde_bindir}/scriptor.pl
+%__install -D -m 755 src/ckpasswd %{buildroot}%{tde_bindir}/smartauthckpasswd
+#%__install -D -m 755 src/ckpasswd %{buildroot}%{tde_bindir}/smartauthmon
+%__ln_s smartauthckpasswd %{buildroot}%{tde_bindir}/smartauthmon
+%__cp -Rp usr/*  %{buildroot}%{tde_prefix}
 
 %__mkdir_p %{buildroot}%{_sysconfdir}
 %__cp -Rp etc/* %{buildroot}%{_sysconfdir}
@@ -97,12 +108,14 @@ export PATH="%{_bindir}:${PATH}"
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+update-desktop-database %{tde_appdir} > /dev/null
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+update-desktop-database %{tde_appdir} > /dev/null
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 
 %files
@@ -111,18 +124,18 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %{_sysconfdir}/init/smartauthlogin.conf
 %{_sysconfdir}/smartauth/smartauth.sh.in
 %{_sysconfdir}/smartauth/smartauthmon.sh.in
-%{_bindir}/cryptosmartcard.sh
-%{_bindir}/scriptor.pl
-%{_bindir}/setupcard.sh
-%{_bindir}/setupslavecard.sh
-%{_bindir}/smartauth.sh
-%{_bindir}/smartauthckpasswd
-%{_bindir}/smartauthmon
-%{_datadir}/applications/smartcardauth.desktop
-%{_datadir}/applications/smartcardrestrict.desktop
-%{_datadir}/icons/hicolor/16x16/apps/smartcardauth.png
-%{_datadir}/icons/hicolor/32x32/apps/smartcardauth.png
-%{_datadir}/initramfs-tools/hooks/cryptlukssc
+%{tde_bindir}/cryptosmartcard.sh
+%{tde_bindir}/scriptor.pl
+%{tde_bindir}/setupcard.sh
+%{tde_bindir}/setupslavecard.sh
+%{tde_bindir}/smartauth.sh
+%{tde_bindir}/smartauthckpasswd
+%{tde_bindir}/smartauthmon
+%{tde_datadir}/applications/smartcardauth.desktop
+%{tde_datadir}/applications/smartcardrestrict.desktop
+%{tde_datadir}/icons/hicolor/16x16/apps/smartcardauth.png
+%{tde_datadir}/icons/hicolor/32x32/apps/smartcardauth.png
+%{tde_datadir}/initramfs-tools/hooks/cryptlukssc
 
 
 %Changelog
diff --git a/redhat/applications/smb4k/trinity-smb4k.spec b/redhat/applications/smb4k/trinity-smb4k.spec
index dc355edfe..23ba5ba87 100644
--- a/redhat/applications/smb4k/trinity-smb4k.spec
+++ b/redhat/applications/smb4k/trinity-smb4k.spec
@@ -1,25 +1,32 @@
 # Default version for this component
 %define kdecomp smb4k
-%define version 0.9.4
-%define release 2
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_datadir}/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/kde
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_tdedocdir}
 
 
 Name:		trinity-%{kdecomp}
 Summary:	A Samba (SMB) share advanced browser for Trinity
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	0.9.4
+Release:	2%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -28,7 +35,7 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org
 
-Prefix:    %{_prefix}
+Prefix:    %{tde_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
@@ -38,8 +45,8 @@ Patch1:		smb4k-3.5.13-fix_gcc47_compilation.patch
 
 BuildRequires:	tqtinterface-devel
 BuildRequires:	trinity-arts-devel
-BuildRequires:	trinity-kdelibs-devel
-BuildRequires:	trinity-kdebase-devel
+BuildRequires:	trinity-tdelibs-devel
+BuildRequires:	trinity-tdebase-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
@@ -50,6 +57,74 @@ suite to access the SMB shares of the local network neighborhood. Its purpose
 is to provide a program that's easy to use and has as many features as 
 possible.
 
+%files -f %{kdecomp}.lang
+%defattr(-,root,root,-)
+%{tde_bindir}/smb4k
+%{tde_bindir}/smb4k_cat
+%{tde_bindir}/smb4k_kill
+%{tde_bindir}/smb4k_mount
+%{tde_bindir}/smb4k_mv
+%{tde_bindir}/smb4k_umount
+%{tde_libdir}/libsmb4kcore.so.2
+%{tde_libdir}/libsmb4kcore.so.2.0.0
+%{tde_libdir}/libsmb4kdialogs.la
+%{tde_libdir}/libsmb4kdialogs.so
+%{tde_tdelibdir}/konqsidebar_smb4k.la
+%{tde_tdelibdir}/konqsidebar_smb4k.so
+%{tde_tdelibdir}/libsmb4kconfigdialog.la
+%{tde_tdelibdir}/libsmb4kconfigdialog.so
+%{tde_tdelibdir}/libsmb4knetworkbrowser.la
+%{tde_tdelibdir}/libsmb4knetworkbrowser.so
+%{tde_tdelibdir}/libsmb4ksearchdialog.la
+%{tde_tdelibdir}/libsmb4ksearchdialog.so
+%{tde_tdelibdir}/libsmb4ksharesiconview.la
+%{tde_tdelibdir}/libsmb4ksharesiconview.so
+%{tde_tdelibdir}/libsmb4kshareslistview.la
+%{tde_tdelibdir}/libsmb4kshareslistview.so
+%{tde_tdeappdir}/smb4k.desktop
+%{tde_datadir}/apps/konqsidebartng/add/smb4k_add.desktop
+%{tde_datadir}/apps/smb4k/smb4k_shell.rc
+%{tde_datadir}/apps/smb4knetworkbrowserpart/smb4knetworkbrowser_part.rc
+%{tde_datadir}/apps/smb4ksharesiconviewpart/smb4ksharesiconview_part.rc
+%{tde_datadir}/apps/smb4kshareslistviewpart/smb4kshareslistview_part.rc
+%{tde_datadir}/config.kcfg/smb4k.kcfg
+%{tde_datadir}/icons/crystalsvg/*/apps/smb4k.png
+%{tde_tdedocdir}/HTML/en/smb4k/
+
+%post
+update-desktop-database %{tde_appdir} > /dev/null
+touch --no-create %{tde_datadir}/icons/crystalsvg || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
+/sbin/ldconfig || :
+
+%postun
+update-desktop-database %{tde_appdir} > /dev/null
+touch --no-create %{tde_datadir}/icons/crystalsvg || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
+/sbin/ldconfig || :
+
+##########
+
+%package devel
+Summary:		Development files for %{name}
+Group:			Development/Libraries
+Requires:		%{name} = %{version}-%{release}
+
+%description devel
+%{summary}
+
+%files devel
+%{tde_tdeincludedir}/*.h
+%{tde_libdir}/libsmb4kcore.la
+%{tde_libdir}/libsmb4kcore.so
+
+%post devel
+/sbin/ldconfig || :
+
+%postun devel
+/sbin/ldconfig || :
+
+##########
 
 %prep
 %setup -q -n applications/%{kdecomp}
@@ -58,8 +133,8 @@ possible.
 # 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|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+  -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"
@@ -67,82 +142,37 @@ possible.
 
 
 %build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --includedir=%{tde_tdeincludedir} \
+  --disable-rpath \
+  --with-extra-includes=%{tde_includedir}/tqt
 
 # SMP safe !
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
-
+%find_lang %{kdecomp}
 
 
 %clean
 %__rm -rf %{buildroot}
 
 
-%post
-touch --no-create %{_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
-/sbin/ldconfig || :
-
-%postun
-touch --no-create %{_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
-/sbin/ldconfig || :
-
-
-%files
-%defattr(-,root,root,-)
-%{_bindir}/smb4k
-%{_bindir}/smb4k_cat
-%{_bindir}/smb4k_kill
-%{_bindir}/smb4k_mount
-%{_bindir}/smb4k_mv
-%{_bindir}/smb4k_umount
-%{_includedir}/*.h
-%{_libdir}/libsmb4kcore.la
-%{_libdir}/libsmb4kcore.so
-%{_libdir}/libsmb4kcore.so.2
-%{_libdir}/libsmb4kcore.so.2.0.0
-%{_libdir}/libsmb4kdialogs.la
-%{_libdir}/libsmb4kdialogs.so
-%{tde_libdir}/konqsidebar_smb4k.la
-%{tde_libdir}/konqsidebar_smb4k.so
-%{tde_libdir}/libsmb4kconfigdialog.la
-%{tde_libdir}/libsmb4kconfigdialog.so
-%{tde_libdir}/libsmb4knetworkbrowser.la
-%{tde_libdir}/libsmb4knetworkbrowser.so
-%{tde_libdir}/libsmb4ksearchdialog.la
-%{tde_libdir}/libsmb4ksearchdialog.so
-%{tde_libdir}/libsmb4ksharesiconview.la
-%{tde_libdir}/libsmb4ksharesiconview.so
-%{tde_libdir}/libsmb4kshareslistview.la
-%{tde_libdir}/libsmb4kshareslistview.so
-%{_datadir}/applications/kde/smb4k.desktop
-%{_datadir}/apps/konqsidebartng/add/smb4k_add.desktop
-%{_datadir}/apps/smb4k/smb4k_shell.rc
-%{_datadir}/apps/smb4knetworkbrowserpart/smb4knetworkbrowser_part.rc
-%{_datadir}/apps/smb4ksharesiconviewpart/smb4ksharesiconview_part.rc
-%{_datadir}/apps/smb4kshareslistviewpart/smb4kshareslistview_part.rc
-%{_datadir}/config.kcfg/smb4k.kcfg
-%{tde_docdir}/HTML/en/smb4k
-%{_datadir}/icons/crystalsvg/*/apps/smb4k.png
-%lang(de) %{_datadir}/locale/de/LC_MESSAGES/smb4k.mo
-%lang(es) %{_datadir}/locale/es/LC_MESSAGES/smb4k.mo
-%lang(it) %{_datadir}/locale/it/LC_MESSAGES/smb4k.mo
-%lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/smb4k.mo
-%lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/smb4k.mo
-%lang(uk) %{_datadir}/locale/uk/LC_MESSAGES/smb4k.mo
 
 
 %Changelog
diff --git a/redhat/applications/soundkonverter/trinity-soundkonverter.spec b/redhat/applications/soundkonverter/trinity-soundkonverter.spec
index 28817fc21..5cfc41054 100644
--- a/redhat/applications/soundkonverter/trinity-soundkonverter.spec
+++ b/redhat/applications/soundkonverter/trinity-soundkonverter.spec
@@ -1,25 +1,32 @@
 # Default version for this component
 %define kdecomp soundkonverter
-%define version 0.3.8
-%define release 1
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_datadir}/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/kde
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_tdedocdir}
 
 
 Name:		trinity-%{kdecomp}
 Summary:	audio converter frontend for Trinity
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	0.3.8
+Release:	1%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Application/Multimedia
@@ -28,14 +35,14 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://potracegui.sourceforge.net
 
-Prefix:		%{_prefix}
+Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
 
 BuildRequires: tqtinterface-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
+BuildRequires: trinity-tdelibs-devel
+BuildRequires: trinity-tdebase-devel
 BuildRequires: desktop-file-utils
 
 
@@ -71,14 +78,13 @@ See the 'soundkonverter-trinity' package for more information.
 
 
 %prep
-unset QTDIR; . /etc/profile.d/qt.sh
 %setup -q -n applications/%{kdecomp}
 
 # 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|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+  -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"
@@ -86,19 +92,27 @@ unset QTDIR; . /etc/profile.d/qt.sh
 
 
 %build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt:/usr/include/cdda \
-    --enable-closure
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --includedir=%{tde_includedir} \
+  --disable-rpath \
+  --with-extra-includes=%{tde_includedir}/tqt:/usr/include/cdda \
+  --enable-closure
    
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
@@ -109,46 +123,48 @@ export PATH="%{_bindir}:${PATH}"
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+update-desktop-database %{tde_appdir} > /dev/null
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+update-desktop-database %{tde_appdir} > /dev/null
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 
 %files -f %{kdecomp}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{_bindir}/soundkonverter
-%{_bindir}/userscript.sh
-%{_datadir}/applications/kde/soundkonverter.desktop
-%{_datadir}/apps/konqueror/servicemenus/audiocd_extract_with_soundkonverter.desktop
-%{_datadir}/apps/soundkonverter
-%exclude %{_datadir}/apps/soundkonverter/amarokscript/README
-%exclude %{_datadir}/apps/soundkonverter/amarokscript/soundKonverter.rb
-%{tde_docdir}/HTML/en/soundkonverter/common
-%{tde_docdir}/HTML/en/soundkonverter/index.cache.bz2
-%{tde_docdir}/HTML/en/soundkonverter/index.docbook
-%{_datadir}/icons/hicolor/*/apps/soundkonverter*.png
-%{_datadir}/mimelnk/application/x-la.soundkonverter.desktop
-%{_datadir}/mimelnk/application/x-ofc.soundkonverter.desktop
-%{_datadir}/mimelnk/application/x-ofr.soundkonverter.desktop
-%{_datadir}/mimelnk/application/x-ofs.soundkonverter.desktop
-%{_datadir}/mimelnk/application/x-shorten.soundkonverter.desktop
-%{_datadir}/mimelnk/audio/amr.soundkonverter.desktop
-%{_datadir}/mimelnk/audio/x-ape.soundkonverter.desktop
-%{_datadir}/mimelnk/audio/x-bonk.soundkonverter.desktop
-%{_datadir}/mimelnk/audio/x-pac.soundkonverter.desktop
-%{_datadir}/mimelnk/audio/x-tta.soundkonverter.desktop
-%{_datadir}/mimelnk/audio/x-wavpack-correction.soundkonverter.desktop
-%{_datadir}/mimelnk/audio/x-wavpack.soundkonverter.desktop
-%{_datadir}/mimelnk/video/x-flv.soundkonverter.desktop
+%{tde_bindir}/soundkonverter
+%{tde_bindir}/userscript.sh
+%{tde_tdeappdir}/soundkonverter.desktop
+%{tde_datadir}/apps/konqueror/servicemenus/audiocd_extract_with_soundkonverter.desktop
+%{tde_datadir}/apps/soundkonverter
+%exclude %{tde_datadir}/apps/soundkonverter/amarokscript/README
+%exclude %{tde_datadir}/apps/soundkonverter/amarokscript/soundKonverter.rb
+%{tde_tdedocdir}/HTML/en/soundkonverter/common
+%{tde_tdedocdir}/HTML/en/soundkonverter/index.cache.bz2
+%{tde_tdedocdir}/HTML/en/soundkonverter/index.docbook
+%{tde_datadir}/icons/hicolor/*/apps/soundkonverter*.png
+%{tde_datadir}/mimelnk/application/x-la.soundkonverter.desktop
+%{tde_datadir}/mimelnk/application/x-ofc.soundkonverter.desktop
+%{tde_datadir}/mimelnk/application/x-ofr.soundkonverter.desktop
+%{tde_datadir}/mimelnk/application/x-ofs.soundkonverter.desktop
+%{tde_datadir}/mimelnk/application/x-shorten.soundkonverter.desktop
+%{tde_datadir}/mimelnk/audio/amr.soundkonverter.desktop
+%{tde_datadir}/mimelnk/audio/x-ape.soundkonverter.desktop
+%{tde_datadir}/mimelnk/audio/x-bonk.soundkonverter.desktop
+%{tde_datadir}/mimelnk/audio/x-pac.soundkonverter.desktop
+%{tde_datadir}/mimelnk/audio/x-tta.soundkonverter.desktop
+%{tde_datadir}/mimelnk/audio/x-wavpack-correction.soundkonverter.desktop
+%{tde_datadir}/mimelnk/audio/x-wavpack.soundkonverter.desktop
+%{tde_datadir}/mimelnk/video/x-flv.soundkonverter.desktop
 
 %files amarok
 %defattr(-,root,root,-)
-%{_datadir}/apps/soundkonverter/amarokscript/README
-%{_datadir}/apps/soundkonverter/amarokscript/soundKonverter.rb
+%{tde_datadir}/apps/soundkonverter/amarokscript/README
+%{tde_datadir}/apps/soundkonverter/amarokscript/soundKonverter.rb
 
 
 %Changelog
diff --git a/redhat/applications/tellico/tellico-3.5.13-fix_not_a_string_literal_error.patch b/redhat/applications/tellico/tellico-3.5.13-fix_not_a_string_literal_error.patch
new file mode 100644
index 000000000..5e93fd7d8
--- /dev/null
+++ b/redhat/applications/tellico/tellico-3.5.13-fix_not_a_string_literal_error.patch
@@ -0,0 +1,31 @@
+--- tellico/src/translators/btparse/bibtex_ast.c.ORI	2012-08-06 15:44:03.978791275 +0200
++++ tellico/src/translators/btparse/bibtex_ast.c	2012-08-06 15:44:23.449376138 +0200
+@@ -57,7 +57,7 @@
+ void dump_ast (char *msg, AST *root)
+ {
+    if (msg != NULL)
+-      printf (msg);
++      printf ("%s", msg);
+    dump (root, 0);
+    printf ("\n");
+ }
+--- tellico/src/translators/btparse/error.c.ORI	2012-08-06 15:44:38.954046066 +0200
++++ tellico/src/translators/btparse/error.c	2012-08-06 15:45:08.152425553 +0200
+@@ -88,7 +88,7 @@
+ 
+    if (err->filename)
+    {
+-      fprintf (stderr, err->filename);
++      fprintf (stderr, "%s", err->filename);
+       something_printed = TRUE;
+    }
+    if (err->line > 0)                   /* going to print a line number? */
+@@ -111,7 +111,7 @@
+    {
+       if (something_printed)
+          fprintf (stderr, ", ");
+-      fprintf (stderr, name);
++      fprintf (stderr, "%s", name);
+       something_printed = TRUE;
+    }
+ 
diff --git a/redhat/applications/tellico/tellico.xpm b/redhat/applications/tellico/tellico.xpm
deleted file mode 100644
index 589d66eeb..000000000
--- a/redhat/applications/tellico/tellico.xpm
+++ /dev/null
@@ -1,62 +0,0 @@
-/* XPM */
-static char *tellico[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 24 1",
-"  c #000404",
-". c #062625",
-"X c #01354A",
-"o c #165536",
-"O c #1C6056",
-"+ c #5E0507",
-"@ c #52545F",
-"# c #1E5F9D",
-"$ c #2B7ACF",
-"% c #57B35E",
-"& c #288FF2",
-"* c #3486D1",
-"= c #67ADB3",
-"- c #A12223",
-"; c #FD7070",
-": c #E35555",
-"> c #B84A4A",
-", c #90F592",
-"< c #FA8B8C",
-"1 c #DC9F9F",
-"2 c #FEFEFE",
-"3 c #D6D8D4",
-"4 c #ABB5B7",
-"5 c None",
-/* pixels */
-"55555555555555555555555555555555",
-"55555555555555555++5555555555555",
-"55555555555555+++:>+++5555555555",
-"55555555555+++><<;;<<>+++5555555",
-"55555555+++><<<<<;;;;;;;>+++5555",
-"55555+++>1<<<<;;;<;;;;:;:;;>+++5",
-"5555 +>1<<<<<<<;;;;;;;:;;;;:;>+ ",
-"5555+-:>><<<<;<;<;;;:;;::;;>>>+ ",
-"5555+>;;:--:;<;<;;;;;;;::><22>  ",
-"5555+:<;;;;:>-><<;;:::><222221  ",
-"5555+><<<<;;;::->>::;32222222>+5",
-"55XXX-;;<<<<<;;;:-322222222221+ ",
-"XX*==-::;;;<<<<<;>22222222231-+ ",
-"XO##*&@+->::;<;<<>2222222;>++   ",
-"X#&&$##*#@--::;;<>2223<--++    5",
-"X&&&&&$$##*#@+-:;-21>-+@4@  5555",
-"X$&&&&&&&$###$#.+--+@1432@ 55555",
-"X#&&&&&&&&&&$#32214432222=. 5555",
-"XX$&&&&&&&&&&#22222222224#X.. 55",
-"5XXX#&$&&&&&&422222224=OXo@%O. 5",
-"555.XXO$$$&&&=22223*#Xooo%%=O. 5",
-"555X,,%OX##$&#23=#ooo@o%%322%  5",
-"555.,,,,%%OXO##OXo%%%%322222@ 55",
-"555.%,,,,,,,%Ooo%O%322222222@ 55",
-"555.%,,,,,,,,,,%O22222222222%. 5",
-"555.o%%,,,,,,,,%%2222222224%X. 5",
-"5555..oO%,,,,,,,3222222,%oX..  5",
-"555555 ..oO%,,,,=2223%O...    55",
-"555555555 ..oO%,%3%Oo..    55555",
-"555555555555 ..ooXo.    55555555",
-"555555555555555..    55555555555",
-"55555555555555555555555555555555"
-};
diff --git a/redhat/applications/tellico/trinity-tellico.spec b/redhat/applications/tellico/trinity-tellico.spec
index 5eec6996b..575a0b426 100644
--- a/redhat/applications/tellico/trinity-tellico.spec
+++ b/redhat/applications/tellico/trinity-tellico.spec
@@ -1,25 +1,32 @@
 # Default version for this component
 %define kdecomp tellico
-%define version 1.3.2.1
-%define release 3
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_datadir}/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/kde
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_tdedocdir}
 
 
 Name:		trinity-%{kdecomp}
 Summary:	Icollection manager for books, videos, music [Trinity]
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	1.3.2.1
+Release:	3%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -28,7 +35,7 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://periapsis.org/tellico/
 
-Prefix:    %{_prefix}
+Prefix:    %{tde_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
@@ -36,10 +43,13 @@ Source0:	%{kdecomp}-3.5.13.tar.gz
 
 # [tellico] Fix compilation with GCC 4.7 [Bug #958]
 Patch1:		tellico-3.5.13-fix_gcc47_compilation.patch
+# [tellico] Fix "not a string literal" error
+Patch2:		tellico-3.5.13-fix_not_a_string_literal_error.patch
+
 
 BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-kdelibs-devel
-BuildRequires:	trinity-kdebase-devel
+BuildRequires:	trinity-tdelibs-devel
+BuildRequires:	trinity-tdebase-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
@@ -108,12 +118,13 @@ as a separate package which can be updated through debian-volatile.
 %prep
 %setup -q -n applications/%{kdecomp}
 %patch1 -p1
+%patch2 -p1
 
 # 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|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+  -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"
@@ -121,27 +132,35 @@ as a separate package which can be updated through debian-volatile.
 
 
 %build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --includedir=%{tde_includedir} \
+  --disable-rpath \
+  --with-extra-includes=%{tde_includedir}/tqt
 
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
 # Add svg icons to xdg directories
-%__install -D -c -p -m 644 -T icons/tellico.svg %{?buildroot}%{_datadir}/icons/hicolor/scalable/apps/tellico.svg
-%__install -D -c -p -m 644 -T icons/tellico_mime.svg %{?buildroot}%{_datadir}/icons/hicolor/scalable/mimetypes/application-x-tellico.svg
+%__install -D -c -p -m 644 -T icons/tellico.svg %{?buildroot}%{tde_datadir}/icons/hicolor/scalable/apps/tellico.svg
+%__install -D -c -p -m 644 -T icons/tellico_mime.svg %{?buildroot}%{tde_datadir}/icons/hicolor/scalable/mimetypes/application-x-tellico.svg
 
 # Remove  dead symlink from French translation
-%__rm %{?buildroot}%{tde_docdir}/HTML/fr/tellico/common
+%__rm %{?buildroot}%{tde_tdedocdir}/HTML/fr/tellico/common
 
 
 %find_lang %{kdecomp}
@@ -152,48 +171,48 @@ export PATH="%{_bindir}:${PATH}"
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 
 %files -f %{kdecomp}.lang
 %defattr(-,root,root,-)
-%{_bindir}/tellico
-#%{_datadir}/pixmaps
-%{_datadir}/applications
-%{_datadir}/config/tellicorc
+%{tde_bindir}/tellico
+#%{tde_datadir}/pixmaps
+%{tde_datadir}/applications
+%{tde_datadir}/config/tellicorc
 
 %files data
 %defattr(-,root,root,-)
-%{_datadir}/apps/tellico/*.xsl
-%{_datadir}/apps/tellico/*.xml
-%{_datadir}/apps/tellico/*.png
-%{_datadir}/apps/tellico/entry-templates
-%{_datadir}/apps/tellico/*.py*
-%{_datadir}/apps/tellico/pics
-%{_datadir}/apps/tellico/report-templates
-%{_datadir}/apps/tellico/tellico.dtd
-%{_datadir}/apps/tellico/tellico.tips
-%{_datadir}/apps/tellico/tellico2html.js
-%{_datadir}/apps/tellico/tellicoui.rc
-%{_datadir}/apps/tellico/welcome.html
-%{_datadir}/config.kcfg
-%{tde_docdir}/HTML/*/tellico/
-%{_datadir}/icons
-%{_datadir}/apps/mime
-%{_datadir}/mimelnk
-%{_datadir}/apps/kconf_update/tellico-1-3-update.pl
-%{_datadir}/apps/kconf_update/tellico-rename.upd
-%{_datadir}/apps/kconf_update/tellico.upd
+%{tde_datadir}/apps/tellico/*.xsl
+%{tde_datadir}/apps/tellico/*.xml
+%{tde_datadir}/apps/tellico/*.png
+%{tde_datadir}/apps/tellico/entry-templates
+%{tde_datadir}/apps/tellico/*.py*
+%{tde_datadir}/apps/tellico/pics
+%{tde_datadir}/apps/tellico/report-templates
+%{tde_datadir}/apps/tellico/tellico.dtd
+%{tde_datadir}/apps/tellico/tellico.tips
+%{tde_datadir}/apps/tellico/tellico2html.js
+%{tde_datadir}/apps/tellico/tellicoui.rc
+%{tde_datadir}/apps/tellico/welcome.html
+%{tde_datadir}/config.kcfg
+%{tde_tdedocdir}/HTML/*/tellico/
+%{tde_datadir}/icons
+%{tde_datadir}/apps/mime
+%{tde_datadir}/mimelnk
+%{tde_datadir}/apps/kconf_update/tellico-1-3-update.pl
+%{tde_datadir}/apps/kconf_update/tellico-rename.upd
+%{tde_datadir}/apps/kconf_update/tellico.upd
 
 %files scripts
 %defattr(-,root,root,-)
-%{_datadir}/apps/tellico/data-sources
-%{_datadir}/apps/tellico/z3950-servers.cfg
+%{tde_datadir}/apps/tellico/data-sources
+%{tde_datadir}/apps/tellico/z3950-servers.cfg
 
 
 %Changelog
diff --git a/redhat/applications/wlassistant/trinity-wlassistant.spec b/redhat/applications/wlassistant/trinity-wlassistant.spec
index 71fc95bce..7c8130a21 100644
--- a/redhat/applications/wlassistant/trinity-wlassistant.spec
+++ b/redhat/applications/wlassistant/trinity-wlassistant.spec
@@ -1,25 +1,32 @@
 # Default version for this component
 %define kdecomp wlassistant
-%define version 0.5.7
-%define release 1
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_datadir}/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/kde
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_tdedocdir}
 
 
 Name:		trinity-%{kdecomp}
 Summary:	User friendly KDE frontend for wireless network connection [Trinity]
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	0.5.7
+Release:	1%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -28,14 +35,14 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://wlassistant.sourceforge.net/
 
-Prefix:    %{_prefix}
+Prefix:    %{tde_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
 
 BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-kdelibs-devel
-BuildRequires:	trinity-kdebase-devel
+BuildRequires:	trinity-tdelibs-devel
+BuildRequires:	trinity-tdebase-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
@@ -56,31 +63,31 @@ remembered so next time the user won't have to enter them again.
 # Ugly hack to modify TQT include directory inside SCONS files.
 # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
 %__sed -i bksys/kde.py \
-  -e "s|/usr/include/tqt|%{_includedir}/tqt|g"
+  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g"
 
 
 %build
 unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 scons configure \
-  prefix=%{_prefix} \
-  execprefix=%{_bindir} \
-  libdir=%{_libdir} \
+  prefix=%{tde_prefix} \
+  execprefix=%{tde_bindir} \
+  libdir=%{tde_libdir} \
   qtdir=${QTDIR} \
-  kdedir=%{_prefix} \
-  kdeincludes=%{_includedir} \
+  kdedir=%{tde_prefix} \
+  kdeincludes=%{tde_tdeincludedir} \
   qtincludes=${QTINC} \
-  kdelibs=%{_libdir} \
+  kdelibs=%{tde_libdir} \
   qtlibs=${QTLIB} \
-  extraincludes=%{_includedir}:%{_includedir}/tqt:${QTINC}
+  extraincludes=%{tde_includedir}:%{tde_includedir}/tqt:${QTINC}
 
 scons -j4
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 scons install DESTDIR=%{buildroot}
 
@@ -89,31 +96,31 @@ scons install DESTDIR=%{buildroot}
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog VERSION
-%{_bindir}/wlassistant
-%{_datadir}/applnk/Utilities/wlassistant.desktop
-%{_datadir}/icons/hicolor/16x16/apps/wlassistant.png
-%{_datadir}/icons/hicolor/32x32/apps/wlassistant.png
-%lang(ar) %{_datadir}/locale/ar/LC_MESSAGES/wlassistant.mo
-%lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/wlassistant.mo
-%lang(es) %{_datadir}/locale/es/LC_MESSAGES/wlassistant.mo
-%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/wlassistant.mo
-%lang(nb) %{_datadir}/locale/nb/LC_MESSAGES/wlassistant.mo
-%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/wlassistant.mo
-%lang(pt) %{_datadir}/locale/pt_BR/LC_MESSAGES/wlassistant.mo
-%lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/wlassistant.mo
-%lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/wlassistant.mo
-%lang(zh_TW) %{_datadir}/locale/zh_TW/LC_MESSAGES/wlassistant.mo
+%{tde_bindir}/wlassistant
+%{tde_datadir}/applnk/Utilities/wlassistant.desktop
+%{tde_datadir}/icons/hicolor/16x16/apps/wlassistant.png
+%{tde_datadir}/icons/hicolor/32x32/apps/wlassistant.png
+%lang(ar) %{tde_datadir}/locale/ar/LC_MESSAGES/wlassistant.mo
+%lang(ca) %{tde_datadir}/locale/ca/LC_MESSAGES/wlassistant.mo
+%lang(es) %{tde_datadir}/locale/es/LC_MESSAGES/wlassistant.mo
+%lang(fr) %{tde_datadir}/locale/fr/LC_MESSAGES/wlassistant.mo
+%lang(nb) %{tde_datadir}/locale/nb/LC_MESSAGES/wlassistant.mo
+%lang(pl) %{tde_datadir}/locale/pl/LC_MESSAGES/wlassistant.mo
+%lang(pt) %{tde_datadir}/locale/pt_BR/LC_MESSAGES/wlassistant.mo
+%lang(sv) %{tde_datadir}/locale/sv/LC_MESSAGES/wlassistant.mo
+%lang(zh_CN) %{tde_datadir}/locale/zh_CN/LC_MESSAGES/wlassistant.mo
+%lang(zh_TW) %{tde_datadir}/locale/zh_TW/LC_MESSAGES/wlassistant.mo
 
 
 %Changelog
diff --git a/redhat/applications/yakuake/trinity-yakuake-3.5.13.spec b/redhat/applications/yakuake/trinity-yakuake-3.5.13.spec
index 342e61c9d..dd311853e 100644
--- a/redhat/applications/yakuake/trinity-yakuake-3.5.13.spec
+++ b/redhat/applications/yakuake/trinity-yakuake-3.5.13.spec
@@ -1,25 +1,32 @@
 # Default version for this component
 %define kdecomp yakuake
-%define version 2.8.1
-%define release 3
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_datadir}/doc
 %endif
 
-# TDE 3.5.12 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+# 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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/kde
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_tdedocdir}
 
 
 Name:		trinity-%{kdecomp}
 Summary:	Yakuake is a Quake-style terminal emulator based on KDE Konsole technology.
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	2.8.1
+Release:	3%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -28,14 +35,14 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org/
 
-Prefix:    %{_prefix}
+Prefix:    %{tde_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
 
 BuildRequires: tqtinterface-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
+BuildRequires: trinity-tdelibs-devel
+BuildRequires: trinity-tdebase-devel
 BuildRequires: desktop-file-utils
 
 %description
@@ -47,8 +54,8 @@ Yakuake is a Quake-style terminal emulator based on KDE Konsole technology.
 # 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|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+  -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"
@@ -56,19 +63,27 @@ Yakuake is a Quake-style terminal emulator based on KDE Konsole technology.
 
 
 %build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt \
-    --enable-closure
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --includedir=%{tde_includedir} \
+  --disable-rpath \
+  --with-extra-includes=%{tde_includedir}/tqt \
+  --enable-closure
 
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
@@ -78,23 +93,23 @@ export PATH="%{_bindir}:${PATH}"
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
-%{_bindir}/*
-%{_datadir}/applications/*/*.desktop
-%{_datadir}/apps/*/
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/locale/*/*/*.mo
-%{_datadir}/config.kcfg/*.kcfg
+%{tde_bindir}/*
+%{tde_datadir}/applications/*/*.desktop
+%{tde_datadir}/apps/*/
+%{tde_datadir}/icons/hicolor/*/*/*
+%{tde_datadir}/locale/*/*/*.mo
+%{tde_datadir}/config.kcfg/*.kcfg
 
 %Changelog
 * Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 2.8.1-3