Mageia 2: add support for MGA2 build in redhat packages

66 files changed, 15865 insertions, 5609 deletions

diff --git a/redhat/components-3.5.13.txt b/redhat/components-3.5.13.txt
index 01784acdb..885a058e7 100644
--- a/redhat/components-3.5.13.txt
+++ b/redhat/components-3.5.13.txt
@@ -1,5 +1,6 @@
 dependencies/qt3
 dependencies/tqtinterface
+dependencies/avahi-tqt
 dependencies/dbus-tqt
 dependencies/dbus-1-tqt
 dependencies/libcaldav
diff --git a/redhat/dependencies/arts/trinity-arts-3.5.13.spec b/redhat/dependencies/arts/trinity-arts-3.5.13.spec
index 29f683e77..12b0b19e6 100755
--- a/redhat/dependencies/arts/trinity-arts-3.5.13.spec
+++ b/redhat/dependencies/arts/trinity-arts-3.5.13.spec
@@ -3,6 +3,12 @@
 %define _variant .opt
 %endif
 
+%define tde_bindir %{_prefix}/bin
+%define tde_includedir %{_prefix}/include
+%define tde_libdir %{_prefix}/%{_lib}
+
+%define _docdir %{_prefix}/share/doc
+
 Name:		trinity-arts
 Version:	3.5.13
 Release:	4%{?dist}%{?_variant}
@@ -29,11 +35,17 @@ BuildRequires:	tqtinterface-devel
 BuildRequires:	audiofile-devel
 BuildRequires:	alsa-lib-devel
 BuildRequires:	glib2-devel
-BuildRequires:	libtool-ltdl-devel
 BuildRequires:	gsl-devel
 BuildRequires:	libvorbis-devel
 BuildRequires:	esound-devel
+
+%if 0%{?mgaversion}
+BuildRequires:	%{_lib}jack-devel
+BuildRequires:	%{_lib}ltdl-devel
+%else
 BuildRequires:	jack-audio-connection-kit-devel
+BuildRequires:	libtool-ltdl-devel
+%endif
 
 # TDE 3.5.13 specific building variables
 BuildRequires: cmake >= 2.8
@@ -76,18 +88,20 @@ Development files for %{name}
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
 
-%__mkdir build
-cd build
+%{?!mgaversion:%__mkdir build; cd build}
 %cmake \
-  -DINCLUDE_INSTALL_DIR=%{_includedir}/arts \
-  -DPKGCONFIG_INSTALL_DIR=%{_libdir}/pkgconfig \
+  -DINCLUDE_INSTALL_DIR=%{tde_includedir}/arts \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DPKGCONFIG_INSTALL_DIR=%{tde_libdir}/pkgconfig \
   -DWITH_ALSA=ON \
   -DWITH_AUDIOFILE=ON \
   -DWITH_VORBIS=ON \
   -DWITH_MAD=OFF \
   -DWITH_ESOUND=ON \
   -DWITH_JACK=ON \
+  -DCMAKE_SKIP_RPATH="OFF" \
   ..
 
 
@@ -103,30 +117,30 @@ cd build
 %files
 %defattr(-,root,root,-)
 %doc COPYING.LIB
-%dir %{_libdir}/mcop
-%dir %{_libdir}/mcop/Arts
-%{_libdir}/mcop/Arts/*
-%{_libdir}/mcop/*.mcopclass
-%{_libdir}/mcop/*.mcoptype
-%{_libdir}/lib*.so.*
-%{_libdir}/lib*.la
-%{_bindir}/artscat
-%{_bindir}/artsd
-%{_bindir}/artsdsp
-%{_bindir}/artsplay
-%{_bindir}/artsrec
-%{_bindir}/artsshell
-%{_bindir}/artswrapper
+%dir %{tde_libdir}/mcop
+%dir %{tde_libdir}/mcop/Arts
+%{tde_libdir}/mcop/Arts/*
+%{tde_libdir}/mcop/*.mcopclass
+%{tde_libdir}/mcop/*.mcoptype
+%{tde_libdir}/lib*.so.*
+%{tde_libdir}/lib*.la
+%{tde_bindir}/artscat
+%{tde_bindir}/artsd
+%{tde_bindir}/artsdsp
+%{tde_bindir}/artsplay
+%{tde_bindir}/artsrec
+%{tde_bindir}/artsshell
+%{tde_bindir}/artswrapper
 
 %files devel
 %defattr(-,root,root,-)
-%{_bindir}/mcopidl
-%dir %{_includedir}
-%{_includedir}/*/
-%{_bindir}/artsc-config
-%{_libdir}/lib*.so
-%{_libdir}/pkgconfig/*.pc
-%{_libdir}/*.a
+%{tde_bindir}/mcopidl
+%dir %{tde_includedir}
+%{tde_includedir}/*/
+%{tde_bindir}/artsc-config
+%{tde_libdir}/lib*.so
+%{tde_libdir}/pkgconfig/*.pc
+%{tde_libdir}/*.a
 
 
 %changelog
diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.spec
new file mode 100644
index 000000000..938db048f
--- /dev/null
+++ b/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.spec
@@ -0,0 +1,124 @@
+# 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
+%endif
+
+# TDE 3.5.13 specific building variables
+%define tde_bindir %{_prefix}/bin
+%define tde_includedir %{_prefix}/include
+%define tde_datadir %{_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_libdir %{_prefix}/%{_lib}
+
+
+Name:		avahi-tqt
+Version:	3.5.13
+Release:	1%{?dist}%{?_variant}
+License:	GPL
+Summary:	Avahi TQT Interface
+Group:		System Environment/Libraries
+
+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:	%{name}-%{version}.tar.gz
+
+BuildRequires:	gcc-c++
+BuildRequires:	cmake >= 2.8
+BuildRequires:	qt3-devel >= 3.3.8.d
+BuildRequires:	tqtinterface-devel >= 3.5.13
+BuildRequires:	gettext-devel
+BuildRequires:	dbus-devel
+
+%if 0%{?mgaversion}
+BuildRequires:	%{_lib}avahi-client-devel
+BuildRequires:	%{_lib}expat1-devel
+Provides:		%{_lib}avahi-qt3
+%else
+BuildRequires:	avahi-devel
+BuildRequires:	expat-devel
+%endif
+
+Requires:		qt3 >= 3.3.8.d
+Requires:		tqtinterface >= 3.5.13
+
+Provides:		avahi-qt3
+
+%description
+Avahi TQT Interface
+
+
+%package devel
+Requires:	%{name}
+Summary:	%{name} - Development files
+Group:		Development/Libraries
+
+%if 0%{?mgaversion}
+Provides:		%{_lib}avahi-qt3-devel
+%endif
+
+%description devel
+Development files for %{name}
+
+
+%prep
+%setup -q -n dependencies/%{name}
+
+# Ugly hack to modify TQT include directory inside autoconf files.
+# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
+%__sed -i "acinclude.m4" \
+  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
+  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
+
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "./ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "./ltmain.sh"
+
+# Removes stale libtool stuff
+%__rm -f common/libtool.m4 common/ltoptions.m4 common/lt~obsolete.m4 common/ltsugar.m4 common/ltversion.m4
+
+%build
+unset QTDIR || : ; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir} -I%{tde_includedir}/tqt"
+export CXXFLAGS="${CXXFLAGS} ${LDFLAGS}"
+
+./autogen.sh
+
+%configure \
+  --exec-prefix=%{_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --docdir=%{tde_docdir} \
+  --includedir=%{tde_includedir} \
+  --libdir=%{tde_libdir} \
+  --enable-compat-libdns_sd \
+  --with-systemdsystemunitdir=/lib/systemd/system  \
+  MOC_QT3=%{tde_bindir}/moc-tqt
+
+%__make %{?_smp_mflags}
+
+%install
+%__rm -rf %{?buildroot}
+%__make install DESTDIR=%{?buildroot}
+
+%clean
+%__rm -rf %{?buildroot}
+
+
+%files
+%{tde_libdir}/*.so.*
+
+%files devel
+%{tde_includedir}/%{name}
+%{tde_libdir}/*.so
+%{tde_libdir}/*.la
+%{tde_libdir}/pkgconfig/*.pc
+%exclude %{tde_libdir}/libavahi-tqt.a
+
+%changelog
+* Mon Jul 30 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
+- Initial build for TDE 3.5.13
diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec
index 125031f36..fbbb1c381 100644
--- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec
+++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec
@@ -3,6 +3,10 @@
 %define _variant .opt
 %endif
 
+%define tde_bindir %{_prefix}/bin
+%define tde_includedir %{_prefix}/include
+%define tde_libdir %{_prefix}/%{_lib}
+
 Name:		dbus-1-tqt
 Version:	3.5.13
 Release:	1%{?dist}%{?_variant}
@@ -46,10 +50,14 @@ Development files for %{name}
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+%{?!mgaversion:%__mkdir build; cd build}
+%cmake \
+  -DINCLUDE_INSTALL_DIR=%{tde_includedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  ..
 
-%__mkdir build
-cd build
-%cmake ..
 %__make %{?_smp_mflags}
 
 
@@ -62,14 +70,14 @@ cd build
 %__rm -rf %{?buildroot}
 
 %files
-%{_bindir}/dbusxml2qt3
-%{_libdir}/*.so.*
+%{tde_bindir}/dbusxml2qt3
+%{tde_libdir}/*.so.*
 
 %files devel
-%{_includedir}/*.h
-%{_libdir}/*.so
-%{_libdir}/*.la
-%{_libdir}/pkgconfig/*.pc
+%{tde_includedir}/*.h
+%{tde_libdir}/*.so
+%{tde_libdir}/*.la
+%{tde_libdir}/pkgconfig/*.pc
 
 %changelog
 * Tue Nov 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec
index 8020e2ee2..40247558e 100644
--- a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec
+++ b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec
@@ -3,6 +3,9 @@
 %define _variant .opt
 %endif
 
+%define tde_includedir %{_prefix}/include
+%define tde_libdir %{_prefix}/%{_lib}
+
 Name:		dbus-tqt
 Version:	3.5.13
 Release:	3%{?dist}%{?_variant}
@@ -28,7 +31,6 @@ BuildRequires:	qt3-devel >= 3.3.8.d
 
 Requires:		qt3 >= 3.3.8.d
 
-#Provides:		dbus-qt
 
 %description
 Dbus TQT Interface
@@ -49,10 +51,13 @@ Development files for %{name}
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
 
-%__mkdir build
-cd build
-%cmake ..
+%{?!mgaversion:%__mkdir build; cd build}
+%cmake \
+  -DINCLUDE_INSTALL_DIR=%{tde_includedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  ..
 
 %__make %{?_smp_mflags}
 
@@ -66,13 +71,13 @@ cd build
 %__rm -rf %{?buildroot}
 
 %files
-%{_libdir}/*.so.*
+%{tde_libdir}/*.so.*
 
 %files devel
-%{_includedir}/dbus-1.0/*
-%{_libdir}/*.so
-%{_libdir}/*.la
-%{_libdir}/pkgconfig/*.pc
+%{tde_includedir}/dbus-1.0/*
+%{tde_libdir}/*.so
+%{tde_libdir}/*.la
+%{tde_libdir}/pkgconfig/*.pc
 
 %changelog
 * Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
diff --git a/redhat/dependencies/libcaldav/libcaldav.spec b/redhat/dependencies/libcaldav/libcaldav.spec
index eef45ba22..f75aa3119 100644
--- a/redhat/dependencies/libcaldav/libcaldav.spec
+++ b/redhat/dependencies/libcaldav/libcaldav.spec
@@ -3,9 +3,14 @@
 %define _variant .opt
 %endif
 
-Name:		libcaldav
+%define tde_datadir %{_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{_prefix}/include
+%define tde_libdir %{_prefix}/%{_lib}
+
+Name:		trinity-libcaldav
 Version:	0.6.5
-Release:	2debian2.2%{?dist}%{?_variant}
+Release:	3%{?dist}%{?_variant}
 
 Vendor:		Trinity Project
 URL:		http://www.trinitydesktop.org/
@@ -24,12 +29,19 @@ BuildRequires:	glib2-devel
 BuildRequires:	gtk2-devel
 BuildRequires:	make
 
+Obsoletes:	libcaldav < %{version}-%{release}
+Provides:	libcaldav = %{version}-%{release}
+
 %if 0%{?fedora} || 0%{?rhel} >= 6
 BuildRequires:	libcurl-devel
 %else
+%if 0%{?mgaversion}
+BuildRequires:	%{_lib}curl-devel
+%else
 # Specific CURL version for TDE on RHEL 5 (and older)
 BuildRequires:	trinity-libcurl-devel
 %endif
+%endif
 
 %description
 libcaldev is a client library that adds support for the CalDAV protocol (rfc4791).
@@ -39,18 +51,24 @@ easy to integrate CalDAV support into any PIM application.
 %package devel
 Summary:	Development files for %{name}
 Group:		Development/Libraries
-Requires:	%{name}
+Requires:	%{name} = %{version}-%{release}
+Obsoletes:	libcaldav-devel < %{version}-%{release}
+Provides:	libcaldav-devel = %{version}-%{release}
 
 %description devel
 %{summary}
 
 
 %prep
-%setup -q
+%setup -q -n libcaldav-%{version}
 
 %build
 autoreconf --force --install --symlink
-%configure
+%configure \
+  --docdir=%{tde_docdir}/libcaldav \
+  --includedir=%{tde_includedir} \
+  --libdir=%{tde_libdir} \
+  
 %__make %{?_smp_mflags}
 
 %install
@@ -58,26 +76,30 @@ autoreconf --force --install --symlink
 %__make install DESTDIR=%{buildroot}
 
 # The include files do not go in the correct directory
-%__mv -f %{buildroot}%{_includedir}/%{name}-0.6.2/*.h %{buildroot}%{_includedir}
-%__rm -rf %{buildroot}%{_includedir}/%{name}-0.6.2
+%__mv -f %{buildroot}%{tde_includedir}/libcaldav-0.6.2/*.h %{buildroot}%{tde_includedir}
+%__rm -rf %{buildroot}%{tde_includedir}/libcaldav-0.6.2
 
 %clean
 %__rm -rf %{buildroot}
 
 
 %files
-%{_libdir}/*.so.*
-%{_datadir}/doc/%{name}
+%{tde_libdir}/*.so.*
+%{tde_docdir}/libcaldav
 
 %files devel
-%{_includedir}/*.h
-%{_libdir}/*.a
-%{_libdir}/*.la
-%{_libdir}/*.so
-%{_libdir}/pkgconfig/%{name}.pc
+%{tde_includedir}/*.h
+%{tde_libdir}/*.a
+%{tde_libdir}/*.la
+%{tde_libdir}/*.so
+%{tde_libdir}/pkgconfig/libcaldav.pc
 
 
 %Changelog
+* Sun Jul 28 2012 Francois Andriot <francois.andriot@free.fr> - 0.6.5-3
+- Renames to 'trinity-libcaldav'
+- Build on MGA2
+
 * Thu Nov 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.5-2debian2.2
 - Add missing BuildRequires
 
diff --git a/redhat/dependencies/libcarddav/libcarddav.spec b/redhat/dependencies/libcarddav/libcarddav.spec
index c47f40a49..c3ed99db0 100644
--- a/redhat/dependencies/libcarddav/libcarddav.spec
+++ b/redhat/dependencies/libcarddav/libcarddav.spec
@@ -3,9 +3,12 @@
 %define _variant .opt
 %endif
 
-Name:		libcarddav
+%define tde_includedir %{_prefix}/include
+%define tde_libdir %{_prefix}/%{_lib}
+
+Name:		trinity-libcarddav
 Version:	0.6.2
-Release:	2debian2.1%{?dist}%{?_variant}
+Release:	3%{?dist}%{?_variant}
 
 Vendor:		Trinity Project
 URL:		http://www.trinitydesktop.org/
@@ -22,8 +25,16 @@ Source0:	libcarddav_0.6.2-2debian2.tar.gz
 %if 0%{?fedora} || 0%{?rhel} >= 6
 BuildRequires:	libcurl-devel
 %else
+%if 0%{?mgaversion}
+BuildRequires:	%{_lib}curl-devel
+%else
+# Specific CURL version for TDE on RHEL 5 (and older)
 BuildRequires:	trinity-libcurl-devel
 %endif
+%endif
+
+Obsoletes:	libcarddav < %{version}-%{release}
+Provides:	libcarddav = %{version}-%{release}
 
 %description
 Libcarddav is a portable CardDAV client implementation originally developed for the Trinity PIM suite. 
@@ -35,16 +46,22 @@ Summary:	Development files for %{name}
 Group:		Development/Libraries
 Requires:	%{name}
 
+Obsoletes:	libcarddav-devel < %{version}-%{release}
+Provides:	libcarddav-devel = %{version}-%{release}
+
 %description devel
 %{summary}
 
 
 %prep
-%setup -q
+%setup -q -n libcarddav-%{version}
 
 %build
 autoreconf --force --install --symlink
-%configure
+%configure \
+  --includedir=%{tde_includedir} \
+  --libdir=%{tde_libdir} \
+  
 %__make %{?_smp_mflags}
 
 %install
@@ -52,24 +69,28 @@ autoreconf --force --install --symlink
 %__make install DESTDIR=%{buildroot}
 
 # The include files do not go in the correct directory
-%__mv -f %{buildroot}%{_includedir}/%{name}-0.6.1/*.h %{buildroot}%{_includedir}
-%__rm -rf %{buildroot}%{_includedir}/%{name}-0.6.1
+%__mv -f %{buildroot}%{tde_includedir}/libcarddav-0.6.1/*.h %{buildroot}%{tde_includedir}
+%__rm -rf %{buildroot}%{tde_includedir}/libcarddav-0.6.1
 
 %clean
 %__rm -rf %{buildroot}
 
 
 %files
-%{_libdir}/*.so.*
+%{tde_libdir}/*.so.*
 
 %files devel
-%{_includedir}/*.h
-%{_libdir}/*.a
-%{_libdir}/*.la
-%{_libdir}/*.so
-%{_libdir}/pkgconfig/%{name}.pc
+%{tde_includedir}/*.h
+%{tde_libdir}/*.a
+%{tde_libdir}/*.la
+%{tde_libdir}/*.so
+%{tde_libdir}/pkgconfig/libcarddav.pc
 
 
 %Changelog
+* Sun Jul 28 2012 Francois Andriot <francois.andriot@free.fr> - 0.6.5-3
+- Renames to 'trinity-libcaldav'
+- Build on MGA2
+
 * Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.5-2debian2 .1
 - Initial build for RHEL 6, RHEL 5, and Fedora 15
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec
index 3da953661..721178df8 100755
--- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec
@@ -8,7 +8,9 @@
 
 # TQT include files may conflict with QT4 includes, so we move them to a subdirectory.
 # Later compiled Trinity products should be aware of that !
-%define _includedir %{_prefix}/include/tqt
+%define tde_bindir %{_prefix}/bin
+%define tde_includedir %{_prefix}/include
+%define tde_libdir %{_prefix}/%{_lib}
 
 Name:		tqtinterface
 Version:	3.5.13
@@ -34,8 +36,12 @@ BuildRequires:	qt3-devel >= 3.3.8.d
 Requires:		qt3 >= 3.3.8.d
 
 BuildRequires:	gcc-c++
-BuildRequires:	libXi-devel
 BuildRequires:	pth-devel
+%if 0%{?mgaversion}
+BuildRequires:	%{_lib}xi-devel
+%else
+BuildRequires:	libXi-devel
+%endif
 
 
 %description
@@ -57,16 +63,15 @@ Development files for %{name}
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-%__mkdir build
-cd build
-%__cmake \
+%{?!mgaversion:%__mkdir build; cd build}
+%cmake \
   -DQT_PREFIX_DIR=${QTDIR} \
   -DQT_VERSION=3 \
   -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-  -DPKGCONFIG_INSTALL_DIR=%{_libdir}/pkgconfig \
-  -DBIN_INSTALL_DIR=%{_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{_includedir} \
-  -DLIB_INSTALL_DIR=%{_libdir} \
+  -DINCLUDE_INSTALL_DIR=%{tde_includedir}/tqt \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DPKGCONFIG_INSTALL_DIR=%{tde_libdir}/pkgconfig \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
   ..
 
 %__make %{?_smp_mflags}
@@ -87,21 +92,21 @@ done
 # Install 'cmake' modules for development use
 %__mkdir_p %{?buildroot}%{cmake_modules_dir}
 for i in cmake/modules/*.cmake; do
-  install -m 644 $i %{?buildroot}%{cmake_modules_dir}
+  %__install -m 644 $i %{?buildroot}%{cmake_modules_dir}
 done
 
 %clean
 %__rm -rf %{?buildroot}
 
 %files
-%{_bindir}/*
-%{_libdir}/*.so.*
+%{tde_bindir}/*
+%{tde_libdir}/*.so.*
 
 %files devel
-%{_includedir}
-%{_libdir}/*.so
-%{_libdir}/*.la
-%{_libdir}/pkgconfig/*.pc
+%{tde_includedir}/tqt
+%{tde_libdir}/*.so
+%{tde_libdir}/*.la
+%{tde_libdir}/pkgconfig/*.pc
 %{cmake_modules_dir}/*.cmake
 
 
diff --git a/redhat/extras/akode/trinity-akode.spec b/redhat/extras/akode/trinity-akode.spec
index 7f24416ce..1395777de 100644
--- a/redhat/extras/akode/trinity-akode.spec
+++ b/redhat/extras/akode/trinity-akode.spec
@@ -1,10 +1,27 @@
-%define _prefix /opt/trinity
-%define _docdir %{_datadir}/doc
+# 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
+%endif
+
+# TDE 3.5.13 specific building variables
+%define tde_bindir %{_prefix}/bin
+%define tde_datadir %{_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{_prefix}/include
+%define tde_libdir %{_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
+
+%define tde_tdeappdir %{tde_datadir}/applications/kde
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_docdir}
 
 Summary: Audio-decoding framework 
 Name:	 trinity-akode 
 Version: 2.0.2
-Release: 1%{?dist}
+Release: 1%{?dist}%{?_variant}
 
 License: LGPLv2+
 Group: 	 System Environment/Libraries
@@ -30,19 +47,26 @@ Patch10: akode-autotools.patch
 %define _with_libsamplerate --with-libsamplerate
 
 # Pulseaudio is not available on RHEL 5 and earlier
-%if 0%{?fedora} >= 15 || 0%{?rhel} >= 6
+%if 0%{?fedora} >= 15 || 0%{?rhel} >= 6 || 0%{?mgaversion}
 %define _with_pulseaudio --with-pulseaudio
 %endif
 
 BuildRequires: automake libtool
 BuildRequires: alsa-lib-devel
-%{?_with_flac:BuildRequires: flac-devel}
-%{?_with_jack:BuildRequires: jack-audio-connection-kit-devel}
 %{?_with_libsamplerate:BuildRequires: libsamplerate-devel}
 BuildRequires: libvorbis-devel
-%{?_with_pulseaudio:BuildRequires: pulseaudio-libs-devel}
 BuildRequires: speex-devel
 
+%if 0%{?mgaversion}
+%{?_with_jack:BuildRequires: %{_lib}jack-devel}
+%{?_with_flac:BuildRequires: %{_lib}flac-devel}
+%{?_with_pulseaudio:BuildRequires: %{_lib}pulseaudio-devel}
+%else
+%{?_with_flac:BuildRequires: flac-devel}
+%{?_with_jack:BuildRequires: jack-audio-connection-kit-devel}
+%{?_with_pulseaudio:BuildRequires: pulseaudio-libs-devel}
+%endif
+
 %description
 aKode is a simple audio-decoding frame-work that provides a uniform
 interface to decode the most common audio-formats. It also has a direct
@@ -100,9 +124,9 @@ Requires: %{name} = %{version}-%{release}
 
 # 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"
+%__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"
@@ -110,6 +134,10 @@ Requires: %{name} = %{version}-%{release}
 
 %build
 %configure \
+  --bindir=%{tde_bindir} \
+  --libdir=%{tde_libdir} \
+  --includedir=%{tde_includedir} \
+  --datadir=%{tde_datadir} \
   --disable-static \
   --enable-shared \
   --disable-debug --disable-warnings --disable-dependency-tracking \
@@ -136,9 +164,7 @@ Requires: %{name} = %{version}-%{release}
 %__make install DESTDIR=%{buildroot}
 
 # unpackaged files
-%__rm -f %{buildroot}%{_libdir}/lib*.la
 %__rm -f %{buildroot}%{_libdir}/lib*.a
-#rm -f %{buildroot}%{_libdir}/libakode_oss_sink.so
 
 # rpmdocs
 for file in AUTHORS COPYING NEWS README TODO ; do
@@ -150,49 +176,68 @@ done
 %__rm -rf %{buildroot} 
 
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%postun 
+/sbin/ldconfig
+
+%post devel
+/sbin/ldconfig
+
+%postun devel
+/sbin/ldconfig
 
 
 %files
 %defattr(-,root,root,-)
 %doc rpmdocs/* 
-%{_bindir}/akodeplay
-%{_libdir}/libakode.so.*
-%{_libdir}/libakode_alsa_sink.so
-%{_libdir}/libakode_mpc_decoder.so
-%{_libdir}/libakode_oss_sink.so
-%{_libdir}/libakode_xiph_decoder.so
+%{tde_bindir}/akodeplay
+%{tde_libdir}/libakode.so.*
+%{tde_libdir}/libakode_alsa_sink.la
+%{tde_libdir}/libakode_alsa_sink.so
+%{tde_libdir}/libakode_mpc_decoder.la
+%{tde_libdir}/libakode_mpc_decoder.so
+%{tde_libdir}/libakode_oss_sink.la
+%{tde_libdir}/libakode_oss_sink.so
+%{tde_libdir}/libakode_xiph_decoder.la
+%{tde_libdir}/libakode_xiph_decoder.so
 
 %files devel
 %defattr(-,root,root,-)
-%{_bindir}/akode-config
-%{_includedir}/*
-%{_libdir}/libakode.so
-%{_libdir}/pkgconfig/*.pc
+%{tde_bindir}/akode-config
+%{tde_includedir}/*
+%{tde_libdir}/libakode.la
+%{tde_libdir}/libakode.so
+%{tde_libdir}/pkgconfig/*.pc
 
 %if "%{?_with_jack:1}" == "1"
 %files jack 
 %defattr(-,root,root,-)
-%{_libdir}/libakode_jack_sink.so
+%{tde_libdir}/libakode_jack_sink.la
+%{tde_libdir}/libakode_jack_sink.so
 %endif
 
 # License: GPLv2+
 %if "%{?_with_libsamplerate:1}" == "1"
 %files libsamplerate
 %defattr(-,root,root,-)
-%{_libdir}/libakode_src_resampler.so
+%{tde_libdir}/libakode_src_resampler.la
+%{tde_libdir}/libakode_src_resampler.so
 %endif
 
 %if "%{?_with_pulseaudio:1}" == "1"
 %files pulseaudio
 %defattr(-,root,root,-)
-%{_libdir}/libakode_polyp_sink.so
+%{tde_libdir}/libakode_polyp_sink.la
+%{tde_libdir}/libakode_polyp_sink.so
 %endif
 
 
 %changelog
+* Tue Jul 30 2012 Francois Andriot <francois.andriot@free.fr> 2.0.2-2
+- Re-adds '.la' files
+
 * Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> 2.0.2-1
 - Port to TDE 3.5.13
 - Based on spec file from Fedora 9 'akode-2.0.2-5'
diff --git a/redhat/extras/trinity-desktop/trinity-desktop.spec b/redhat/extras/trinity-desktop/trinity-desktop.spec
index ade6d7490..faf09237e 100644
--- a/redhat/extras/trinity-desktop/trinity-desktop.spec
+++ b/redhat/extras/trinity-desktop/trinity-desktop.spec
@@ -6,7 +6,7 @@
 
 Name:		trinity-desktop
 Version:	3.5.13
-Release:	4%{?dist}%{?_variant}
+Release:	5%{?dist}%{?_variant}
 License:	GPL
 Summary:	Meta-package to install TDE
 Group:		User Interface/Desktops
@@ -22,24 +22,29 @@ BuildArch:	noarch
 Source0:	trinity-3.5.13-fedora.repo
 Source1:	trinity-3.5.13-rhel.repo
 
-Requires:	trinity-kdeaccessibility >= %{version}
-Requires:	trinity-kdeaddons >= %{version}
-Requires:	trinity-kdeadmin >= %{version}
-Requires:	trinity-kdeartwork >= %{version}
-Requires:	trinity-kdeartwork-icons >= %{version}
-Requires:	trinity-kdebase >= %{version}
-Requires:	trinity-kdebindings >= %{version}
-Requires:	trinity-kdeedu >= %{version}
-Requires:	trinity-kdegames >= %{version}
-Requires:	trinity-kdegraphics >= %{version}
-Requires:	trinity-kdemultimedia >= %{version}
-Requires:	trinity-kdenetwork >= %{version}
-Requires:	trinity-kdepim >= %{version}
-Requires:	trinity-kdeutils >= %{version}
-Requires:	trinity-kdetoys >= %{version}
-Requires:	trinity-repo >= %{version}
+Obsoletes:	trinity-desktop-extras < %{version}-%{release}
+Provides:	trinity-desktop-extras = %{version}-%{release}
+
+Requires:	trinity-tdeaccessibility >= %{version}
+Requires:	trinity-tdeaddons >= %{version}
+Requires:	trinity-tdeadmin >= %{version}
+Requires:	trinity-tdeartwork >= %{version}
+Requires:	trinity-tdebase >= %{version}
+Requires:	trinity-tdebindings >= %{version}
+Requires:	trinity-tdeedu >= %{version}
+Requires:	trinity-tdegames >= %{version}
+Requires:	trinity-tdegraphics >= %{version}
+Requires:	trinity-tdemultimedia >= %{version}
+Requires:	trinity-tdenetwork >= %{version}
+Requires:	trinity-tdepim >= %{version}
+Requires:	trinity-tdeutils >= %{version}
+Requires:	trinity-tdetoys >= %{version}
 Requires:	hal
 
+%if 0%{?rhel} || 0%{?fedora}
+Requires:	trinity-repo >= %{version}
+%endif
+
 %description
 The TDE project aims to keep the KDE3.5 computing style alive, as well as 
 polish off any rough edges that were present as of KDE 3.5.10. Along 
@@ -49,42 +54,43 @@ Toward that end, significant new enhancements have already been made in
 areas such as display control, network connectivity, user 
 authentication, and much more!
 
-%package dev
+%files
+
+##########
+
+%package devel
 Group:		User Interface/Desktops
 Summary:	Meta-package to install TDE development tools
 
-Requires:	trinity-kdesdk >= %{version}
-Requires:	trinity-kdevelop >= %{version}
-Requires:	trinity-kdewebdev >= %{version}
+Obsoletes:	trinity-desktop-dev < %{version}-%{release}
+Provides:	trinity-desktop-dev = %{version}-%{release}
 
-%description dev
-%{summary}
+Requires:	trinity-tdesdk >= %{version}
+Requires:	trinity-tdevelop >= %{version}
+Requires:	trinity-tdewebdev >= %{version}
 
-%package extras
-Group:		User Interface/Desktops
-Summary:	Meta-package to install extra TDE packages
+%description devel
+%{summary}
 
-Requires:	trinity-kdeaddons-extras >= %{version}
-Requires:	trinity-kdebase-extras >= %{version}
-Requires:	trinity-kdegraphics-extras >= %{version}
-Requires:	trinity-kdemultimedia-extras >= %{version}
-#Requires:	trinity-kdenetwork-extras >= %{version}
-Requires:	trinity-kdeutils-extras >= %{version}
+%files devel
 
-%description extras
-%{summary}
+##########
 
 %package all
 Group:		User Interface/Desktops
 Summary:	Meta-package to install all TDE packages
 
-Requires:	%{name} == %{version}
-Requires:	%{name}-dev == %{version}
-Requires:	%{name}-extras == %{version}
+Requires:	%{name} = %{version}
+Requires:	%{name}-devel = %{version}
 
 %description all
 %{summary}
 
+%files all
+
+##########
+
+%if 0%{?rhel} || 0%{?fedora}
 %package -n trinity-repo
 Group:		User Interface/Desktops
 Summary:	Yum configuration files for Trinity
@@ -92,6 +98,13 @@ Summary:	Yum configuration files for Trinity
 %description -n trinity-repo
 %{summary}
 
+%files -n trinity-repo
+%{_sysconfdir}/yum.repos.d/*.repo
+%endif
+
+
+##########
+
 %prep
 
 %build
@@ -115,20 +128,16 @@ Summary:	Yum configuration files for Trinity
   >%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity-3.5.13-el%{rhel}.repo
 %endif
 
+%if 0%{?fedora} || 0%{?rhel}
 %__chmod 644 %{?buildroot}%{_sysconfdir}/yum.repos.d/*.repo
-
-%files
-
-%files dev
-
-%files extras
-
-%files all
-
-%files -n trinity-repo
-%{_sysconfdir}/yum.repos.d/*.repo
+%endif
 
 %changelog
+* Wed Aug 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5
+- Updates to reflect new packages names
+- Add Mageia 2 support
+- Removes 'extras' packages
+
 * Wed Jun 06 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
 - Enable mirrorlist
 
diff --git a/redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec b/redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec
index 20290b446..95d5202e9 100644
--- a/redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec
+++ b/redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec
@@ -1,20 +1,16 @@
-# Default version for this component
-%if "%{?version}" == ""
-%define version 3.5.13
-%endif
-%define release 6
-
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_prefix}/share/doc
 %endif
 
 # TDE 3.5.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_datadir %{_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{_prefix}/include
+%define tde_libdir %{_prefix}/%{_lib}
+
+%define tde_tdedocdir %{tde_docdir}/kde
 
 # Builds all supported languages (not unsupported ones)
 %if "%{?KDE_LANGS}" == ""
@@ -24,8 +20,8 @@ BuildRequires: autoconf automake libtool m4
 
 Name:		trinity-kde-i18n
 Summary:	Internationalization support for Trinity
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	3.5.13
+Release:	6%{?dist}%{?_variant}
 
 Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
@@ -637,15 +633,15 @@ done
 
 %build
 export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
-export kde_htmldir="%{tde_docdir}/HTML"
+export kde_htmldir="%{tde_tdedocdir}/HTML"
 
 for l in %{KDE_LANGS}; do
   for f in kde-i18n-${l}-*/; do
     if [ -d "${f}" ] && [ -x "${f}/configure" ] ; then 
       pushd ${f}
-      %configure
+      %configure --datadir=%{tde_datadir} --docdir=%{tde_docdir}
       %__make %{?_smp_mflags}
       popd
     fi
@@ -666,7 +662,7 @@ done
 
 # make symlinks relative
 %if "%{_prefix}" == "/usr"
-pushd "%{buildroot}%{tde_docdir}/HTML"
+pushd "%{buildroot}%{tde_tdedocdir}/HTML"
 for lang in *; do
   if [ -d "$lang" ]; then
     pushd "$lang"
@@ -698,18 +694,18 @@ popd
 %endif
 
 # remove zero-length file
-find "%{buildroot}%{tde_docdir}/HTML" -size 0 -exec rm -f {} \;
+find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \;
 
 # See http://fedoraproject.org/wiki/Languages (???)
-%__rm -f %{buildroot}%{_datadir}/locale/*/flag.png
+%__rm -f %{buildroot}%{tde_datadir}/locale/*/flag.png
 
 # Removes conflict with KDE4
 %if "%{?_prefix}" == "/usr"
-%__rm -f %{buildroot}%{_datadir}/locale/*/entry.desktop
+%__rm -f %{buildroot}%{tde_datadir}/locale/*/entry.desktop
 %endif
 
 # remove obsolete KDE 3 application data translations
-%__rm -rf "%{buildroot}%{_datadir}/apps"
+%__rm -rf "%{buildroot}%{tde_datadir}/apps"
 
 %clean
 %__rm -rf %{buildroot}
@@ -717,445 +713,445 @@ find "%{buildroot}%{tde_docdir}/HTML" -size 0 -exec rm -f {} \;
 %if "%( grep -w af <<< '%{KDE_LANGS}' )" != ""
 %files Afrikaans
 %defattr(-,root,root,-)
-%lang(af) %{_datadir}/locale/af/*
-%lang(af) %{tde_docdir}/HTML/af/
+%lang(af) %{tde_datadir}/locale/af/*
+%lang(af) %{tde_tdedocdir}/HTML/af/
 %endif
 
 %if "%( grep -w ar <<< '%{KDE_LANGS}' )" != ""
 %files Arabic 
 %defattr(-,root,root,-)
-%lang(ar) %{_datadir}/locale/ar/*
+%lang(ar) %{tde_datadir}/locale/ar/*
 %endif
 
 %if "%( grep -w az <<< '%{KDE_LANGS}' )" != ""
 %files Azerbaijani
 %defattr(-,root,root,-)
-%lang(az) %{_datadir}/locale/az/*
+%lang(az) %{tde_datadir}/locale/az/*
 %endif
 
 %if "%( grep -w be <<< '%{KDE_LANGS}' )" != ""
 %files Belarusian
 %defattr(-,root,root,-)
-%lang(be) %{_datadir}/locale/be/*
+%lang(be) %{tde_datadir}/locale/be/*
 %endif
 
 %if "%( grep -w bg <<< '%{KDE_LANGS}' )" != ""
 %files Bulgarian
 %defattr(-,root,root,-)
-%lang(bg) %{_datadir}/locale/bg/*
+%lang(bg) %{tde_datadir}/locale/bg/*
 %endif
 
 %if "%( grep -w bn <<< '%{KDE_LANGS}' )" != ""
 %files Bengali
 %defattr(-,root,root,-)
-%lang(bn) %{_datadir}/locale/bn/*
+%lang(bn) %{tde_datadir}/locale/bn/*
 %endif
 
 %if "%( grep -w bo <<< '%{KDE_LANGS}' )" != ""
 %files Tibetan
 %defattr(-,root,root,-)
-%lang(bo) %{_datadir}/locale/bo/*
+%lang(bo) %{tde_datadir}/locale/bo/*
 %endif
 
 %if "%( grep -w br <<< '%{KDE_LANGS}' )" != ""
 %files Breton
 %defattr(-,root,root,-)
-%lang(br) %{_datadir}/locale/br/*
+%lang(br) %{tde_datadir}/locale/br/*
 %endif
 
 %if "%( grep -w bs <<< '%{KDE_LANGS}' )" != ""
 %files Bosnian
 %defattr(-,root,root,-)
-%lang(bs) %{_datadir}/locale/bs/*
+%lang(bs) %{tde_datadir}/locale/bs/*
 %endif
 
 %if "%( grep -w ca <<< '%{KDE_LANGS}' )" != ""
 %files Catalan
 %defattr(-,root,root,-)
-%lang(ca) %{_datadir}/locale/ca/*
-%lang(ca) %{tde_docdir}/HTML/ca/
+%lang(ca) %{tde_datadir}/locale/ca/*
+%lang(ca) %{tde_tdedocdir}/HTML/ca/
 %endif
 
 %if "%( grep -w cs <<< '%{KDE_LANGS}' )" != ""
 %files Czech
 %defattr(-,root,root,-)
-%lang(cs) %{_datadir}/locale/cs/*
-%lang(cs) %{tde_docdir}/HTML/cs/
+%lang(cs) %{tde_datadir}/locale/cs/*
+%lang(cs) %{tde_tdedocdir}/HTML/cs/
 %endif
 
 %if "%( grep -w cy <<< '%{KDE_LANGS}' )" != ""
 %files Welsh
 %defattr(-,root,root,-)
-%lang(cy) %{_datadir}/locale/cy/*
+%lang(cy) %{tde_datadir}/locale/cy/*
 %endif
 
 %if "%( grep -w da <<< '%{KDE_LANGS}' )" != ""
 %files Danish
 %defattr(-,root,root,-)
-%lang(da) %{_datadir}/locale/da/*
-%lang(da) %{tde_docdir}/HTML/da/
+%lang(da) %{tde_datadir}/locale/da/*
+%lang(da) %{tde_tdedocdir}/HTML/da/
 %endif
 
 %if "%( grep -w de <<< '%{KDE_LANGS}' )" != ""
 %files German
 %defattr(-,root,root,-)
-%lang(de) %{_datadir}/locale/de/*
-%lang(de) %{tde_docdir}/HTML/de/
+%lang(de) %{tde_datadir}/locale/de/*
+%lang(de) %{tde_tdedocdir}/HTML/de/
 %endif
 
 %if "%( grep -w el <<< '%{KDE_LANGS}' )" != ""
 %files Greek
 %defattr(-,root,root,-)
-%lang(el) %{_datadir}/locale/el/*
+%lang(el) %{tde_datadir}/locale/el/*
 %endif
 
 %if "%( grep -w en_GB <<< '%{KDE_LANGS}' )" != ""
 %files British
 %defattr(-,root,root,-)
-%lang(en_GB) %{_datadir}/locale/en_GB/*
-%lang(en_GB) %{tde_docdir}/HTML/en_GB/
+%lang(en_GB) %{tde_datadir}/locale/en_GB/*
+%lang(en_GB) %{tde_tdedocdir}/HTML/en_GB/
 %endif
 
 %if "%( grep -w eo <<< '%{KDE_LANGS}' )" != ""
 %files Esperanto
 %defattr(-,root,root,-)
-%lang(eo) %{_datadir}/locale/eo/*
+%lang(eo) %{tde_datadir}/locale/eo/*
 %endif
 
 %if "%( grep -w es <<< '%{KDE_LANGS}' )" != ""
 %files Spanish
 %defattr(-,root,root,-)
-%lang(es) %{_datadir}/locale/es/*
-%lang(es) %{tde_docdir}/HTML/es/
+%lang(es) %{tde_datadir}/locale/es/*
+%lang(es) %{tde_tdedocdir}/HTML/es/
 %endif
 
 %if "%( grep -w et <<< '%{KDE_LANGS}' )" != ""
 %files Estonian
 %defattr(-,root,root,-)
-%lang(et) %{_datadir}/locale/et/*
-%lang(et) %{tde_docdir}/HTML/et/
+%lang(et) %{tde_datadir}/locale/et/*
+%lang(et) %{tde_tdedocdir}/HTML/et/
 %endif
 
 %if "%( grep -w eu <<< '%{KDE_LANGS}' )" != ""
 %files Basque
 %defattr(-,root,root,-)
-%lang(eu) %{_datadir}/locale/eu/*
+%lang(eu) %{tde_datadir}/locale/eu/*
 %endif
 
 %if "%( grep -w fa <<< '%{KDE_LANGS}' )" != ""
 %files Farsi
 %defattr(-,root,root,-)
-%lang(fa) %{_datadir}/locale/fa/*
+%lang(fa) %{tde_datadir}/locale/fa/*
 %endif
 
 %if "%( grep -w fi <<< '%{KDE_LANGS}' )" != ""
 %files Finnish
 %defattr(-,root,root,-)
-%lang(fi) %{_datadir}/locale/fi/*
-%lang(fi) %{tde_docdir}/HTML/fi/
+%lang(fi) %{tde_datadir}/locale/fi/*
+%lang(fi) %{tde_tdedocdir}/HTML/fi/
 %endif
 
 %if "%( grep -w fo <<< '%{KDE_LANGS}' )" != ""
 %files Faroese
 %defattr(-,root,root,-)
-%lang(fo) %{_datadir}/locale/fo/*
+%lang(fo) %{tde_datadir}/locale/fo/*
 %endif
 
 %if "%( grep -w fr <<< '%{KDE_LANGS}' )" != ""
 %files French
 %defattr(-,root,root,-)
-%lang(fr) %{_datadir}/locale/fr/*
-%lang(fr) %{tde_docdir}/HTML/fr/
+%lang(fr) %{tde_datadir}/locale/fr/*
+%lang(fr) %{tde_tdedocdir}/HTML/fr/
 %endif
 
 %if "%( grep -w fy <<< '%{KDE_LANGS}' )" != ""
 %files Frisian
 %defattr(-,root,root,-)
-%lang(fy) %{_datadir}/locale/fy/*
+%lang(fy) %{tde_datadir}/locale/fy/*
 %endif
 
 %if "%( grep -w ga <<< '%{KDE_LANGS}' )" != ""
 %files Irish
 %defattr(-,root,root,-)
-%lang(ga) %{_datadir}/locale/ga/*
+%lang(ga) %{tde_datadir}/locale/ga/*
 %endif
 
 %if "%( grep -w gl <<< '%{KDE_LANGS}' )" != ""
 %files Galician
 %defattr(-,root,root,-)
-%lang(gl) %{_datadir}/locale/gl/*
+%lang(gl) %{tde_datadir}/locale/gl/*
 %endif
 
 %if "%( grep -w he <<< '%{KDE_LANGS}' )" != ""
 %files Hebrew
 %defattr(-,root,root,-)
-%lang(he) %{_datadir}/locale/he/*
-%lang(he) %{tde_docdir}/HTML/he/
+%lang(he) %{tde_datadir}/locale/he/*
+%lang(he) %{tde_tdedocdir}/HTML/he/
 %endif
 
 %if "%( grep -w hi <<< '%{KDE_LANGS}' )" != ""
 %files Hindi
 %defattr(-,root,root,-)
-%lang(hi) %{_datadir}/locale/hi/*
+%lang(hi) %{tde_datadir}/locale/hi/*
 %endif
 
 %if "%( grep -w hr <<< '%{KDE_LANGS}' )" != ""
 %files Croatian
 %defattr(-,root,root,-)
-%lang(hr) %{_datadir}/locale/hr/*
-%lang(hr) %{tde_docdir}/HTML/hr/
+%lang(hr) %{tde_datadir}/locale/hr/*
+%lang(hr) %{tde_tdedocdir}/HTML/hr/
 %endif
 
 %if "%( grep -w hu <<< '%{KDE_LANGS}' )" != ""
 %files Hungarian
 %defattr(-,root,root,-)
-%lang(hu) %{_datadir}/locale/hu/*
-%lang(hu) %{tde_docdir}/HTML/hu/
+%lang(hu) %{tde_datadir}/locale/hu/*
+%lang(hu) %{tde_tdedocdir}/HTML/hu/
 %endif
 
 %if "%( grep -w id <<< '%{KDE_LANGS}' )" != ""
 %files Indonesian
 %defattr(-,root,root,-)
-%lang(id) %{_datadir}/locale/id/*
-%lang(id) %{tde_docdir}/HTML/id/
+%lang(id) %{tde_datadir}/locale/id/*
+%lang(id) %{tde_tdedocdir}/HTML/id/
 %endif
 
 %if "%( grep -w is <<< '%{KDE_LANGS}' )" != ""
 %files Icelandic
 %defattr(-,root,root,-)
-%lang(is) %{_datadir}/locale/is/*
+%lang(is) %{tde_datadir}/locale/is/*
 %endif
 
 %if "%( grep -w it <<< '%{KDE_LANGS}' )" != ""
 %files Italian
 %defattr(-,root,root,-)
-%lang(it) %{_datadir}/locale/it/*
-%lang(it) %{tde_docdir}/HTML/it/
+%lang(it) %{tde_datadir}/locale/it/*
+%lang(it) %{tde_tdedocdir}/HTML/it/
 %endif
 
 %if "%( grep -w ja <<< '%{KDE_LANGS}' )" != ""
 %files Japanese
 %defattr(-,root,root,-)
-%lang(ja) %{_datadir}/locale/ja/*
-%lang(ja) %{tde_docdir}/HTML/ja/
+%lang(ja) %{tde_datadir}/locale/ja/*
+%lang(ja) %{tde_tdedocdir}/HTML/ja/
 %endif
 
 %if "%( grep -w ko <<< '%{KDE_LANGS}' )" != ""
 %files Korean
 %defattr(-,root,root,-)
-%lang(ko) %{_datadir}/locale/ko/*
-%lang(ko) %{tde_docdir}/HTML/ko/
+%lang(ko) %{tde_datadir}/locale/ko/*
+%lang(ko) %{tde_tdedocdir}/HTML/ko/
 %endif
 
 %if "%( grep -w ku <<< '%{KDE_LANGS}' )" != ""
 %files Kurdish
 %defattr(-,root,root,-)
-%lang(ku) %{_datadir}/locale/ku/*
-%lang(ku) %{tde_docdir}/HTML/ku/
+%lang(ku) %{tde_datadir}/locale/ku/*
+%lang(ku) %{tde_tdedocdir}/HTML/ku/
 %endif
 
 %if "%( grep -w lao <<< '%{KDE_LANGS}' )" != ""
 %files Lao
 %defattr(-,root,root,-)
-%lang(lo) %{_datadir}/locale/lo/*
-%lang(lo) %{tde_docdir}/HTML/lo/
+%lang(lo) %{tde_datadir}/locale/lo/*
+%lang(lo) %{tde_tdedocdir}/HTML/lo/
 %endif
 
 %if "%( grep -w lt <<< '%{KDE_LANGS}' )" != ""
 %files Lithuanian
 %defattr(-,root,root,-)
-%lang(lt) %{_datadir}/locale/lt/*
+%lang(lt) %{tde_datadir}/locale/lt/*
 %endif
 
 %if "%( grep -w lv <<< '%{KDE_LANGS}' )" != ""
 %files Latvian
 %defattr(-,root,root,-)
-%lang(lv) %{_datadir}/locale/lv/*
+%lang(lv) %{tde_datadir}/locale/lv/*
 %endif
 
 %if "%( grep -w mi <<< '%{KDE_LANGS}' )" != ""
 %files Maori
 %defattr(-,root,root,-)
-%lang(mi) %{_datadir}/locale/mi/*
+%lang(mi) %{tde_datadir}/locale/mi/*
 %endif
 
 %if "%( grep -w mk <<< '%{KDE_LANGS}' )" != ""
 %files Macedonian
 %defattr(-,root,root,-)
-%lang(mk) %{_datadir}/locale/mk/*
+%lang(mk) %{tde_datadir}/locale/mk/*
 %endif
 
 %if "%( grep -w mt <<< '%{KDE_LANGS}' )" != ""
 %files Maltese
 %defattr(-,root,root,-)
-%lang(mt) %{_datadir}/locale/mt/*
+%lang(mt) %{tde_datadir}/locale/mt/*
 %endif
 
 %if "%( grep -w nl <<< '%{KDE_LANGS}' )" != ""
 %files Dutch
 %defattr(-,root,root,-)
-%lang(nl) %{_datadir}/locale/nl/*
-%lang(nl) %{tde_docdir}/HTML/nl/
+%lang(nl) %{tde_datadir}/locale/nl/*
+%lang(nl) %{tde_tdedocdir}/HTML/nl/
 %endif
 
 %if "%( grep -w nb <<< '%{KDE_LANGS}' )" != ""
 %files Norwegian
 %defattr(-,root,root,-)
-%lang(nb) %{_datadir}/locale/nb/*
-#%lang(nb) %{tde_docdir}/HTML/nb/
+%lang(nb) %{tde_datadir}/locale/nb/*
+#%lang(nb) %{tde_tdedocdir}/HTML/nb/
 %endif
 
 %if "%( grep -w nn <<< '%{KDE_LANGS}' )" != ""
 %files Norwegian-Nynorsk
 %defattr(-,root,root,-)
-%lang(nn) %{_datadir}/locale/nn/*
-#%lang(nn) %{tde_docdir}/HTML/nn/
+%lang(nn) %{tde_datadir}/locale/nn/*
+#%lang(nn) %{tde_tdedocdir}/HTML/nn/
 %endif
 
 %if "%( grep -w oc <<< '%{KDE_LANGS}' )" != ""
 %files Occitan
 %defattr(-,root,root,-)
-%lang(oc) %{_datadir}/locale/oc/*
+%lang(oc) %{tde_datadir}/locale/oc/*
 %endif
 
 %if "%( grep -w pa <<< '%{KDE_LANGS}' )" != ""
 %files Punjabi
 %defattr(-,root,root,-)
-%lang(pa) %{_datadir}/locale/pa/*
+%lang(pa) %{tde_datadir}/locale/pa/*
 %endif
 
 %if "%( grep -w pl <<< '%{KDE_LANGS}' )" != ""
 %files Polish
 %defattr(-,root,root,-)
-%lang(pl) %{_datadir}/locale/pl/*
-%lang(pl) %{tde_docdir}/HTML/pl/
+%lang(pl) %{tde_datadir}/locale/pl/*
+%lang(pl) %{tde_tdedocdir}/HTML/pl/
 %endif
 
 %if "%( grep -w pt <<< '%{KDE_LANGS}' )" != ""
 %files Portuguese
 %defattr(-,root,root,-)
-%lang(pt) %{_datadir}/locale/pt/*
-%lang(pt) %{tde_docdir}/HTML/pt/
+%lang(pt) %{tde_datadir}/locale/pt/*
+%lang(pt) %{tde_tdedocdir}/HTML/pt/
 %endif
 
 %if "%( grep -w pt_BR <<< '%{KDE_LANGS}' )" != ""
 %files Brazil
 %defattr(-,root,root,-)
-%lang(pt_BR) %{_datadir}/locale/pt_BR/*
-%lang(pt_BR) %{tde_docdir}/HTML/pt_BR/
+%lang(pt_BR) %{tde_datadir}/locale/pt_BR/*
+%lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/
 %endif
 
 %if "%( grep -w ro <<< '%{KDE_LANGS}' )" != ""
 %files Romanian
 %defattr(-,root,root,-)
-%lang(ro) %{_datadir}/locale/ro/*
-%lang(ro) %{tde_docdir}/HTML/ro/
+%lang(ro) %{tde_datadir}/locale/ro/*
+%lang(ro) %{tde_tdedocdir}/HTML/ro/
 %endif
 
 %if "%( grep -w ru <<< '%{KDE_LANGS}' )" != ""
 %files Russian
 %defattr(-,root,root,-)
-%lang(ru) %{_datadir}/locale/ru/*
-%lang(ru) %{tde_docdir}/HTML/ru/
+%lang(ru) %{tde_datadir}/locale/ru/*
+%lang(ru) %{tde_tdedocdir}/HTML/ru/
 %endif
 
 %if "%( grep -w sk <<< '%{KDE_LANGS}' )" != ""
 %files Slovak
 %defattr(-,root,root,-)
-%lang(sk) %{_datadir}/locale/sk/*
-%lang(sk) %{tde_docdir}/HTML/sk/
+%lang(sk) %{tde_datadir}/locale/sk/*
+%lang(sk) %{tde_tdedocdir}/HTML/sk/
 %endif
 
 %if "%( grep -w sl <<< '%{KDE_LANGS}' )" != ""
 %files Slovenian
 %defattr(-,root,root,-)
-%lang(sl) %{_datadir}/locale/sl/*
-%lang(sl) %{tde_docdir}/HTML/sl/
+%lang(sl) %{tde_datadir}/locale/sl/*
+%lang(sl) %{tde_tdedocdir}/HTML/sl/
 %endif
 
 %if "%( grep -w sr <<< '%{KDE_LANGS}' )" != ""
 %files Serbian
 %defattr(-,root,root,-)
-%lang(sr) %{_datadir}/locale/sr/*
-%lang(sr) %{tde_docdir}/HTML/sr/
+%lang(sr) %{tde_datadir}/locale/sr/*
+%lang(sr) %{tde_tdedocdir}/HTML/sr/
 %endif
 
 %if "%( grep -w sv <<< '%{KDE_LANGS}' )" != ""
 %files Swedish
 %defattr(-,root,root,-)
-%lang(sv) %{_datadir}/locale/sv/*
-%lang(sv) %{tde_docdir}/HTML/sv/
+%lang(sv) %{tde_datadir}/locale/sv/*
+%lang(sv) %{tde_tdedocdir}/HTML/sv/
 %endif
 
 %if "%( grep -w ta <<< '%{KDE_LANGS}' )" != ""
 %files Tamil
 %defattr(-,root,root,-)
-%lang(ta) %{_datadir}/locale/ta/*
+%lang(ta) %{tde_datadir}/locale/ta/*
 %endif
 
 %if "%( grep -w tg <<< '%{KDE_LANGS}' )" != ""
 %files Tajik
 %defattr(-,root,root,-)
-%lang(tg) %{_datadir}/locale/tg/*
+%lang(tg) %{tde_datadir}/locale/tg/*
 %endif
 
 %if "%( grep -w th <<< '%{KDE_LANGS}' )" != ""
 %files Thai
 %defattr(-,root,root,-)
-%lang(th) %{_datadir}/locale/th/*
+%lang(th) %{tde_datadir}/locale/th/*
 %endif
 
 %if "%( grep -w tr <<< '%{KDE_LANGS}' )" != ""
 %files Turkish
 %defattr(-,root,root,-)
-%lang(tr) %{_datadir}/locale/tr/*
-%lang(tr) %{tde_docdir}/HTML/tr/
+%lang(tr) %{tde_datadir}/locale/tr/*
+%lang(tr) %{tde_tdedocdir}/HTML/tr/
 %endif
 
 %if "%( grep -w uk <<< '%{KDE_LANGS}' )" != ""
 %files Ukrainian
 %defattr(-,root,root,-)
-%lang(uk) %{tde_docdir}/HTML/uk/
-%lang(uk) %{_datadir}/locale/uk/*
+%lang(uk) %{tde_tdedocdir}/HTML/uk/
+%lang(uk) %{tde_datadir}/locale/uk/*
 %endif
 
 %if "%( grep -w ven <<< '%{KDE_LANGS}' )" != ""
 %files Venda
 %defattr(-,root,root,-)
-%lang(ven) %{_datadir}/locale/ven/*
+%lang(ven) %{tde_datadir}/locale/ven/*
 %endif
 
 %if "%( grep -w vi <<< '%{KDE_LANGS}' )" != ""
 %files Vietnamese
 %defattr(-,root,root,-)
-%lang(vi) %{_datadir}/locale/vi/*
+%lang(vi) %{tde_datadir}/locale/vi/*
 %endif
 
 %if "%( grep -w wa <<< '%{KDE_LANGS}' )" != ""
 %files Walloon
 %defattr(-,root,root,-)
-%lang(wa) %{_datadir}/locale/wa/*
+%lang(wa) %{tde_datadir}/locale/wa/*
 %endif
 
 %if "%( grep -w xh <<< '%{KDE_LANGS}' )" != ""
 %files Xhosa
 %defattr(-,root,root,-)
-%lang(xh) %{_datadir}/locale/xh/*
-%lang(xh) %{tde_docdir}/HTML/xh/
+%lang(xh) %{tde_datadir}/locale/xh/*
+%lang(xh) %{tde_tdedocdir}/HTML/xh/
 %endif
 
 %if "%( grep -w zh_CN <<< '%{KDE_LANGS}' )" != ""
 %files Chinese
 %defattr(-,root,root,-)
-%lang(zh_CN) %{_datadir}/locale/zh_CN/*
-%lang(zh_CN) %{tde_docdir}/HTML/zh_CN/
+%lang(zh_CN) %{tde_datadir}/locale/zh_CN/*
+%lang(zh_CN) %{tde_tdedocdir}/HTML/zh_CN/
 %endif
 
 %if "%( grep -w zh_TW <<< '%{KDE_LANGS}' )" != ""
 %files Chinese-Big5
 %defattr(-,root,root,-)
-%lang(zh_TW) %{_datadir}/locale/zh_TW/*
-%lang(zh_TW) %{tde_docdir}/HTML/zh_TW/
+%lang(zh_TW) %{tde_datadir}/locale/zh_TW/*
+%lang(zh_TW) %{tde_tdedocdir}/HTML/zh_TW/
 %endif
 
 %changelog
diff --git a/redhat/kdeaccessibility/kdeaccessibility-3.5.13-missing_ldflags.patch b/redhat/kdeaccessibility/kdeaccessibility-3.5.13-missing_ldflags.patch
new file mode 100644
index 000000000..5c7c7f2a3
--- /dev/null
+++ b/redhat/kdeaccessibility/kdeaccessibility-3.5.13-missing_ldflags.patch
@@ -0,0 +1,22 @@
+--- kdeaccessibility/ksayit/KTTSD_Lib/Makefile.am.ORI	2012-07-31 13:37:10.811009510 +0200
++++ kdeaccessibility/ksayit/KTTSD_Lib/Makefile.am	2012-07-31 13:37:33.505555438 +0200
+@@ -5,7 +5,7 @@
+ METASOURCES = AUTO
+ libKTTSD_Lib_la_LDFLAGS = -no-undefined $(all_libraries) -version-info 0:1
+ lib_LTLIBRARIES = libKTTSD_Lib.la
+-libKTTSD_Lib_la_LIBADD = $(LIB_KDEUI) $(LIB_KDECORE)
++libKTTSD_Lib_la_LIBADD = $(LIB_KDEUI) $(LIB_KDECORE) -lqt-mt -lDCOP
+ noinst_HEADERS = kttsdlib.h kttsdlibsetupimpl.h kttsdlibtalker2.h kdeexportfix.h
+ 
+ kspeech_DIR = $(KTTS_KSPEECH_DIR)
+--- kdeaccessibility/kttsd/libkttsd/Makefile.am.ORI	2012-07-31 17:09:08.905460827 +0200
++++ kdeaccessibility/kttsd/libkttsd/Makefile.am	2012-07-31 17:09:20.272109013 +0200
+@@ -26,7 +26,7 @@
+ 	notify.cpp
+ 
+ libkttsd_la_LDFLAGS = -version-info 1:0:0 $(all_libraries) -no-undefined
+-libkttsd_la_LIBADD = $(LIB_KIO)
++libkttsd_la_LIBADD = $(LIB_KIO) -lqt-mt -lkdeui -lkdecore
+ 
+ # Header files that should not be installed.
+ noinst_HEADERS = \
diff --git a/redhat/kdeaccessibility/trinity-kdeaccessibility-3.5.13.spec b/redhat/kdeaccessibility/trinity-kdeaccessibility-3.5.13.spec
index f43fa8300..880c05570 100644
--- a/redhat/kdeaccessibility/trinity-kdeaccessibility-3.5.13.spec
+++ b/redhat/kdeaccessibility/trinity-kdeaccessibility-3.5.13.spec
@@ -5,41 +5,82 @@
 %endif
 
 # TDE 3.5.13 specific building variables
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%define tde_bindir %{_prefix}/bin
+%define tde_datadir %{_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{_prefix}/include
+%define tde_libdir %{_prefix}/%{_lib}
 
+%define tde_tdeappdir %{tde_datadir}/applications/kde
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
 
-Summary: K Desktop Environment - Accessibility
-Name:    trinity-kdeaccessibility
-Version: 3.5.13
-Release: 2%{?dist}%{?_variant}
+%define _docdir %{tde_docdir}
 
-License: GPLv2
-Group: User Interface/Desktops
+
+Summary:	Trinity Desktop Environment - Accessibility
+Name:		trinity-tdeaccessibility
+Version:	3.5.13
+Release:	3%{?dist}%{?_variant}
+
+License:	GPLv2
+Group:		User Interface/Desktops
 
 Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org/
 
-Source0: kdeaccessibility-%{version}.tar.gz
+Source0:	kdeaccessibility-%{version}.tar.gz
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# [kdeaccessibility] Missing LDFLAGS causing FTBFS
+Patch1:		kdeaccessibility-3.5.13-missing_ldflags.patch
 
-Provides: kdeaccessibility3 = %{version}-%{release}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires: trinity-kdelibs
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
+BuildRequires:	cmake >= 2.8
+BuildRequires:	desktop-file-utils
+BuildRequires:	trinity-tdelibs-devel >= 3.5.13
+BuildRequires:	alsa-lib-devel
+BuildRequires:	trinity-akode-devel
+BuildRequires:	trinity-arts-devel >= 3.5.13
+BuildRequires:	trinity-tdemultimedia-devel >= 3.5.13
 
-BuildRequires: cmake >= 2.8
-BuildRequires: desktop-file-utils
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: alsa-lib-devel
 %if 0%{?fedora} > 4 || 0%{?rhel} > 4
 BuildRequires: libXtst-devel
 %endif
 
+%if 0%{?mgaversion}
+# Special packages for missing '.la' files on Mageia 2
+BuildRequires:	%{_lib}xi-devel %{_lib}xi-devel-libtool
+BuildRequires:	%{_lib}xext6-devel %{_lib}xext6-devel-libtool
+BuildRequires:	%{_lib}x11_6-devel %{_lib}x11_6-devel-libtool
+BuildRequires:	%{_lib}xcb-devel %{_lib}xcb-devel-libtool
+BuildRequires:	%{_lib}xau6-devel %{_lib}xau6-devel-libtool
+%else
+BuildRequires:	libXi-devel
+BuildRequires:	libXext-devel
+BuildRequires:	libX11-devel
+%if 0%{?rhel} >= 6 || 0%{?fedora}
+BuildRequires:	libxcb-devel
+%endif
+BuildRequires:	libXau-devel
+%endif
+
+Obsoletes:		trinity-kdeaccessibility < %{version}-%{release}
+Provides:		trinity-kdeaccessibility = %{version}-%{release}
+Obsoletes:		trinity-kdeaccessibility-libs < %{version}-%{release}
+Provides:		trinity-kdeaccessibility-libs = %{version}-%{release}
+
+Requires: trinity-kde-icons-mono = %{version}-%{release}
+Requires: trinity-kbstate = %{version}-%{release}
+Requires: trinity-kmag = %{version}-%{release}
+Requires: trinity-kmousetool = %{version}-%{release}
+Requires: trinity-kmouth = %{version}-%{release}
+Requires: trinity-ksayit = %{version}-%{release}
+Requires: trinity-kttsd = %{version}-%{release}
+Requires: trinity-kttsd-contrib-plugins = %{version}-%{release}
+
 %description
 Included with this package are:
 * kmag, a screen magnifier,
@@ -47,24 +88,353 @@ Included with this package are:
 * kmouth, program that allows people who have lost their voice
   to let their computer speak for them.
 
+%files
+
+##########
+
+%package -n trinity-kde-icons-mono
+Summary:	A monochromatic icons theme for TDE
+Group:		User Interface/Desktops
+
+%description -n trinity-kde-icons-mono
+A monochromatic icon theme for TDE, designed for accessibility purposes.
+
+This package is part of Trinity, as a component of the TDE accessibility module.
+
+%files -n trinity-kde-icons-mono
+%defattr(-,root,root,-)
+%{tde_datadir}/icons/mono/index.theme
+%{tde_datadir}/icons/mono/scalable/*/*.svgz
+
+##########
+
+%package -n trinity-kbstate
+Summary:	a keyboard status applet for TDE
+Group:		User Interface/Desktops
+
+%description -n trinity-kbstate
+A panel applet that displays the keyboard status.
+
+This package is part of Trinity, as a component of the TDE accessibility module.
+
+%files -n trinity-kbstate
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/kbstate_panelapplet.la
+%{tde_tdelibdir}/kbstate_panelapplet.so
+%{tde_datadir}/apps/kbstateapplet/
+%{tde_datadir}/apps/kicker/applets/kbstateapplet.desktop
+
+##########
+
+%package -n trinity-kmag
+Summary:	A screen magnifier for TDE
+Group:		User Interface/Desktops
+
+%description -n trinity-kmag
+KDE's screen magnifier tool.
+
+You can use KMagnifier to magnify a part of the screen just as you would use 
+a lens to magnify a newspaper fine-print or a photograph.  This application is
+useful for a variety of people: from researchers to artists to web-designers to
+people with low vision.
+
+This package is part of Trinity, as a component of the TDE accessibility module.
+
+%files -n trinity-kmag
+%defattr(-,root,root,-)
+%{tde_bindir}/kmag
+%{tde_datadir}/applnk/Applications/kmag.desktop
+%{tde_datadir}/apps/kmag/
+%{tde_datadir}/icons/hicolor/*/apps/kmag.png
+%{tde_datadir}/icons/locolor/*/apps/kmag.png
+%{tde_tdedocdir}/HTML/en/kmag/
+
+%post -n trinity-kmag
+/sbin/ldconfig ||:
+for icon_theme in hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+
+%postun -n trinity-kmag
+/sbin/ldconfig ||:
+for icon_theme in hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+
+##########
+
+%package -n trinity-kmousetool
+Summary:	TDE mouse manipulation tool for the disabled
+Group:		User Interface/Desktops
+
+%description -n trinity-kmousetool
+KMouseTool clicks the mouse whenever the mouse cursor pauses briefly. It was
+designed to help those with repetitive strain injuries, for whom pressing
+buttons hurts.
+
+This package is part of Trinity, as a component of the TDE accessibility module.
+
+%files -n trinity-kmousetool
+%defattr(-,root,root,-)
+%{tde_bindir}/kmousetool
+%{tde_datadir}/applnk/Applications/kmousetool.desktop
+%{tde_datadir}/apps/kmousetool/
+%{tde_datadir}/icons/hicolor/*/apps/kmousetool.png
+%{tde_tdedocdir}/HTML/en/kmousetool/
+
+%post -n trinity-kmousetool
+for icon_theme in hicolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+
+%postun -n trinity-kmousetool
+for icon_theme in hicolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+
+##########
+
+%package -n trinity-kmouth
+Summary:	A type-and-say KDE frontend for speech synthesizers
+Group:		User Interface/Desktops
+
+%description -n trinity-kmouth
+KDE's type-and-say frontend for speech synthesizers.
+
+It includes a history of spoken sentences from which the user can select
+sentences to be re-spoken.
+
+This package is part of Trinity, as a component of the TDE accessibility module.
+
+%files -n trinity-kmouth
+%defattr(-,root,root,-)
+%{tde_datadir}/config/kmouthrc
+%{tde_bindir}/kmouth
+%{tde_datadir}/applnk/Applications/kmouth.desktop
+%{tde_datadir}/apps/kmouth/
+%{tde_datadir}/icons/hicolor/*/actions/speak.png
+%{tde_datadir}/icons/hicolor/*/actions/nospeak.png
+%{tde_datadir}/icons/hicolor/*/apps/kmouth.png
+%{tde_datadir}/icons/locolor/*/actions/speak.png
+%{tde_datadir}/icons/locolor/*/apps/kmouth.png
+%{tde_tdedocdir}/HTML/en/kmouth/
+
+%post -n trinity-kmouth
+for icon_theme in hicolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+
+%postun -n trinity-kmouth
+for icon_theme in hicolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+
+##########
+
+%package -n trinity-ksayit
+Summary:	A frontend for the TDE Text-to-Speech system
+Group:		User Interface/Desktops
+
+%description -n trinity-ksayit
+Text-to-speech front-end to kttsd.
+
+This package is part of Trinity, as a component of the TDE accessibility module.
+
+%files -n trinity-ksayit
+%defattr(-,root,root,-)
+%{tde_bindir}/ksayit
+%{tde_tdeincludedir}/ksayit_fxplugin.h
+%{tde_tdelibdir}/libFreeverb_plugin.la
+%{tde_tdelibdir}/libFreeverb_plugin.so
+%{tde_libdir}/libKTTSD_Lib.so.*
+%{tde_tdeappdir}/ksayit.desktop
+%{tde_datadir}/apps/ksayit/
+%{tde_datadir}/icons/hicolor/*/apps/ksayit.png
+%{tde_datadir}/icons/hicolor/32x32/apps/ksayit_clipempty.png
+%{tde_datadir}/icons/hicolor/32x32/apps/ksayit_talking.png
+%{tde_datadir}/services/ksayit_libFreeverb.desktop
+%{tde_datadir}/servicetypes/ksayit_libFreeverb_service.desktop
+
+%post -n trinity-ksayit
+/sbin/ldconfig ||:
+for icon_theme in mono hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-ksayit
+/sbin/ldconfig ||:
+for icon_theme in mono hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kttsd
+Summary:	A Text-to-Speech system for TDE
+Group:		User Interface/Desktops
+
+%description -n trinity-kttsd
+The KDE Text-to-Speech system is a plugin based service that allows any KDE
+(or non-KDE) application to speak using the DCOP interface.
+
+ksayit and kmouth are useful front-ends for this capability, while one of
+festival, flite, and epos are essential back-ends.
+
+This package is part of Trinity, as a component of the TDE accessibility module.
+
+Homepage: http://accessibility.kde.org/developer/kttsd
+
+%files -n trinity-kttsd
+%defattr(-,root,root,-)
+%{tde_bindir}/kttsd
+%{tde_bindir}/kttsmgr
+%{tde_tdelibdir}/kcm_kttsd.la
+%{tde_tdelibdir}/kcm_kttsd.so
+%{tde_tdelibdir}/ktexteditor_kttsd.la
+%{tde_tdelibdir}/ktexteditor_kttsd.so
+%{tde_tdelibdir}/libkttsd_akodeplugin.la
+%{tde_tdelibdir}/libkttsd_akodeplugin.so
+%{tde_tdelibdir}/libkttsd_alsaplugin.la
+%{tde_tdelibdir}/libkttsd_alsaplugin.so
+%{tde_tdelibdir}/libkttsd_artsplugin.la
+%{tde_tdelibdir}/libkttsd_artsplugin.so
+%{tde_tdelibdir}/libkttsd_commandplugin.la
+%{tde_tdelibdir}/libkttsd_commandplugin.so
+%{tde_tdelibdir}/libkttsd_eposplugin.la
+%{tde_tdelibdir}/libkttsd_eposplugin.so
+%{tde_tdelibdir}/libkttsd_festivalintplugin.la
+%{tde_tdelibdir}/libkttsd_festivalintplugin.so
+%{tde_tdelibdir}/libkttsd_fliteplugin.la
+%{tde_tdelibdir}/libkttsd_fliteplugin.so
+%{tde_tdelibdir}/libkttsd_sbdplugin.la
+%{tde_tdelibdir}/libkttsd_sbdplugin.so
+%{tde_tdelibdir}/libkttsd_stringreplacerplugin.la
+%{tde_tdelibdir}/libkttsd_stringreplacerplugin.so
+%{tde_tdelibdir}/libkttsd_talkerchooserplugin.la
+%{tde_tdelibdir}/libkttsd_talkerchooserplugin.so
+%{tde_tdelibdir}/libkttsd_xmltransformerplugin.la
+%{tde_tdelibdir}/libkttsd_xmltransformerplugin.so
+%{tde_tdelibdir}/libkttsjobmgrpart.la
+%{tde_tdelibdir}/libkttsjobmgrpart.so
+%{tde_libdir}/libkttsd.so.*
+%{tde_tdeappdir}/kcmkttsd.desktop
+%{tde_tdeappdir}/kttsmgr.desktop
+%{tde_datadir}/apps/ktexteditor_kttsd/ktexteditor_kttsdui.rc
+%exclude %{tde_datadir}/apps/kttsd/hadifix/xslt/SSMLtoTxt2pho.xsl
+%{tde_datadir}/apps/kttsd/
+%{tde_datadir}/icons/hicolor/16x16/actions/female.png
+%{tde_datadir}/icons/hicolor/16x16/actions/male.png
+%{tde_datadir}/services/ktexteditor_kttsd.desktop
+%{tde_datadir}/services/kttsd.desktop
+%{tde_datadir}/services/kttsd_akodeplugin.desktop
+%{tde_datadir}/services/kttsd_alsaplugin.desktop
+%{tde_datadir}/services/kttsd_artsplugin.desktop
+%{tde_datadir}/services/kttsd_commandplugin.desktop
+%{tde_datadir}/services/kttsd_eposplugin.desktop
+%{tde_datadir}/services/kttsd_festivalintplugin.desktop
+%{tde_datadir}/services/kttsd_fliteplugin.desktop
+%{tde_datadir}/services/kttsd_sbdplugin.desktop
+%{tde_datadir}/services/kttsd_stringreplacerplugin.desktop
+%{tde_datadir}/services/kttsd_talkerchooserplugin.desktop
+%{tde_datadir}/services/kttsd_xmltransformerplugin.desktop
+%{tde_datadir}/services/kttsjobmgr.desktop
+%{tde_datadir}/servicetypes/kttsd_audioplugin.desktop
+%{tde_datadir}/servicetypes/kttsd_filterplugin.desktop
+%{tde_datadir}/servicetypes/kttsd_synthplugin.desktop
+%{tde_datadir}/icons/crystalsvg/*/apps/kttsd.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kttsd.svgz
+%{tde_tdedocdir}/HTML/en/kttsd/
+
+%post -n trinity-kttsd
+/sbin/ldconfig ||:
+for icon_theme in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kttsd
+/sbin/ldconfig ||:
+for icon_theme in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kttsd-contrib-plugins
+Summary:	the TDE Text-to-Speech system
+Group:		User Interface/Desktops
+Requires:	trinity-kttsd = %{version}-%{release}
+
+%description -n trinity-kttsd-contrib-plugins
+kttsd synthetizer plugins that depends on non-free software :
+* FreeTTS plugin.
+* Hadifix (mbrola/txt2pho) plugin.
+Those plugins will require manual installation of third party,
+non free software to work.
+
+This package is part of Trinity, as a component of the TDE accessibility module.
+
+%files -n trinity-kttsd-contrib-plugins
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/libkttsd_freettsplugin.la
+%{tde_tdelibdir}/libkttsd_freettsplugin.so
+%{tde_tdelibdir}/libkttsd_hadifixplugin.la
+%{tde_tdelibdir}/libkttsd_hadifixplugin.so
+%{tde_datadir}/apps/kttsd/hadifix/xslt/SSMLtoTxt2pho.xsl
+%{tde_datadir}/services/kttsd_freettsplugin.desktop
+%{tde_datadir}/services/kttsd_hadifixplugin.desktop
+
+##########
+
 %package devel
-Summary: Development files for %{name}
-Group:   Development/Libraries
-Provides: kdeaccessibility3-devel = %{version}-%{release}
-Requires: %{name} = %{version}-%{release}
-Requires: trinity-kdelibs-devel
+Summary:	Development files for %{name}
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+Requires:	trinity-tdelibs-devel >= 3.5.13
+
+Obsoletes:		trinity-kdeaccessibility-devel < %{version}-%{release}
+Provides:		trinity-kdeaccessibility-devel = %{version}-%{release}
+
 %description devel
 %{summary}.
 
+%files devel
+%defattr(-,root,root,-)
+%{tde_libdir}/libkttsd.la
+%{tde_libdir}/libkttsd.so
+%{tde_libdir}/libKTTSD_Lib.la
+%{tde_libdir}/libKTTSD_Lib.so
+
+%post devel
+/sbin/ldconfig ||:
+
+%postun devel
+/sbin/ldconfig ||:
+
+##########
 
 %prep
 %setup -q -n kdeaccessibility
+%patch1 -p1 -b .ftbfs
 
 # Ugly hack to modify TQT include directory inside autoconf files.
 # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
 %__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{_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"
@@ -73,34 +443,38 @@ Requires: trinity-kdelibs-devel
 
 %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}"
+
+# Avoir conflict with KDE4, if installed
+# see file: '/etc/profile.d/kde.sh' from package 'kde-settings'
+export KDEDIRS=%{_prefix}
+export KDEDIR=%{_prefix}
 
 %configure \
-  --includedir=%{tde_includedir} \
+  --exec-prefix=%{_prefix} \
+  --bindir=%{tde_bindir} \
+  --libdir=%{tde_libdir} \
+  --datadir=%{tde_datadir} \
+  --includedir=%{tde_tdeincludedir} \
   --disable-rpath \
   --enable-new-ldflags \
   --enable-closure \
   --disable-debug --disable-warnings \
   --enable-final \
-  --with-extra-includes=%{_includedir}/tqt
+  --enable-ksayit-audio-plugins \
+  --with-akode \
+  --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}
 
-desktop-file-install \
-  --vendor="" \
-  --dir %{buildroot}%{_datadir}/applications/kde \
-  --delete-original \
-  %{buildroot}%{_datadir}/applnk/Applications/*.desktop ||:
-
 # file lists for locale
-%find_lang %{name} || touch %{name}.lang
 HTML_DIR=$(kde-config --expandvars --install html)
 if [ -d %{buildroot}/$HTML_DIR ]; then
   for lang_dir in %{buildroot}/$HTML_DIR/* ; do
@@ -117,67 +491,18 @@ if [ -d %{buildroot}/$HTML_DIR ]; then
   done
 fi
 
-# rpmdocs
-for dir in kmag kmousetool ksayit kttsd ; do
-  for file in AUTHORS ChangeLog README TODO ; do
-    test -s  $dir/$file && install -p -m644 -D $dir/$file rpmdocs/$dir/$file
-  done
-done
-
-
 
 %clean
 %__rm -rf %{buildroot}
 
 
-%post
-/sbin/ldconfig ||:
-for icon_theme in mono hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-
-%postun
-/sbin/ldconfig ||:
-for icon_theme in mono hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-
-
-%files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc COPYING
-%doc rpmdocs/*
-%{_bindir}/*
-%{_datadir}/applications/kde/*.desktop
-%{_datadir}/apps/*/
-%{_datadir}/config/*
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/icons/locolor/*/*/*
-%{_datadir}/icons/mono/
-%{_datadir}/icons/crystalsvg/*/*/*
-%{_datadir}/service*/*.desktop
-%{_libdir}/lib*.so.*
-%{_libdir}/*.la
-%{tde_libdir}/*
-
-# Misc docs
-%doc %lang(en) %{tde_docdir}/HTML/en/kmag
-%doc %lang(en) %{tde_docdir}/HTML/en/kmousetool
-%doc %lang(en) %{tde_docdir}/HTML/en/kmouth
-%doc %lang(en) %{tde_docdir}/HTML/en/kttsd
-
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_includedir}/*
-%{_libdir}/lib*.so
-
 
 %changelog
+* Tue Jul 30 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
+- Split into several packages
+- Renames to 'trinity-tdeaccessibility'
+- Add support for Mageia 2
+
 * Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
 - Fix HTML directory location
 
diff --git a/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec b/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec
index 35d709546..cf8496217 100644
--- a/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec
+++ b/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec
@@ -1,14 +1,21 @@
 # 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
-%define tde_appdir %{_datadir}/applications/kde
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%define tde_bindir %{_prefix}/bin
+%define tde_datadir %{_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{_prefix}/include
+%define tde_libdir %{_prefix}/%{_lib}
+
+%define tde_tdeappdir %{tde_datadir}/applications/kde
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_docdir}
 
 Name:		trinity-tdeaddons
 Summary:	Trinity Desktop Environment - Plugins
@@ -35,10 +42,10 @@ Source1: metabar-fedora.tar.bz2
 Source2: metabarrc
 
 BuildRequires: autoconf automake libtool m4
-BuildRequires: trinity-kdebase-devel
-BuildRequires: trinity-kdegames-devel
-BuildRequires: trinity-kdemultimedia-devel
-BuildRequires: trinity-kdepim-devel
+BuildRequires: trinity-tdebase-devel
+BuildRequires: trinity-tdegames-devel
+BuildRequires: trinity-tdemultimedia-devel
+BuildRequires: trinity-tdepim-devel
 
 BuildRequires: SDL-devel
 BuildRequires: alsa-lib-devel
@@ -73,8 +80,6 @@ A collection of TDE Addons/Plugins, including:
 
 %files
 %defattr(-,root,root,-)
-%doc README
-%doc rpmdocs/*
 
 ##########
 
@@ -82,7 +87,7 @@ A collection of TDE Addons/Plugins, including:
 Summary:	Game board designer for Atlantik
 Group:		Applications/Games
 #Requires:	trinity-atlantik
-Requires:	trinity-kdegames
+Requires:	trinity-tdegames
 
 %description -n trinity-atlantikdesigner
 Atlantik Designer is a game board designer for the game Atlantik.
@@ -95,25 +100,25 @@ America and Europe.
 
 %files -n trinity-atlantikdesigner
 %defattr(-,root,root,-)
-%doc atlantikdesigner/TODO
-%{_bindir}/atlantikdesigner
-%{_datadir}/apps/atlantikdesigner
-%{tde_appdir}/atlantikdesigner.desktop
-%{_datadir}/icons/hicolor/*/apps/atlantikdesigner.png
+%doc README atlantikdesigner/TODO
+%{tde_bindir}/atlantikdesigner
+%{tde_datadir}/apps/atlantikdesigner
+%{tde_tdeappdir}/atlantikdesigner.desktop
+%{tde_datadir}/icons/hicolor/*/apps/atlantikdesigner.png
 
 %post -n trinity-atlantikdesigner
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %postun -n trinity-atlantikdesigner
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 ##########
 
@@ -132,12 +137,13 @@ by the German freemail provider GMX.
 
 %files -n trinity-kaddressbook-plugins
 %defattr(-,root,root,-)
-%{tde_libdir}/libkaddrbk_geo_xxport.la
-%{tde_libdir}/libkaddrbk_geo_xxport.so
-%{tde_libdir}/libkaddrbk_gmx_xxport.la
-%{tde_libdir}/libkaddrbk_gmx_xxport.so
-%{_datadir}/apps/kaddressbook
-%{_datadir}/services/kaddressbook
+%doc README
+%{tde_tdelibdir}/libkaddrbk_geo_xxport.la
+%{tde_tdelibdir}/libkaddrbk_geo_xxport.so
+%{tde_tdelibdir}/libkaddrbk_gmx_xxport.la
+%{tde_tdelibdir}/libkaddrbk_gmx_xxport.so
+%{tde_datadir}/apps/kaddressbook
+%{tde_datadir}/services/kaddressbook
 
 ##########
 
@@ -159,56 +165,57 @@ a tab bar, a Python browser and even more.
 
 %files -n trinity-kate-plugins
 %defattr(-,root,root,-)
-%{tde_libdir}/katecppsymbolviewerplugin.la
-%{tde_libdir}/katecppsymbolviewerplugin.so
-%{tde_libdir}/katefiletemplates.la
-%{tde_libdir}/katefiletemplates.so
-%{tde_libdir}/katefll_plugin.la
-%{tde_libdir}/katefll_plugin.so
-%{tde_libdir}/katehelloworldplugin.la
-%{tde_libdir}/katehelloworldplugin.so
-%{tde_libdir}/katehtmltoolsplugin.la
-%{tde_libdir}/katehtmltoolsplugin.so
-%{tde_libdir}/kateinsertcommandplugin.la
-%{tde_libdir}/kateinsertcommandplugin.so
-%{tde_libdir}/katemakeplugin.la
-%{tde_libdir}/katemakeplugin.so
-%{tde_libdir}/katemodelineplugin.la
-%{tde_libdir}/katemodelineplugin.so
-%{tde_libdir}/kateopenheaderplugin.la
-%{tde_libdir}/kateopenheaderplugin.so
-%{tde_libdir}/katepybrowseplugin.la
-%{tde_libdir}/katepybrowseplugin.so
-%{tde_libdir}/katesnippetsplugin.la
-%{tde_libdir}/katesnippetsplugin.so
-%{tde_libdir}/katetextfilterplugin.la
-%{tde_libdir}/katetextfilterplugin.so
-%{tde_libdir}/katexmlcheckplugin.la
-%{tde_libdir}/katexmlcheckplugin.so
-%{tde_libdir}/katexmltoolsplugin.la
-%{tde_libdir}/katexmltoolsplugin.so
-%{tde_libdir}/libkatetabbarextensionplugin.la
-%{tde_libdir}/libkatetabbarextensionplugin.so
-%{_datadir}/applnk/.hidden/katefll.desktop
-%{_datadir}/apps/kate
-%{_datadir}/apps/katepart
-%{_datadir}/apps/katexmltools
-%{_datadir}/services/katecppsymbolviewer.desktop
-%{_datadir}/services/katefiletemplates.desktop
-%{_datadir}/services/katefll_plugin.desktop
-%{_datadir}/services/katehelloworld.desktop
-%{_datadir}/services/katehtmltools.desktop
-%{_datadir}/services/kateinsertcommand.desktop
-%{_datadir}/services/katemake.desktop
-%{_datadir}/services/katemodeline.desktop
-%{_datadir}/services/kateopenheader.desktop
-%{_datadir}/services/katepybrowse.desktop
-%{_datadir}/services/katesnippets.desktop
-%{_datadir}/services/katetabbarextension.desktop
-%{_datadir}/services/katetextfilter.desktop
-%{_datadir}/services/katexmlcheck.desktop
-%{_datadir}/services/katexmltools.desktop
-%{tde_docdir}/HTML/en/kate-plugins/
+%doc kate/xmltools/ChangeLog kate/xmltools/README
+%{tde_tdelibdir}/katecppsymbolviewerplugin.la
+%{tde_tdelibdir}/katecppsymbolviewerplugin.so
+%{tde_tdelibdir}/katefiletemplates.la
+%{tde_tdelibdir}/katefiletemplates.so
+%{tde_tdelibdir}/katefll_plugin.la
+%{tde_tdelibdir}/katefll_plugin.so
+%{tde_tdelibdir}/katehelloworldplugin.la
+%{tde_tdelibdir}/katehelloworldplugin.so
+%{tde_tdelibdir}/katehtmltoolsplugin.la
+%{tde_tdelibdir}/katehtmltoolsplugin.so
+%{tde_tdelibdir}/kateinsertcommandplugin.la
+%{tde_tdelibdir}/kateinsertcommandplugin.so
+%{tde_tdelibdir}/katemakeplugin.la
+%{tde_tdelibdir}/katemakeplugin.so
+%{tde_tdelibdir}/katemodelineplugin.la
+%{tde_tdelibdir}/katemodelineplugin.so
+%{tde_tdelibdir}/kateopenheaderplugin.la
+%{tde_tdelibdir}/kateopenheaderplugin.so
+%{tde_tdelibdir}/katepybrowseplugin.la
+%{tde_tdelibdir}/katepybrowseplugin.so
+%{tde_tdelibdir}/katesnippetsplugin.la
+%{tde_tdelibdir}/katesnippetsplugin.so
+%{tde_tdelibdir}/katetextfilterplugin.la
+%{tde_tdelibdir}/katetextfilterplugin.so
+%{tde_tdelibdir}/katexmlcheckplugin.la
+%{tde_tdelibdir}/katexmlcheckplugin.so
+%{tde_tdelibdir}/katexmltoolsplugin.la
+%{tde_tdelibdir}/katexmltoolsplugin.so
+%{tde_tdelibdir}/libkatetabbarextensionplugin.la
+%{tde_tdelibdir}/libkatetabbarextensionplugin.so
+%{tde_datadir}/applnk/.hidden/katefll.desktop
+%{tde_datadir}/apps/kate
+%{tde_datadir}/apps/katepart
+%{tde_datadir}/apps/katexmltools
+%{tde_datadir}/services/katecppsymbolviewer.desktop
+%{tde_datadir}/services/katefiletemplates.desktop
+%{tde_datadir}/services/katefll_plugin.desktop
+%{tde_datadir}/services/katehelloworld.desktop
+%{tde_datadir}/services/katehtmltools.desktop
+%{tde_datadir}/services/kateinsertcommand.desktop
+%{tde_datadir}/services/katemake.desktop
+%{tde_datadir}/services/katemodeline.desktop
+%{tde_datadir}/services/kateopenheader.desktop
+%{tde_datadir}/services/katepybrowse.desktop
+%{tde_datadir}/services/katesnippets.desktop
+%{tde_datadir}/services/katetabbarextension.desktop
+%{tde_datadir}/services/katetextfilter.desktop
+%{tde_datadir}/services/katexmlcheck.desktop
+%{tde_datadir}/services/katexmltools.desktop
+%{tde_tdedocdir}/HTML/en/kate-plugins/
 
 ##########
 
@@ -229,36 +236,37 @@ provided for audio and image files.
 
 %files kfile-plugins
 %defattr(-,root,root,-)
-%{_bindir}/lnkforward
-%{tde_libdir}/kfile_cert.la
-%{tde_libdir}/kfile_cert.so
-%{tde_libdir}/kfile_desktop.la
-%{tde_libdir}/kfile_desktop.so
-%{tde_libdir}/kfile_folder.la
-%{tde_libdir}/kfile_folder.so
-%{tde_libdir}/kfile_html.la
-%{tde_libdir}/kfile_html.so
-%{tde_libdir}/kfile_lnk.la
-%{tde_libdir}/kfile_lnk.so
-%{tde_libdir}/kfile_mhtml.la
-%{tde_libdir}/kfile_mhtml.so
-%{tde_libdir}/kfile_txt.la
-%{tde_libdir}/kfile_txt.so
-%{tde_libdir}/librenaudioplugin.la
-%{tde_libdir}/librenaudioplugin.so
-%{tde_libdir}/librenimageplugin.la
-%{tde_libdir}/librenimageplugin.so
-%{_datadir}/applnk/.hidden/lnkforward.desktop
-%{_datadir}/mimelnk/application/x-win-lnk.desktop
-%{_datadir}/services/kfile_cert.desktop
-%{_datadir}/services/kfile_desktop.desktop
-%{_datadir}/services/kfile_folder.desktop
-%{_datadir}/services/kfile_html.desktop
-%{_datadir}/services/kfile_lnk.desktop
-%{_datadir}/services/kfile_mhtml.desktop
-%{_datadir}/services/kfile_txt.desktop
-%{_datadir}/services/renaudiodlg.desktop
-%{_datadir}/services/renimagedlg.desktop
+%doc kfile-plugins/lnk/README
+%{tde_bindir}/lnkforward
+%{tde_tdelibdir}/kfile_cert.la
+%{tde_tdelibdir}/kfile_cert.so
+%{tde_tdelibdir}/kfile_desktop.la
+%{tde_tdelibdir}/kfile_desktop.so
+%{tde_tdelibdir}/kfile_folder.la
+%{tde_tdelibdir}/kfile_folder.so
+%{tde_tdelibdir}/kfile_html.la
+%{tde_tdelibdir}/kfile_html.so
+%{tde_tdelibdir}/kfile_lnk.la
+%{tde_tdelibdir}/kfile_lnk.so
+%{tde_tdelibdir}/kfile_mhtml.la
+%{tde_tdelibdir}/kfile_mhtml.so
+%{tde_tdelibdir}/kfile_txt.la
+%{tde_tdelibdir}/kfile_txt.so
+%{tde_tdelibdir}/librenaudioplugin.la
+%{tde_tdelibdir}/librenaudioplugin.so
+%{tde_tdelibdir}/librenimageplugin.la
+%{tde_tdelibdir}/librenimageplugin.so
+%{tde_datadir}/applnk/.hidden/lnkforward.desktop
+%{tde_datadir}/mimelnk/application/x-win-lnk.desktop
+%{tde_datadir}/services/kfile_cert.desktop
+%{tde_datadir}/services/kfile_desktop.desktop
+%{tde_datadir}/services/kfile_folder.desktop
+%{tde_datadir}/services/kfile_html.desktop
+%{tde_datadir}/services/kfile_lnk.desktop
+%{tde_datadir}/services/kfile_mhtml.desktop
+%{tde_datadir}/services/kfile_txt.desktop
+%{tde_datadir}/services/renaudiodlg.desktop
+%{tde_datadir}/services/renimagedlg.desktop
 
 ##########
 
@@ -280,33 +288,34 @@ controls XMMS, install the xmms-kde-trinity package.
 
 %files -n trinity-kicker-applets
 %defattr(-,root,root,-)
-%{tde_libdir}/kolourpicker_panelapplet.la
-%{tde_libdir}/kolourpicker_panelapplet.so
-%{tde_libdir}/ktimemon_panelapplet.la
-%{tde_libdir}/ktimemon_panelapplet.so
-%{tde_libdir}/math_panelapplet.la
-%{tde_libdir}/math_panelapplet.so
-%{tde_libdir}/mediacontrol_panelapplet.la
-%{tde_libdir}/mediacontrol_panelapplet.so
-%{tde_libdir}/kbinaryclock_panelapplet.la
-%{tde_libdir}/kbinaryclock_panelapplet.so
-%{_datadir}/apps/kicker/applets
-%{_datadir}/apps/mediacontrol
-%{_datadir}/config.kcfg/kbinaryclock.kcfg
-%{_datadir}/icons/locolor/*/apps/ktimemon.png
-%{_datadir}/icons/crystalsvg/*/apps/ktimemon.png
-%{tde_docdir}/HTML/en/kicker-applets/
+%doc README 
+%{tde_tdelibdir}/kolourpicker_panelapplet.la
+%{tde_tdelibdir}/kolourpicker_panelapplet.so
+%{tde_tdelibdir}/ktimemon_panelapplet.la
+%{tde_tdelibdir}/ktimemon_panelapplet.so
+%{tde_tdelibdir}/math_panelapplet.la
+%{tde_tdelibdir}/math_panelapplet.so
+%{tde_tdelibdir}/mediacontrol_panelapplet.la
+%{tde_tdelibdir}/mediacontrol_panelapplet.so
+%{tde_tdelibdir}/kbinaryclock_panelapplet.la
+%{tde_tdelibdir}/kbinaryclock_panelapplet.so
+%{tde_datadir}/apps/kicker/applets
+%{tde_datadir}/apps/mediacontrol
+%{tde_datadir}/config.kcfg/kbinaryclock.kcfg
+%{tde_datadir}/icons/locolor/*/apps/ktimemon.png
+%{tde_datadir}/icons/crystalsvg/*/apps/ktimemon.png
+%{tde_tdedocdir}/HTML/en/kicker-applets/
 
 %post -n trinity-kicker-applets
 for f in crystalsvg locolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
 done
 
 %postun -n trinity-kicker-applets
 for f in crystalsvg locolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
 done
 
 ##########
@@ -331,7 +340,8 @@ and various local news sources.
 
 %files -n trinity-knewsticker-scripts
 %defattr(-,root,root,-)
-%{_datadir}/apps/knewsticker/
+%doc README
+%{tde_datadir}/apps/knewsticker/
 
 ##########
 
@@ -343,7 +353,7 @@ Requires:	python
 Requires:	rsync
 #Requires:	unison
 Requires:	trinity-konqueror
-%if 0%{?fedora} > 0
+%if 0%{?fedora}
 Requires:	python-exif
 %endif
 
@@ -365,156 +375,157 @@ graphical disk usage viewer and image conversions and transformations.
 
 %files -n trinity-konq-plugins
 %defattr(-,root,root,-)
-%{_datadir}/config/translaterc
-%{_bindir}/fsview
-%{_bindir}/jpegorient
-%{_bindir}/kio_media_realfolder
-%{tde_libdir}/konq_sidebarnews.la
-%{tde_libdir}/konq_sidebarnews.so
-%{tde_libdir}/konqsidebar_delicious.la
-%{tde_libdir}/konqsidebar_delicious.so
-%{tde_libdir}/konqsidebar_mediaplayer.la
-%{tde_libdir}/konqsidebar_mediaplayer.so
-%{tde_libdir}/konqsidebar_metabar.la
-%{tde_libdir}/konqsidebar_metabar.so
-%{tde_libdir}/libakregatorkonqfeedicon.la
-%{tde_libdir}/libakregatorkonqfeedicon.so
-%{tde_libdir}/libakregatorkonqplugin.la
-%{tde_libdir}/libakregatorkonqplugin.so
-%{tde_libdir}/libarkplugin.la
-%{tde_libdir}/libarkplugin.so
-%{tde_libdir}/libautorefresh.la
-%{tde_libdir}/libautorefresh.so
-%{tde_libdir}/libbabelfishplugin.la
-%{tde_libdir}/libbabelfishplugin.so
-%{tde_libdir}/libcrashesplugin.la
-%{tde_libdir}/libcrashesplugin.so
-%{tde_libdir}/libdirfilterplugin.la
-%{tde_libdir}/libdirfilterplugin.so
-%{tde_libdir}/librsyncplugin.la
-%{tde_libdir}/librsyncplugin.so
-%{tde_libdir}/libdomtreeviewerplugin.la
-%{tde_libdir}/libdomtreeviewerplugin.so
-%{tde_libdir}/libfsviewpart.la
-%{tde_libdir}/libfsviewpart.so
-%{tde_libdir}/libkhtmlsettingsplugin.la
-%{tde_libdir}/libkhtmlsettingsplugin.so
-%{tde_libdir}/kcm_kuick.la
-%{tde_libdir}/kcm_kuick.so
-%{tde_libdir}/libkimgallery.la
-%{tde_libdir}/libkimgallery.so
-%{tde_libdir}/libkuickplugin.la
-%{tde_libdir}/libkuickplugin.so
-%{tde_libdir}/libmfkonqmficon.la
-%{tde_libdir}/libmfkonqmficon.so
-%{tde_libdir}/libminitoolsplugin.la
-%{tde_libdir}/libminitoolsplugin.so
-%{tde_libdir}/librellinksplugin.la
-%{tde_libdir}/librellinksplugin.so
-%{tde_libdir}/libsearchbarplugin.la
-%{tde_libdir}/libsearchbarplugin.so
-%{tde_libdir}/libuachangerplugin.la
-%{tde_libdir}/libuachangerplugin.so
-%{tde_libdir}/libvalidatorsplugin.la
-%{tde_libdir}/libvalidatorsplugin.so
-%{tde_libdir}/libwebarchiverplugin.la
-%{tde_libdir}/libwebarchiverplugin.so
-%{tde_libdir}/webarchivethumbnail.la
-%{tde_libdir}/webarchivethumbnail.so
-%{_datadir}/applnk/.hidden/arkplugin.desktop
-%{_datadir}/applnk/.hidden/kcmkuick.desktop
-%{_datadir}/applnk/.hidden/kuickplugin.desktop
-%{_datadir}/applnk/.hidden/mediaplayerplugin.desktop
-%{_datadir}/applnk/.hidden/crashesplugin.desktop
-%{_datadir}/applnk/.hidden/dirfilterplugin.desktop
-%{_datadir}/applnk/.hidden/rsyncplugin.desktop
-%{_datadir}/applnk/.hidden/fsview.desktop
-%{_datadir}/applnk/.hidden/khtmlsettingsplugin.desktop
-%{_datadir}/applnk/.hidden/kimgalleryplugin.desktop
-%{_datadir}/applnk/.hidden/plugin_babelfish.desktop
-%{_datadir}/applnk/.hidden/plugin_domtreeviewer.desktop
-%{_datadir}/applnk/.hidden/plugin_validators.desktop
-%{_datadir}/applnk/.hidden/plugin_webarchiver.desktop
-%{_datadir}/applnk/.hidden/uachangerplugin.desktop
-%{_datadir}/apps/akregator
-%{_datadir}/apps/domtreeviewer
-%{_datadir}/apps/fsview
-%{_datadir}/apps/imagerotation/orient.py*
-%{_datadir}/apps/imagerotation/exif.py*
-%{_datadir}/apps/khtml/kpartplugins
-%{_datadir}/apps/konqiconview
-%{_datadir}/apps/konqlistview
-%{_datadir}/apps/konqsidebartng
-%{_datadir}/apps/konqueror/icons
-%{_datadir}/apps/konqueror/kpartplugins
-%{_datadir}/apps/konqueror/servicemenus
-%{_datadir}/apps/metabar/iconsrc
-%{_datadir}/apps/metabar/themes/default/default.css
-%{_datadir}/apps/metabar/themes/default/layout.html
-%{_datadir}/apps/microformat/pics/microformat.png
-%{_datadir}/config.kcfg/konq_sidebarnews.kcfg
-%{_datadir}/icons/locolor/16x16/apps/autorefresh.png
-%{_datadir}/icons/crystalsvg/16x16/actions/babelfish.png
-%{_datadir}/icons/crystalsvg/16x16/actions/cssvalidator.png
-%{_datadir}/icons/crystalsvg/16x16/actions/domtreeviewer.png
-%{_datadir}/icons/crystalsvg/16x16/actions/htmlvalidator.png
-%{_datadir}/icons/crystalsvg/16x16/actions/imagegallery.png
-%{_datadir}/icons/crystalsvg/16x16/actions/remotesync.png
-%{_datadir}/icons/crystalsvg/16x16/actions/remotesyncconfig.png
-%{_datadir}/icons/crystalsvg/16x16/actions/minitools.png
-%{_datadir}/icons/crystalsvg/16x16/actions/validators.png
-%{_datadir}/icons/crystalsvg/16x16/actions/webarchiver.png
-%{_datadir}/icons/crystalsvg/16x16/apps/konqsidebar_delicious.png
-%{_datadir}/icons/crystalsvg/16x16/apps/konqsidebar_mediaplayer.png
-%{_datadir}/icons/crystalsvg/16x16/apps/konqsidebar_news.png
-%{_datadir}/icons/crystalsvg/22x22/actions/babelfish.png
-%{_datadir}/icons/crystalsvg/22x22/actions/cssvalidator.png
-%{_datadir}/icons/crystalsvg/22x22/actions/domtreeviewer.png
-%{_datadir}/icons/crystalsvg/22x22/actions/htmlvalidator.png
-%{_datadir}/icons/crystalsvg/22x22/actions/imagegallery.png
-%{_datadir}/icons/crystalsvg/22x22/actions/remotesync.png
-%{_datadir}/icons/crystalsvg/22x22/actions/remotesyncconfig.png
-%{_datadir}/icons/crystalsvg/22x22/actions/minitools.png
-%{_datadir}/icons/crystalsvg/22x22/actions/validators.png
-%{_datadir}/icons/crystalsvg/22x22/actions/webarchiver.png
-%{_datadir}/icons/crystalsvg/22x22/apps/konqsidebar_mediaplayer.png
-%{_datadir}/icons/crystalsvg/32x32/actions/minitools.png
-%{_datadir}/icons/crystalsvg/32x32/apps/konqsidebar_mediaplayer.png
-%{_datadir}/icons/crystalsvg/48x48/actions/minitools.png
-%{_datadir}/icons/crystalsvg/48x48/apps/konqsidebar_mediaplayer.png
-%{_datadir}/icons/hicolor/16x16/apps/metabar.png
-%{_datadir}/icons/hicolor/22x22/apps/fsview.png
-%{_datadir}/icons/hicolor/32x32/apps/fsview.png
-%{_datadir}/icons/hicolor/32x32/apps/metabar.png
-%{_datadir}/icons/hicolor/48x48/apps/metabar.png
-%{_datadir}/icons/hicolor/64x64/apps/metabar.png
-%{_datadir}/icons/hicolor/scalable/apps/metabar.svgz
-%{_datadir}/icons/hicolor/128x128/apps/metabar.png
-%{_datadir}/icons/locolor/32x32/apps/konqsidebar_mediaplayer.png
-%{_datadir}/services/akregator_konqplugin.desktop
-%{_datadir}/services/ark_plugin.desktop
-%{_datadir}/services/fsview_part.desktop
-%{_datadir}/services/kuick_plugin.desktop
-%{_datadir}/services/webarchivethumbnail.desktop
-%{tde_libdir}/libadblock.la
-%{tde_libdir}/libadblock.so
-%{tde_docdir}/HTML/en/konq-plugins/
+%doc konq-plugins/README
+%{tde_datadir}/config/translaterc
+%{tde_bindir}/fsview
+%{tde_bindir}/jpegorient
+%{tde_bindir}/kio_media_realfolder
+%{tde_tdelibdir}/konq_sidebarnews.la
+%{tde_tdelibdir}/konq_sidebarnews.so
+%{tde_tdelibdir}/konqsidebar_delicious.la
+%{tde_tdelibdir}/konqsidebar_delicious.so
+%{tde_tdelibdir}/konqsidebar_mediaplayer.la
+%{tde_tdelibdir}/konqsidebar_mediaplayer.so
+%{tde_tdelibdir}/konqsidebar_metabar.la
+%{tde_tdelibdir}/konqsidebar_metabar.so
+%{tde_tdelibdir}/libakregatorkonqfeedicon.la
+%{tde_tdelibdir}/libakregatorkonqfeedicon.so
+%{tde_tdelibdir}/libakregatorkonqplugin.la
+%{tde_tdelibdir}/libakregatorkonqplugin.so
+%{tde_tdelibdir}/libarkplugin.la
+%{tde_tdelibdir}/libarkplugin.so
+%{tde_tdelibdir}/libautorefresh.la
+%{tde_tdelibdir}/libautorefresh.so
+%{tde_tdelibdir}/libbabelfishplugin.la
+%{tde_tdelibdir}/libbabelfishplugin.so
+%{tde_tdelibdir}/libcrashesplugin.la
+%{tde_tdelibdir}/libcrashesplugin.so
+%{tde_tdelibdir}/libdirfilterplugin.la
+%{tde_tdelibdir}/libdirfilterplugin.so
+%{tde_tdelibdir}/librsyncplugin.la
+%{tde_tdelibdir}/librsyncplugin.so
+%{tde_tdelibdir}/libdomtreeviewerplugin.la
+%{tde_tdelibdir}/libdomtreeviewerplugin.so
+%{tde_tdelibdir}/libfsviewpart.la
+%{tde_tdelibdir}/libfsviewpart.so
+%{tde_tdelibdir}/libkhtmlsettingsplugin.la
+%{tde_tdelibdir}/libkhtmlsettingsplugin.so
+%{tde_tdelibdir}/kcm_kuick.la
+%{tde_tdelibdir}/kcm_kuick.so
+%{tde_tdelibdir}/libkimgallery.la
+%{tde_tdelibdir}/libkimgallery.so
+%{tde_tdelibdir}/libkuickplugin.la
+%{tde_tdelibdir}/libkuickplugin.so
+%{tde_tdelibdir}/libmfkonqmficon.la
+%{tde_tdelibdir}/libmfkonqmficon.so
+%{tde_tdelibdir}/libminitoolsplugin.la
+%{tde_tdelibdir}/libminitoolsplugin.so
+%{tde_tdelibdir}/librellinksplugin.la
+%{tde_tdelibdir}/librellinksplugin.so
+%{tde_tdelibdir}/libsearchbarplugin.la
+%{tde_tdelibdir}/libsearchbarplugin.so
+%{tde_tdelibdir}/libuachangerplugin.la
+%{tde_tdelibdir}/libuachangerplugin.so
+%{tde_tdelibdir}/libvalidatorsplugin.la
+%{tde_tdelibdir}/libvalidatorsplugin.so
+%{tde_tdelibdir}/libwebarchiverplugin.la
+%{tde_tdelibdir}/libwebarchiverplugin.so
+%{tde_tdelibdir}/webarchivethumbnail.la
+%{tde_tdelibdir}/webarchivethumbnail.so
+%{tde_datadir}/applnk/.hidden/arkplugin.desktop
+%{tde_datadir}/applnk/.hidden/kcmkuick.desktop
+%{tde_datadir}/applnk/.hidden/kuickplugin.desktop
+%{tde_datadir}/applnk/.hidden/mediaplayerplugin.desktop
+%{tde_datadir}/applnk/.hidden/crashesplugin.desktop
+%{tde_datadir}/applnk/.hidden/dirfilterplugin.desktop
+%{tde_datadir}/applnk/.hidden/rsyncplugin.desktop
+%{tde_datadir}/applnk/.hidden/fsview.desktop
+%{tde_datadir}/applnk/.hidden/khtmlsettingsplugin.desktop
+%{tde_datadir}/applnk/.hidden/kimgalleryplugin.desktop
+%{tde_datadir}/applnk/.hidden/plugin_babelfish.desktop
+%{tde_datadir}/applnk/.hidden/plugin_domtreeviewer.desktop
+%{tde_datadir}/applnk/.hidden/plugin_validators.desktop
+%{tde_datadir}/applnk/.hidden/plugin_webarchiver.desktop
+%{tde_datadir}/applnk/.hidden/uachangerplugin.desktop
+%{tde_datadir}/apps/akregator
+%{tde_datadir}/apps/domtreeviewer
+%{tde_datadir}/apps/fsview
+%{tde_datadir}/apps/imagerotation/orient.py*
+%{tde_datadir}/apps/imagerotation/exif.py*
+%{tde_datadir}/apps/khtml/kpartplugins
+%{tde_datadir}/apps/konqiconview
+%{tde_datadir}/apps/konqlistview
+%{tde_datadir}/apps/konqsidebartng
+%{tde_datadir}/apps/konqueror/icons
+%{tde_datadir}/apps/konqueror/kpartplugins
+%{tde_datadir}/apps/konqueror/servicemenus
+%{tde_datadir}/apps/metabar/iconsrc
+%{tde_datadir}/apps/metabar/themes/default/default.css
+%{tde_datadir}/apps/metabar/themes/default/layout.html
+%{tde_datadir}/apps/microformat/pics/microformat.png
+%{tde_datadir}/config.kcfg/konq_sidebarnews.kcfg
+%{tde_datadir}/icons/locolor/16x16/apps/autorefresh.png
+%{tde_datadir}/icons/crystalsvg/16x16/actions/babelfish.png
+%{tde_datadir}/icons/crystalsvg/16x16/actions/cssvalidator.png
+%{tde_datadir}/icons/crystalsvg/16x16/actions/domtreeviewer.png
+%{tde_datadir}/icons/crystalsvg/16x16/actions/htmlvalidator.png
+%{tde_datadir}/icons/crystalsvg/16x16/actions/imagegallery.png
+%{tde_datadir}/icons/crystalsvg/16x16/actions/remotesync.png
+%{tde_datadir}/icons/crystalsvg/16x16/actions/remotesyncconfig.png
+%{tde_datadir}/icons/crystalsvg/16x16/actions/minitools.png
+%{tde_datadir}/icons/crystalsvg/16x16/actions/validators.png
+%{tde_datadir}/icons/crystalsvg/16x16/actions/webarchiver.png
+%{tde_datadir}/icons/crystalsvg/16x16/apps/konqsidebar_delicious.png
+%{tde_datadir}/icons/crystalsvg/16x16/apps/konqsidebar_mediaplayer.png
+%{tde_datadir}/icons/crystalsvg/16x16/apps/konqsidebar_news.png
+%{tde_datadir}/icons/crystalsvg/22x22/actions/babelfish.png
+%{tde_datadir}/icons/crystalsvg/22x22/actions/cssvalidator.png
+%{tde_datadir}/icons/crystalsvg/22x22/actions/domtreeviewer.png
+%{tde_datadir}/icons/crystalsvg/22x22/actions/htmlvalidator.png
+%{tde_datadir}/icons/crystalsvg/22x22/actions/imagegallery.png
+%{tde_datadir}/icons/crystalsvg/22x22/actions/remotesync.png
+%{tde_datadir}/icons/crystalsvg/22x22/actions/remotesyncconfig.png
+%{tde_datadir}/icons/crystalsvg/22x22/actions/minitools.png
+%{tde_datadir}/icons/crystalsvg/22x22/actions/validators.png
+%{tde_datadir}/icons/crystalsvg/22x22/actions/webarchiver.png
+%{tde_datadir}/icons/crystalsvg/22x22/apps/konqsidebar_mediaplayer.png
+%{tde_datadir}/icons/crystalsvg/32x32/actions/minitools.png
+%{tde_datadir}/icons/crystalsvg/32x32/apps/konqsidebar_mediaplayer.png
+%{tde_datadir}/icons/crystalsvg/48x48/actions/minitools.png
+%{tde_datadir}/icons/crystalsvg/48x48/apps/konqsidebar_mediaplayer.png
+%{tde_datadir}/icons/hicolor/16x16/apps/metabar.png
+%{tde_datadir}/icons/hicolor/22x22/apps/fsview.png
+%{tde_datadir}/icons/hicolor/32x32/apps/fsview.png
+%{tde_datadir}/icons/hicolor/32x32/apps/metabar.png
+%{tde_datadir}/icons/hicolor/48x48/apps/metabar.png
+%{tde_datadir}/icons/hicolor/64x64/apps/metabar.png
+%{tde_datadir}/icons/hicolor/scalable/apps/metabar.svgz
+%{tde_datadir}/icons/hicolor/128x128/apps/metabar.png
+%{tde_datadir}/icons/locolor/32x32/apps/konqsidebar_mediaplayer.png
+%{tde_datadir}/services/akregator_konqplugin.desktop
+%{tde_datadir}/services/ark_plugin.desktop
+%{tde_datadir}/services/fsview_part.desktop
+%{tde_datadir}/services/kuick_plugin.desktop
+%{tde_datadir}/services/webarchivethumbnail.desktop
+%{tde_tdelibdir}/libadblock.la
+%{tde_tdelibdir}/libadblock.so
+%{tde_tdedocdir}/HTML/en/konq-plugins/
 
 %if 0%{?fedora}
-%{_datadir}/apps/metabar/themes/fedora/
-%{_datadir}/config/metabarrc
+%{tde_datadir}/apps/metabar/themes/fedora/
+%{tde_datadir}/config/metabarrc
 %endif
 
 %post -n trinity-konq-plugins
 for f in crystalsvg hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
 done
 
 %postun -n trinity-konq-plugins
 for f in crystalsvg hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
 done
 
 ##########
@@ -535,25 +546,26 @@ signatures in external mail clients such as KMail.
 
 %files -n trinity-ksig
 %defattr(-,root,root,-)
-%{_bindir}/ksig
-%{tde_appdir}/ksig.desktop
-%{_datadir}/apps/ksig/ksigui.rc
-%{_datadir}/icons/hicolor/*/apps/ksig.png
-%{tde_docdir}/HTML/en/ksig/
+%doc README
+%{tde_bindir}/ksig
+%{tde_tdeappdir}/ksig.desktop
+%{tde_datadir}/apps/ksig/ksigui.rc
+%{tde_datadir}/icons/hicolor/*/apps/ksig.png
+%{tde_tdedocdir}/HTML/en/ksig/
 
 %post -n trinity-ksig
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %postun -n trinity-ksig
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 ##########
 
@@ -573,52 +585,53 @@ of user interfaces, playlists and visualisation plugins.
 
 %files -n trinity-noatun-plugins
 %defattr(-,root,root,-)
-%{_bindir}/noatunsynaescope.bin
-%{_bindir}/noatuntippecanoe.bin
-%{_bindir}/noatuntyler.bin
-%{tde_libdir}/noatunalsaplayer.la
-%{tde_libdir}/noatunalsaplayer.so
-%{tde_libdir}/noatunblurscope.la
-%{tde_libdir}/noatunblurscope.so
-%{tde_libdir}/noatuncharlatan.la
-%{tde_libdir}/noatuncharlatan.so
-%{tde_libdir}/noatundub.la
-%{tde_libdir}/noatundub.so
-%{tde_libdir}/noatun_ffrs.la
-%{tde_libdir}/noatun_ffrs.so
-%{tde_libdir}/noatunluckytag.la
-%{tde_libdir}/noatunluckytag.so
-%{tde_libdir}/noatunlyrics.la
-%{tde_libdir}/noatunlyrics.so
-%{tde_libdir}/noatunmadness.la
-%{tde_libdir}/noatunmadness.so
-%{tde_libdir}/noatun_oblique.la
-%{tde_libdir}/noatun_oblique.so
-%{tde_libdir}/noatunpitchablespeed.la
-%{tde_libdir}/noatunpitchablespeed.so
-%{tde_libdir}/noatunsynaescope.la
-%{tde_libdir}/noatunsynaescope.so
-%{tde_libdir}/noatuntippecanoe.la
-%{tde_libdir}/noatuntippecanoe.so
-%{tde_libdir}/noatuntyler.la
-%{tde_libdir}/noatuntyler.so
-%{tde_libdir}/noatunwakeup.la
-%{tde_libdir}/noatunwakeup.so
-%{tde_libdir}/noatunwavecapture.la
-%{tde_libdir}/noatunwavecapture.so
-%{_datadir}/apps/noatun/*
-%{_datadir}/icons/crystalsvg/16x16/apps/synaescope.png
+%doc README
+%{tde_bindir}/noatunsynaescope.bin
+%{tde_bindir}/noatuntippecanoe.bin
+%{tde_bindir}/noatuntyler.bin
+%{tde_tdelibdir}/noatunalsaplayer.la
+%{tde_tdelibdir}/noatunalsaplayer.so
+%{tde_tdelibdir}/noatunblurscope.la
+%{tde_tdelibdir}/noatunblurscope.so
+%{tde_tdelibdir}/noatuncharlatan.la
+%{tde_tdelibdir}/noatuncharlatan.so
+%{tde_tdelibdir}/noatundub.la
+%{tde_tdelibdir}/noatundub.so
+%{tde_tdelibdir}/noatun_ffrs.la
+%{tde_tdelibdir}/noatun_ffrs.so
+%{tde_tdelibdir}/noatunluckytag.la
+%{tde_tdelibdir}/noatunluckytag.so
+%{tde_tdelibdir}/noatunlyrics.la
+%{tde_tdelibdir}/noatunlyrics.so
+%{tde_tdelibdir}/noatunmadness.la
+%{tde_tdelibdir}/noatunmadness.so
+%{tde_tdelibdir}/noatun_oblique.la
+%{tde_tdelibdir}/noatun_oblique.so
+%{tde_tdelibdir}/noatunpitchablespeed.la
+%{tde_tdelibdir}/noatunpitchablespeed.so
+%{tde_tdelibdir}/noatunsynaescope.la
+%{tde_tdelibdir}/noatunsynaescope.so
+%{tde_tdelibdir}/noatuntippecanoe.la
+%{tde_tdelibdir}/noatuntippecanoe.so
+%{tde_tdelibdir}/noatuntyler.la
+%{tde_tdelibdir}/noatuntyler.so
+%{tde_tdelibdir}/noatunwakeup.la
+%{tde_tdelibdir}/noatunwakeup.so
+%{tde_tdelibdir}/noatunwavecapture.la
+%{tde_tdelibdir}/noatunwavecapture.so
+%{tde_datadir}/apps/noatun/*
+%{tde_datadir}/icons/crystalsvg/16x16/apps/synaescope.png
 
 %post -n trinity-noatun-plugins
 for f in crystalsvg ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
 done
 
 %postun -n trinity-noatun-plugins
 for f in crystalsvg ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
 done
 
 ##########
@@ -631,8 +644,8 @@ done
 # 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"
@@ -641,30 +654,37 @@ done
 
 %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}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
 
 %configure \
-  --includedir=%{tde_includedir} \
+  --exec-prefix=%{_prefix} \
+  --bindir=%{tde_bindir} \
+  --libdir=%{tde_libdir} \
+  --datadir=%{tde_datadir} \
+  --includedir=%{tde_tdeincludedir} \
   --disable-rpath \
   --enable-new-ldflags \
   --enable-closure \
   --disable-debug --disable-warnings \
   --disable-dependency-tracking --enable-final \
-  --with-extra-includes=%{_includedir}/tqt
+  --with-extra-includes=%{tde_includedir}/tqt:%{_usr}/include/db4 \
+  --without-xmms \
+  --with-sdl \
+  --with-berkeley-db
 
 
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
 # File lists for locale
 HTML_DIR=$(kde-config --expandvars --install html)
-touch %{name}.lang
 if [ -d %{buildroot}/$HTML_DIR ]; then
  for lang_dir in %{buildroot}/$HTML_DIR/* ; do
   if [ -d $lang_dir ]; then
@@ -680,17 +700,10 @@ if [ -d %{buildroot}/$HTML_DIR ]; then
  done
 fi
 
-# rpmdocs
-for dir in konq-plugins ; do
-  for file in AUTHORS ChangeLog README TODO ; do
-    test -s  "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
-  done
-done
-
-%if 0%{?fedora} > 0
+%if 0%{?fedora}
 # install fedora metabar theme
-cp -prf fedora %{buildroot}%{_datadir}/apps/metabar/themes
-install -m644 -p %{SOURCE2} %{buildroot}%{_datadir}/config/
+cp -prf fedora %{buildroot}%{tde_datadir}/apps/metabar/themes
+install -m644 -p %{SOURCE2} %{buildroot}%{tde_datadir}/config/
 %endif
 
 
diff --git a/redhat/kdeadmin/kdeadmin-3.5.13-remove_more_applications_in_menu.patch b/redhat/kdeadmin/kdeadmin-3.5.13-remove_more_applications_in_menu.patch
new file mode 100644
index 000000000..77047f5f8
--- /dev/null
+++ b/redhat/kdeadmin/kdeadmin-3.5.13-remove_more_applications_in_menu.patch
@@ -0,0 +1,17 @@
+commit d3d702117d757d6c16d0dd41969bc44229123330
+Author: Darrell Anderson <humanreadable@yahoo.com>
+Date:   1331690654 -0500
+
+    Remove "More Applications" from TDE menu.
+    This partially resolves bug report 653.
+
+diff --git a/kdat/kdat.desktop b/kdat/kdat.desktop
+index 3aeb7ac..7016d05 100644
+--- a/kdat/kdat.desktop
++++ b/kdat/kdat.desktop
+@@ -89,4 +89,4 @@ X-KDE-StartupNotify=true
+ DocPath=kdat/index.html
+ Terminal=false
+ X-DCOP-ServiceType=Multi
+-Categories=Qt;KDE;System;X-KDE-More;
++Categories=Qt;KDE;System;
diff --git a/redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec b/redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec
index 66c877e97..a4aeac80e 100644
--- a/redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec
+++ b/redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec
@@ -1,19 +1,28 @@
 # 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
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%define tde_bindir %{_prefix}/bin
+%define tde_sbindir %{_prefix}/sbin
+%define tde_datadir %{_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{_prefix}/include
+%define tde_libdir %{_prefix}/%{_lib}
 
+%define tde_tdeappdir %{tde_datadir}/applications/kde
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
 
-Name:			trinity-kdeadmin
+%define _docdir %{tde_docdir}
+
+
+Name:			trinity-tdeadmin
 Summary:		Administrative tools for TDE
 Version:		3.5.13
-Release:		4%{?dist}%{?_variant}
+Release:		5%{?dist}%{?_variant}
 
 License:		GPLv2
 Group:			User Interface/Desktops
@@ -25,6 +34,9 @@ URL:			http://www.trinitydesktop.org/
 
 Prefix:			%{_prefix}
 
+Obsoletes:		trinity-kdeadmin < %{version}-%{release}
+Provides:		trinity-kdeadmin = %{version}-%{release}
+
 Source0: kdeadmin-%{version}.tar.gz
 Source1: kuser.pam
 Source2: kuser.pamd
@@ -32,36 +44,342 @@ Source5: kpackagerc
 Source6: ksysvrc
 Source7: kuserrc
 
-# [kdeadmin/knetworkconf] Add RHEL 5, RHEL 6, Fedora 15, Fedora 16, Fedora 17
+# [kdeadmin/knetworkconf] Add RHEL 5, RHEL 6, Fedora 15, Fedora 16, Fedora 17 [Commit #59394e6b]
 Patch1:		kdeadmin-3.5.13-add_rhel_fedora.patch
-
 # [kdeadmin] Fix linear alphabet string errors [Commit #1f719050]
 Patch2:		bp004-1f719050.diff
-
-Requires: trinity-kdelibs
-Requires: pkgconfig
-Requires: usermode-gtk
+# [tdeadmin] Remove "More Applications" from TDE menu. [Bug #653] [Commit #d3d70211]
+Patch3:		kdeadmin-3.5.13-remove_more_applications_in_menu.patch
 
 BuildRequires: autoconf automake libtool m4
 BuildRequires: trinity-kdelibs-devel
 BuildRequires: rpm-devel
+BuildRequires: pam-devel
+%if 0%{?mgaversion}
+BuildRequires:	lilo
+%endif
+
+Requires: trinity-tdeadmin = %{version}-%{release}
+Requires: trinity-kcron = %{version}-%{release}
+Requires: trinity-kdat = %{version}-%{release}
+Requires: %{name}-kfile-plugins = %{version}-%{release}
+Requires: trinity-knetworkconf = %{version}-%{release}
+Requires: trinity-kpackage = %{version}-%{release}
+Requires: trinity-ksysv = %{version}-%{release}
+Requires: trinity-kuser = %{version}-%{release}
+%if 0%{?mgaversion}
+Requires: trinity-lilo-config = %{version}-%{release}
+%endif
+
 
 %description
-The kdeadmin package includes administrative tools for the Trinity Desktop
+The tdeadmin package includes administrative tools for the Trinity Desktop
 Environment (TDE) including:
 kcron, kdat, knetworkconf, kpackage, ksysv, kuser.
 
+%files
+%defattr(-,root,root,-)
+# The following files are not installed in any binary package.
+# This is deliberate.
+
+# - This file serves no purpose that we can see, and conflicts
+#   with GNOME system tools, so be sure to leave it out.
+%exclude %{tde_libdir}/pkgconfig/*.pc
+
+# Extract from changelog:
+# tdeadmin (4:3.5.5-2) unstable; urgency=low
+#  +++ Changes by Ana Beatriz Guerrero Lopez:
+#  * Removed useless program secpolicy. (Closes: #399426)
+%exclude %{tde_bindir}/secpolicy
+
+# LILO is not provided in RHEL or Fedora
+%if 0%{?rhel} || 0%{?fedora}
+%exclude %{tde_tdedocdir}/HTML/en/lilo-config/
+%endif
+
+##########
+
+%package -n trinity-kcron
+Summary:	The Trinity crontab editor
+Group:		Applications/Utilities
+
+%description -n trinity-kcron
+KCron is an application for scheduling programs to run in the background.
+It is a graphical user interface to cron, the UNIX system scheduler.
+
+%files -n trinity-kcron
+%defattr(-,root,root,-)
+%{tde_bindir}/kcron
+%{tde_tdeappdir}/kcron.desktop
+%{tde_datadir}/apps/kcron/kcronui.rc
+%{tde_datadir}/icons/hicolor/*/apps/kcron.png
+%{tde_tdedocdir}/HTML/en/kcron/
+
+%post -n trinity-kcron
+for icon_theme in hicolor ; do
+  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kcron
+for icon_theme in hicolor ; do
+  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kdat
+Summary:	A Trinity tape backup tool
+Group:		Applications/Utilities
+
+%description -n trinity-kdat
+KDat is a tar-based tape archiver. It is designed to work with multiple
+archives on a single tape.
+
+Main features are:
+* Simple graphical interface to local filesystem and tape contents.
+* Multiple archives on the same physical tape.
+* Complete index of archives and files is stored on local hard disk.
+* Selective restore of files from an archive.
+* Backup profiles for frequently used backups.
+
+%files -n trinity-kdat
+%defattr(-,root,root,-)
+%doc rpmdocs/kdat/*
+%{tde_bindir}/kdat
+%{tde_tdeappdir}/kdat.desktop
+%{tde_datadir}/apps/kdat/
+%{tde_datadir}/icons/hicolor/*/apps/kdat.png
+%{tde_datadir}/icons/locolor/*/apps/kdat.png
+%{tde_tdedocdir}/HTML/en/kdat/
+
+%post -n trinity-kdat
+for icon_theme in hicolor locolor ; do
+  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kdat
+for icon_theme in hicolor locolor ; do
+  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package kfile-plugins
+Summary:	Trinity file metainfo plugins for deb and rpm files
+Group:		Environment/Libraries
+
+%description kfile-plugins
+File metainfo plugins for deb and rpm package files.
+
+%files kfile-plugins
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/kfile_deb.la
+%{tde_tdelibdir}/kfile_deb.so
+%{tde_tdelibdir}/kfile_rpm.la
+%{tde_tdelibdir}/kfile_rpm.so
+%{tde_datadir}/services/kfile_deb.desktop
+%{tde_datadir}/services/kfile_rpm.desktop
+
+##########
+
+%package -n trinity-knetworkconf
+Summary:	Trinity network configuration tool
+Group:		Applications/Utilities
+
+%description -n trinity-knetworkconf
+This is a TDE control center module to configure TCP/IP settings.  It
+can be used to manage network devices and settings for each device.
+
+%files -n trinity-knetworkconf
+%defattr(-,root,root,-)
+%doc rpmdocs/knetworkconf/*
+%{tde_datadir}/icons/hicolor/*/apps/knetworkconf.png
+%{tde_datadir}/icons/hicolor/22x22/actions/network_disconnected_wlan.png
+%{tde_datadir}/icons/hicolor/22x22/actions/network_connected_lan_knc.png
+%{tde_datadir}/icons/hicolor/22x22/actions/network_disconnected_lan.png
+%{tde_datadir}/icons/hicolor/22x22/actions/network_traffic_wlan.png
+%{tde_datadir}/apps/knetworkconf/
+%{tde_tdeappdir}/kcm_knetworkconfmodule.desktop
+%{tde_tdelibdir}/kcm_knetworkconfmodule.so
+%{tde_tdelibdir}/kcm_knetworkconfmodule.la
+%{tde_tdedocdir}/HTML/en/knetworkconf/
+
+%post -n trinity-knetworkconf
+for icon_theme in hicolor ; do
+  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+
+%postun -n trinity-knetworkconf
+for icon_theme in hicolor ; do
+  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+
+##########
+
+%package -n trinity-kpackage
+Summary:	Trinity package management tool
+Group:		Applications/Utilities
+
+%description -n trinity-kpackage
+This is a frontend to both .rpm and .deb package formats. It allows you
+to view currently installed packages, browse available packages, and
+install/remove them.
+
+%files -n trinity-kpackage
+%defattr(-,root,root,-)
+%doc rpmdocs/kpackage/*
+%{tde_bindir}/kpackage
+%{tde_tdeappdir}/kpackage.desktop
+%{tde_datadir}/apps/kpackage/
+%{tde_datadir}/config/kpackagerc
+%{tde_datadir}/icons/hicolor/*/apps/kpackage.png
+%{tde_tdedocdir}/HTML/en/kpackage/
+
+%post -n trinity-kpackage
+for icon_theme in hicolor ; do
+  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kpackage
+for icon_theme in hicolor ; do
+  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-ksysv
+Summary:	Trinity SysV-style init configuration editor
+Group:		Applications/Utilities
+
+%description -n trinity-ksysv
+This program allows you to edit your start and stop scripts using a
+drag and drop GUI.
+
+%files -n trinity-ksysv
+%defattr(-,root,root,-)
+%doc rpmdocs/ksysv/*
+%{tde_bindir}/ksysv
+%{tde_tdeappdir}/ksysv.desktop
+%{tde_datadir}/apps/ksysv/
+%{tde_datadir}/config/ksysvrc
+%{tde_datadir}/icons/crystalsvg/16x16/actions/toggle_log.png
+%{tde_datadir}/icons/hicolor/*/apps/ksysv.png
+%{tde_datadir}/mimelnk/application/x-ksysv.desktop
+%{tde_datadir}/mimelnk/text/x-ksysv-log.desktop
+%{tde_tdedocdir}/HTML/en/ksysv/
+
+%post -n trinity-ksysv
+for icon_theme in crystalsvg hicolor  ; do
+  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-ksysv
+for icon_theme in crystalsvg hicolor  ; do
+  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kuser
+Summary:	Trinity user/group administration tool
+Group:		Applications/Utilities
+%if 0%{?rhel} || 0%{?fedora}
+Requires:	usermode-gtk
+%else
+Requires:	usermode
+%endif
+
+%description -n trinity-kuser
+A user/group administration tool for TDE.
+
+%files -n trinity-kuser
+%defattr(-,root,root,-)
+%doc rpmdocs/kuser/*
+%{tde_bindir}/kuser
+%{tde_sbindir}/kuser
+%{tde_tdeappdir}/kuser.desktop
+%{tde_datadir}/apps/kuser/
+%{tde_datadir}/config/kuserrc
+%{tde_datadir}/config.kcfg/kuser.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/kuser.png
+%{tde_tdedocdir}/HTML/en/kuser/
+%config(noreplace) /etc/pam.d/kuser
+%config(noreplace) /etc/security/console.apps/kuser
+
+%post -n trinity-kuser
+for icon_theme in hicolor ; do
+  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kuser
+for icon_theme in hicolor ; do
+  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%if 0%{?mgaversion}
+%package -n trinity-lilo-config
+Summary:	Trinity frontend for lilo configuration
+Group:		Applications/Utilities
+Requires:	trinity-kcontrol
+Requires:	trinity-tdebase-bin
+Requires:	lilo
+
+%description -n trinity-lilo-config
+lilo-config is a TDE based frontend to the lilo boot manager configuration.
+It runs out of the TDE Control Center.
+
+If you want to use the menu entry to launch lilo-config, you need to install
+tdebase-bin since it uses the tdesu command to gain root privileges.
+
+%files -n trinity-lilo-config
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/kcm_lilo.la
+%{tde_tdelibdir}/kcm_lilo.so
+%{tde_tdeappdir}/lilo.desktop
+%{tde_tdedocdir}/HTML/en/lilo-config/
+%endif
+
+##########
+
+
+
 
 %prep
 %setup -q -n kdeadmin
 
 %patch1 -p1 -b .knetworkconf
+%patch2 -p1
+%patch3 -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"
@@ -70,42 +388,50 @@ kcron, kdat, knetworkconf, kpackage, ksysv, kuser.
 
 %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 \
+   --exec-prefix=%{_prefix} \
+   --bindir=%{tde_bindir} \
+   --sbindir=%{tde_sbindir} \
+   --libdir=%{tde_libdir} \
+   --datadir=%{tde_datadir} \
+   --includedir=%{tde_tdeincludedir} \
    --enable-new-ldflags \
    --disable-dependency-tracking \
    --disable-rpath \
    --with-rpm \
+   --with-pam=kde \
+   --with-shadow \
+   --with-private-groups \
    --enable-final \
    --enable-closure \
    --with-private-groups \
-   --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}
 
 comps="kcron kdat knetworkconf kpackage ksysv kuser"
-%__mkdir_p	%{buildroot}%{_datadir}/config \
+%__mkdir_p	%{buildroot}%{tde_datadir}/config \
 			%{buildroot}/etc/security/console.apps \
 			%{buildroot}/etc/pam.d \
-			%{buildroot}%{_sbindir}
+			%{buildroot}%{tde_sbindir}
 
-%__install -p -m644 %{SOURCE5} %{SOURCE6} %{SOURCE7} %{buildroot}%{_datadir}/config/
+%__install -p -m644 %{SOURCE5} %{SOURCE6} %{SOURCE7} %{buildroot}%{tde_datadir}/config/
 
 # Run kuser through consolehelper
 %__install -p -m644 %{SOURCE1} %{buildroot}/etc/security/console.apps/kuser
 %__install -p -m644 %{SOURCE2} %{buildroot}/etc/pam.d/kuser
-%__mv %{buildroot}%{_bindir}/kuser %{buildroot}%{_sbindir}
-%__ln_s consolehelper %{buildroot}%{_bindir}/kuser
+%__mv %{buildroot}%{tde_bindir}/kuser %{buildroot}%{tde_sbindir}
+%__ln_s consolehelper %{buildroot}%{tde_bindir}/kuser
 
 # locale's
-%find_lang %{name} || touch %{name}.lang
 HTML_DIR=$(kde-config --expandvars --install html)
 if [ -d %{buildroot}/$HTML_DIR ]; then
 for lang_dir in %{buildroot}/$HTML_DIR/* ; do
@@ -129,46 +455,19 @@ for dir in $comps ; do
   done
 done
 
-%post
-for icon_theme in crystalsvg hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-
-%postun
-for icon_theme in crystalsvg hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-
 
 %clean
 %__rm -rf %{buildroot}
 
 
-%files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING README
-%doc rpmdocs/*
-%{_bindir}/*
-%{_sbindir}/*
-%config(noreplace) /etc/pam.d/*
-%config(noreplace) /etc/security/console.apps/*
-%{_datadir}/config*/*
-%{_datadir}/mimelnk/*/*.desktop
-%{_datadir}/icons/crystalsvg/*/*/*
-%{_datadir}/apps/*
-%{_datadir}/applications/kde/*.desktop
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/icons/locolor/*/*/*
-%{_datadir}/service*/*.desktop
-%{tde_libdir}/*
-%{_libdir}/pkgconfig/*.pc
-
 
 %changelog
+* Fri Jul 13 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5
+- Renames 'trinity-kdeadmin' to 'trinity-tdeadmin'
+- Split in several packages
+- Fix configure options
+- Remove "More Applications" from TDE menu. [Bug #653] [Commit #d3d70211]
+
 * Thu Apr 03 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
 - Fix knetworkconf support for Fedora, adds Fedora 17
 - Fix linear alphabet string errors [Commit #1f719050]
diff --git a/redhat/kdeartwork/trinity-kdeartwork-3.5.13.spec b/redhat/kdeartwork/trinity-kdeartwork-3.5.13.spec
index de66e9a92..6e08ef7d8 100644
--- a/redhat/kdeartwork/trinity-kdeartwork-3.5.13.spec
+++ b/redhat/kdeartwork/trinity-kdeartwork-3.5.13.spec
@@ -1,64 +1,581 @@
 # 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
-%define tde_libdir %{_libdir}/trinity
+%define tde_bindir %{_prefix}/bin
+%define tde_datadir %{_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{_prefix}/include
+%define tde_libdir %{_prefix}/%{_lib}
+
+%define tde_tdeappdir %{tde_datadir}/applications/kde
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_docdir}
 
 # kdeartwork specific settings
 # On RHEL 6, libart is too old !
-%if 0%{?fedora} >= 15
+%if 0%{?fedora} >= 15 || 0%{?mgaversion}
 %define with_libart 1
 %endif
 
 
-Name:    trinity-kdeartwork
-Summary: Additional artwork (themes, sound themes, ...) for TDE
-Version: 3.5.13
-Release: 2%{?dist}%{?_variant}
+Name:		trinity-tdeartwork
+Summary:	Additional artwork (themes, sound themes, ...) for TDE
+Version:	3.5.13
+Release:	3%{?dist}%{?_variant}
 
 License:	GPLv2
 Group:		User Interface/Desktops
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 Url:		http://www.trinitydesktop.org/
 
-Source: kdeartwork-%{version}.tar.gz
+Source:		kdeartwork-%{version}.tar.gz
 
 # FIXME: this should go in kde-settings -- Rex
 Source1: webcollagerc
 
 BuildRequires: cmake >= 2.8
-BuildRequires: trinity-kdebase-devel
+BuildRequires: trinity-tdebase-devel >= 3.5.13
 
 BuildRequires: gettext
 BuildRequires: esound-devel
-%if 0%{?fedora}
-BuildRequires: jack-audio-connection-kit-devel
+
+%if 0%{?fedora} || 0%{?mgaversion}
+%define with_xscreensaver 1
 BuildRequires: nas-devel
 BuildRequires: xscreensaver
-%define with_xscreensaver 1
+
+%if 0%{?mgaversion}
+BuildRequires:	%{_lib}jack-devel
+BuildRequires:	xscreensaver-extrusion
+%else
+BuildRequires: jack-audio-connection-kit-devel
+%endif
 %endif
 
 %if "%{?with_libart}" == "1"
 BuildRequires: libart_lgpl-devel
 %endif
 
-Requires: trinity-kdebase
+
+Obsoletes:	trinity-kdeartwork < %{version}-%{release}
+Provides:	trinity-kdeartwork = %{version}-%{release}
+
+# Metapackage
+Requires: %{name}-emoticons = %{version}-%{release}
+Requires: %{name}-misc = %{version}-%{release}
+Requires: %{name}-style = %{version}-%{release}
+Requires: %{name}-theme-icon = %{version}-%{release}
+Requires: %{name}-theme-window = %{version}-%{release}
+Requires: trinity-kdewallpapers = %{version}-%{release}
+Requires: trinity-kscreensaver = %{version}-%{release}
+
+%if 0%{?with_xscreensaver}
+Requires: trinity-kscreensaver-xsavers = %{version}-%{release}
+Requires: trinity-kscreensaver-xsavers-webcollage = %{version}-%{release}
+Requires: trinity-kscreensaver-xsavers-extra = %{version}-%{release}
+%endif
+
 
 %description
-Additional artwork (themes, sound themes, screensavers ...) for TDE.
+TDE (the Trinity Desktop Environment) is a powerful Open Source graphical
+desktop environment for Unix workstations. It combines ease of use,
+contemporary functionality, and outstanding graphical design with the
+technological superiority of the Unix operating system.
+
+This metapackage includes a collection of artistic extras (themes, widget
+styles, screen savers, wallpaper, icons, emoticons and so on) provided
+with the official release of KDE.
+
+Homepage: http://artist.kde.org 
+
+%files
+
+##########
+
+%package emoticons
+Summary:	emoticon collections for tDE chat clients
+Group:		User Interface/Desktops
+
+%description emoticons
+This package contains several collections of emoticons used by official
+and unofficial KDE chat clients, such as Kopete and Konversation.
+
+This package is part of KDE, and a component of the KDE artwork module.
+
+%files emoticons
+%defattr(-,root,root,-)
+%{tde_datadir}/emoticons/
+
+##########
+
+%package misc
+Summary:	various multimedia goodies released with TDE
+Group:		User Interface/Desktops
+
+%description misc
+This package contains miscellaneous multimedia goodies for KDE.
+Included are additional TDE sounds and kworldclock themes.
+
+This package is part of Trinity, and a component of the TDE artwork module.
+
+%files misc
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/kworldclock/
+%{tde_datadir}/sounds/KDE_Logout_new.wav
+%{tde_datadir}/sounds/KDE_Startup_new.wav
+
+##########
+
+%package style
+Summary:	widget styles released with Trinity
+Group:		User Interface/Desktops
+
+%description style
+This package contains additional widget styles for Trinity. Widget styles
+can be used to customise the look and feel of interface components such
+as buttons, scrollbars and so on.  They can be applied using the style
+manager in the TDE Control Centre.
+
+This package is part of Trinity, and a component of the TDE artwork module.
+
+%files style
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/plugins/styles/
+%{tde_tdelibdir}/kstyle_phase_config.la
+%{tde_tdelibdir}/kstyle_phase_config.so
+%{tde_datadir}/apps/kstyle/
+
+##########
+
+%package theme-icon
+Summary:	icon themes released with Trinity
+Group:		User Interface/Desktops
+
+Obsoletes:	trinity-kdeartwork-icons < %{version}-%{release}
+Provides:	trinity-kdeartwork-icons = %{version}-%{release}
+
+%description theme-icon
+This package contains additional icon themes for Trinity. Icon themes can be
+used to customise the appearance of standard icons throughout KDE. They
+can be applied using the icon manager in the Trinity Control Centre.
+
+This package is part of Trinity, and a component of the TDE artwork module.
+
+%files theme-icon
+%defattr(-,root,root,-)
+%{tde_datadir}/icons/*/*
+
+%post theme-icon
+for i in locolor ikons kdeclassic kids slick ; do
+ touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
+done
+
+%postun theme-icon
+for i in locolor ikons kdeclassic kids slick ; do
+ touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
+done
+
+##########
+
+%package theme-window
+Summary:	window decoration themes released with Trinity
+Group:		User Interface/Desktops
+
+%description theme-window
+This package contains additional window decoration themes for Trinity. Window
+decoration themes can be used to customise the look of window borders and
+buttons, and can be applied using the window decoration manager in the Trinity
+Control Center.
+
+This package is part of Trinity, and a component of the TDE artwork module.
+
+%files theme-window
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/[kt]win*
+%{tde_datadir}/apps/[kt]win/
+
+##########
+
+%package -n trinity-kdewallpapers
+Summary:	wallpapers released with Trinity
+Group:		User Interface/Desktops
 
-# TODO: build this subpkg noarch
-%package icons
-Summary: Icon themes (kdeclassic, slick ....) for KDE
-Group: User Interface/Desktops
-%description icons
-%{summary}.
+%description -n trinity-kdewallpapers
+This package contains additional wallpapers for Trinity. Wallpapers can be
+applied using the background manager in the TDE Control Centre.
+
+This package is part of Trinity, and a component of the TDE artwork module.
+
+%files -n trinity-kdewallpapers
+%defattr(-,root,root,-)
+%{tde_datadir}/wallpapers/
+
+##########
+
+%package -n trinity-kscreensaver
+Summary:	additional screen savers released with Trinity
+Group:		User Interface/Desktops
+
+%description -n trinity-kscreensaver
+This package contains the screen savers for Trinity. They can be tested and
+selected within the Appearance and Themes section of the Trinity Control
+Center.
+
+The hooks for the standard xscreensavers are no longer part of this
+package. To select and/or configure the standard xscreensavers through
+the TDE Control Center, install the separate package kscreensaver-xsavers.
+
+This package is part of Trinity, and a component of the TDE artwork module.
+
+%files -n trinity-kscreensaver
+%defattr(-,root,root,-)
+%{tde_bindir}/kslideshow.kss
+%{tde_bindir}/kpolygon.kss
+%{tde_bindir}/krotation.kss
+%{tde_bindir}/ksolarwinds.kss
+%{tde_bindir}/klorenz.kss
+%{tde_bindir}/kvm.kss
+%{tde_bindir}/kflux.kss
+%{tde_bindir}/kscience.kss
+%{tde_bindir}/kbanner.kss
+%{tde_bindir}/kfiresaver.kss
+%{tde_bindir}/keuphoria.kss
+%{tde_bindir}/kfountain.kss
+%{tde_bindir}/kgravity.kss
+%{tde_bindir}/kpartsaver.kss
+%{tde_bindir}/kpendulum.kss
+%{tde_bindir}/kblob.kss
+%{tde_bindir}/klines.kss
+%{tde_bindir}/kwave.kss
+%{tde_datadir}/applnk/System/ScreenSavers/KBanner.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/KBlob.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/KEuphoria.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/KFiresaver.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/KFlux.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/KFountain.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/KGravity.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/KLines-saver.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/KLorenz.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/KPendulum.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/KPolygon.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/KRotation.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/KScience.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/KSlideshow.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/KSolarWinds.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/KVm.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/KWave.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/kpartsaver.desktop
+%{tde_datadir}/apps/kfiresaver/
+%{tde_datadir}/apps/kscreensaver/
+
+# RHEL 5 and 6 do not build theses files - not sure why ...
+%if 0%{?fedora} || 0%{?mgaversion}
+%{tde_bindir}/kspace.kss
+%{tde_bindir}/kclock.kss
+%{tde_bindir}/kswarm.kss
+%{tde_datadir}/applnk/System/ScreenSavers/KClock.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/KSpace.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/KSwarm.desktop
+%endif
+
+##########
+
+%if 0%{?with_xscreensaver}
+
+%package -n trinity-kscreensaver-xsavers
+Summary:	Trinity hooks for standard xscreensavers
+Group:		User Interface/Desktops
+Requires:	trinity-tdebase-bin >= 3.5.13
+Requires:	xscreensaver
+
+%description -n trinity-kscreensaver-xsavers
+This package allows a smooth integration of the standard xscreensavers
+into Trinity. With this package installed you can select and/or configure
+the standard xscreensavers through the Appearances and Themes section of
+the Trinity Control Centre.
+
+Note that this package does not actually contain any screensavers itself.
+For the additional screensavers shipped with Trinity, see the separate package
+kscreensaver-trinity. This package does depend on the xscreensaver package, and
+recommend the xscreensaver-gl package, as well as contain the necessary
+files to integrate these packages into Trinity.
+
+This package is part of Trinity, and a component of the TDE artwork module.
+
+%files -n trinity-kscreensaver-xsavers
+%defattr(-,root,root,-)
+#%{tde_bindir}/xscreensaver-getimage-file
+#%{tde_bindir}/xscreensaver-getimage
+%{tde_bindir}/kxsconfig
+%{tde_bindir}/kxsrun
+%{tde_datadir}/applnk/System/ScreenSavers/antinspect.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/antspotlight.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/atunnel.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/blinkbox.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/braid.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/bubble3d.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/circuit.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/cubestorm.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/deco.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/distort.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/endgame.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/engine.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/fiberlamp.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/flipflop.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/flipscreen3d.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/flyingtoasters.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/fuzzyflakes.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/galaxy.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/gears.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/gflux.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/glblur.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/gleidescope.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/glknots.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/glslideshow.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/glsnake.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/gltext.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/hypertorus.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/jigglypuff.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/lavalite.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/metaballs.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/mirrorblob.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/moebius.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/molecule.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/morph3d.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/penrose.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/pipes.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/polyhedra.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/polytopes.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/popsquares.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/pulsar.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/queens.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/ripples.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/shadebobs.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/sierpinski3d.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/slidescreen.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/sonar.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/spheremonics.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/stonerview.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/superquadrics.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/swirl.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/xlyap.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/m6502.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/glschool.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/moebiusgears.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/glcells.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/abstractile.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/lockward.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/cwaves.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/topblock.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/voronoi.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/cubicgrid.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/hypnowheel.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/lcdscrub.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/photopile.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/skytentacles.desktop
+
+# These screensavers do not exist on Mageia 2
+%if 0%{?mgaversion} == 0
+%{tde_datadir}/applnk/System/ScreenSavers/glmatrix.desktop
+%endif
+
+##########
+
+%package -n trinity-kscreensaver-xsavers-webcollage
+Summary:	webcollage screensaver Trinity hook
+Group:		User Interface/Desktops
+Requires:	trinity-kscreensaver-xsavers-extra = %{version}-%{release}
+Requires:	netpbm
+
+%description -n trinity-kscreensaver-xsavers-webcollage
+This package give access to the webcollage screensaver through the Trinity
+screensaver configuration.
+
+This screensaver downloads random pictures from the internet and creates
+a collage as screensaver.
+
+IMPORTANT NOTICE: The internet contains all kinds of pictures, some of which
+you might find inappropriate and offensive.
+You are specially discouraged to install this package if you are using 
+your computer in a working environment or in an environment with children.
+
+If you still want to install this package, please read the file
+/usr/share/doc/kscreensaver-xsavers-webcollage/README.Debian after the 
+installation.
+
+This package is part of Trinity, and a component of the TDE artwork module.
+
+%files -n trinity-kscreensaver-xsavers-webcollage
+%defattr(-,root,root,-)
+%{tde_datadir}/applnk/System/ScreenSavers/webcollage.desktop
+
+##########
+
+%package -n trinity-kscreensaver-xsavers-extra
+Summary:	Trinity hooks for standard xscreensavers
+Group:		User Interface/Desktops
+Requires:	trinity-kscreensaver-xsavers = %{version}-%{release}
+
+%description -n trinity-kscreensaver-xsavers-extra
+This package allows a smooth integration of the universe xscreensavers
+into Trinity. With this package installed you can select and/or configure
+the universe xscreensavers through the Appearances and Themes section of
+the Trinity Control Centre.
+
+Note that this package does not actually contain any screensavers itself.
+For the additional screensavers shipped with TDE, see the separate package
+kscreensaver.
+
+This package is part of Trinity, and a component of the TDE artwork module.
+
+%files -n trinity-kscreensaver-xsavers-extra
+%defattr(-,root,root,-)
+%{tde_datadir}/applnk/System/ScreenSavers/anemone.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/anemotaxis.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/antmaze.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/apollonian.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/apple2.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/atlantis.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/attraction.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/barcode.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/blaster.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/blitspin.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/blocktube.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/boing.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/bouboule.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/bouncingcow.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/boxed.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/boxfit.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/bsod.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/bumps.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/cage.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/carousel.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/ccurve.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/celtic.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/cloudlife.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/compass.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/coral.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/crackberg.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/crystal.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/cube21.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/cubenetic.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/cynosure.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/dangerball.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/decayscreen.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/deluxe.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/demon.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/discrete.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/drift.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/epicycle.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/eruption.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/euler2d.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/extrusion.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/fadeplot.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/fireworkx.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/flame.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/fliptext.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/flow.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/fluidballs.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/flurry.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/fontglide.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/glhanoi.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/glplanet.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/goop.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/grav.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/greynetic.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/halftone.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/halo.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/helix.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/hopalong.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/ifs.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/imsmap.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/interaggregate.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/interference.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/intermomentary.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/jigsaw.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/juggler3d.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/julia.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/kaleidescope.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/klein.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/kumppa.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/lament.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/loop.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/maze.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/memscroller.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/menger.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/moire.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/moire2.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/mountain.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/munch.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/nerverot.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/noof.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/noseguy.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/pacman.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/pedal.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/penetrate.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/petri.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/phosphor.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/piecewise.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/pinion.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/polyominoes.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/pong.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/providence.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/pyro.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/qix.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/rd-bomb.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/rocks.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/rorschach.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/rotzoomer.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/rubik.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/sballs.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/sierpinski.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/slip.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/speedmine.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/spotlight.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/sproingies.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/squiral.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/stairs.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/starfish.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/starwars.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/strange.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/substrate.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/tangram.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/thornbird.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/timetunnel.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/triangle.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/truchet.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/twang.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/vermiculate.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/vidwhacker.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/wander.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/whirlwindwarp.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/wormhole.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/xanalogtv.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/xflame.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/xrayswarm.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/xspirograph.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/zoom.desktop
+
+# These screensavers do not exist on Mageia 2
+%if 0%{?mgaversion} == 0
+%{tde_datadir}/applnk/System/ScreenSavers/xjack.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/xmatrix.desktop
+%endif
+
+%endif
+
+##########
 
 
 %prep
@@ -67,14 +584,15 @@ Group: User Interface/Desktops
 
 %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}"
 
-%__mkdir build
-cd build
+%{?!mgaversion:%__mkdir build; cd build}
 %cmake \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
 %if 0%{?with_xscreensaver}
   -DWITH_XSCREENSAVER=ON \
 %else
@@ -94,21 +612,13 @@ cd build
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install -C build DESTDIR=%{buildroot}
 
 # webcollage -root -directory /usr/share/backgrounds/images #227683
 
-# rpmdocs
-for dir in IconThemes/* kworldclock kscreensaver/kxsconfig ; do
-  for file in AUTHORS ChangeLog COPYRIGHT README TODO ; do
-    test -s  "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
-  done
-done
-
 # File lists
-%find_lang %{name} || touch %{name}.lang
 HTML_DIR=$(kde-config --expandvars --install html)
 if [ -d %{buildroot}$HTML_DIR ]; then
 for lang_dir in %{buildroot}$HTML_DIR/* ; do
@@ -125,64 +635,17 @@ for lang_dir in %{buildroot}$HTML_DIR/* ; do
 done
 fi
 
-# kde vs xscreensaver based screensavers
-for screensaver in %{buildroot}%{_datadir}/applnk/System/ScreenSavers/*.desktop ; do
-  if [ `grep '^TryExec=xscreensaver' $screensaver` ]; then
-    echo $screensaver | sed -e "s|%{buildroot}||" >> %{name}-extras.lang
-  else
-    echo $screensaver | sed -e "s|%{buildroot}||" >> %{name}.lang
-  fi
-done
-
-
 
-%post icons
-for i in locolor ikons kdeclassic kids slick ; do
- touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
-done
-
-%postun icons
-for i in locolor ikons kdeclassic kids slick ; do
- touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
-done
 
 %clean
 %__rm -rf %{buildroot}
 
-%files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc kwin-styles/smooth-blend/COPYING
-%doc rpmdocs/kworldclock
-%{_bindir}/*.kss
-%{tde_libdir}/plugins/styles/*
-%{tde_libdir}/*.so
-%{tde_libdir}/*.la
-%{_datadir}/apps/kfiresaver/
-%{_datadir}/apps/kscreensaver/
-%{_datadir}/apps/kstyle/themes/*
-%{_datadir}/apps/kwin/*
-%{_datadir}/apps/kworldclock/
-%{_datadir}/sounds/*
-%{_datadir}/wallpapers/*
-%{_datadir}/emoticons/*
-%if 0%{?with_xscreensaver}
-%{_bindir}/kxs*
-%endif
-
-%files icons
-%defattr(-,root,root,-)
-%doc rpmdocs/IconThemes/*
-%{_datadir}/icons/ikons/
-%{_datadir}/icons/kdeclassic/
-%{_datadir}/icons/kids/
-%{_datadir}/icons/Locolor/
-%{_datadir}/icons/slick/
-
-
 
 %changelog
+* Tue Jul 30 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
+- Split into several packages
+- Add support for Mageia 2
+
 * Fri Nov 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
 - Updates BuildRequires
 
diff --git a/redhat/kdebase/kdebase-3.5.13-add_xscreensaver_support.patch b/redhat/kdebase/kdebase-3.5.13-add_xscreensaver_support.patch
new file mode 100644
index 000000000..8e52ab971
--- /dev/null
+++ b/redhat/kdebase/kdebase-3.5.13-add_xscreensaver_support.patch
@@ -0,0 +1,76 @@
+commit 80deb52955cbd917e10f015f37699d830cb681ce
+Author: Slávek Banko <slavek.banko@axis.cz>
+Date:   1339336699 +0200
+
+    Add xscreensaver support to CMake
+    This closes Bug 859
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 31fb46c..3da5b2f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -67,6 +67,7 @@
+ option( WITH_XDAMAGE "Enable xdamage support" OFF )
+ option( WITH_XEXT "Enable xext support" OFF )
+ option( WITH_XTEST "Enable xext support" OFF )
++option( WITH_XSCREENSAVER "Enable xscreensaver support" ${WITH_ALL_OPTIONS} )
+ option( WITH_LIBUSB "Enable control of some mouse models through libusb" OFF )
+ option( WITH_LIBRAW1394 "Enable visualization of ieee1394 devices through libraw1394" OFF )
+ option( WITH_SUDO_KDESU_BACKEND "Use sudo as backend for kdesu (default is su)" OFF )
+diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
+index ded1d00..1d9c83d 100644
+--- a/ConfigureChecks.cmake
++++ b/ConfigureChecks.cmake
+@@ -144,6 +144,26 @@ if( WITH_XTEST )
+ endif( )
+ 
+ 
++# xscreensaver ()
++if( WITH_XSCREENSAVER )
++  check_library_exists( Xss XScreenSaverQueryInfo "" HAVE_XSSLIB )
++  if( HAVE_XSSLIB )
++    pkg_search_module( XSS xscrnsaver )
++  else( )
++    check_library_exists( Xext XScreenSaverQueryInfo "" HAVE_XSSLIB )
++    if( HAVE_XSSLIB )
++      pkg_search_module( XSS xext )
++    endif( )
++  endif( )
++  check_include_file( X11/extensions/scrnsaver.h HAVE_XSCREENSAVER_H )
++  if( HAVE_XSSLIB AND HAVE_XSCREENSAVER_H )
++    set( HAVE_XSCREENSAVER 1 )
++  else( )
++    tde_message_fatal( "xscreensaver is requested, but was not found on your system" )
++  endif( )
++endif( )
++
++
+ # GL
+ if( BUILD_KDESKTOP OR BUILD_KCONTROL OR BUILD_KSCREENSAVER )
+ check_library_exists( GL glXChooseVisual "" HAVE_GLXCHOOSEVISUAL )
+diff --git a/config.h.cmake b/config.h.cmake
+index 39d6d85..772ca88 100644
+--- a/config.h.cmake
++++ b/config.h.cmake
+@@ -21,6 +21,9 @@
+ // kxkb
+ #cmakedefine HAVE_XTEST 1
+ 
++// xscreensaver
++#cmakedefine HAVE_XSCREENSAVER 1
++
+ // kdm, kioslave
+ #cmakedefine HAVE_TERMIOS_H 1
+ 
+diff --git a/kdesktop/CMakeLists.txt b/kdesktop/CMakeLists.txt
+index 99d86d1..b2e4628 100644
+--- a/kdesktop/CMakeLists.txt
++++ b/kdesktop/CMakeLists.txt
+@@ -94,6 +94,7 @@ tde_add_tdeinit_executable( ${target} AUTOMOC
+     kdesktopsettings-static bgnd-static dmctl-static
+     konq-shared kutils-shared
+     ${XRENDER_LIBRARIES} ${XCURSOR_LIBRARIES} Xext dl
++    ${XSS_LIBRARIES}
+ )
+ 
+ 
diff --git a/redhat/kdebase/kdebase-3.5.13-startkde_icon.patch b/redhat/kdebase/kdebase-3.5.13-startkde_icon.patch
index 039290a0c..166c1b52f 100644
--- a/redhat/kdebase/kdebase-3.5.13-startkde_icon.patch
+++ b/redhat/kdebase/kdebase-3.5.13-startkde_icon.patch
@@ -1,28 +1,15 @@
---- kdebase/startkde.ORI	2011-11-14 22:23:07.191346324 +0100
-+++ kdebase/startkde	2011-11-14 22:38:28.480321300 +0100
-@@ -206,6 +206,29 @@
+--- tdebase/startkde.ORI	2012-07-29 18:23:59.885538470 +0200
++++ tdebase/startkde	2012-07-29 18:26:19.022618054 +0200
+@@ -152,6 +152,16 @@
    fi
  fi
  
-+# Default Start Button icon
++# Default Start Button icon for TDE
 +if [ ! -e  $kdehome/share/config/kickerrc ]; then
-+  # Fedora
-+  if [ -r /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ]; then
++  if [ -r "%{tde_starticon}" ]; then
 +    cat <<EOF >$kdehome/share/config/kickerrc
 +[KMenu]
-+CustomIcon=fedora-logo-icon
-+EOF
-+  # RHEL 6
-+  elif [ -r /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png ]; then
-+    cat <<EOF >$kdehome/share/config/kickerrc
-+[KMenu]
-+CustomIcon=system-logo-icon
-+EOF
-+  # RHEL 5
-+  elif [ -r /usr/share/pixmaps/redhat-starthere.png ]; then
-+    cat <<EOF >$kdehome/share/config/kickerrc
-+[KMenu]
-+CustomIcon=/usr/share/pixmaps/redhat-starthere.png
++CustomIcon=%{tde_starticon}
 +EOF
 +  fi
 +fi
diff --git a/redhat/kdebase/pamd.kcheckpass-trinity.mga2 b/redhat/kdebase/pamd.kcheckpass-trinity.mga2
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/kdebase/pamd.kcheckpass-trinity.mga2
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth       include	system-auth
+account    include	system-auth
+password   include	system-auth
+session    include	system-auth
diff --git a/redhat/kdebase/pamd.kdm-trinity-np.mga2 b/redhat/kdebase/pamd.kdm-trinity-np.mga2
new file mode 100644
index 000000000..c4e598afe
--- /dev/null
+++ b/redhat/kdebase/pamd.kdm-trinity-np.mga2
@@ -0,0 +1,10 @@
+#%PAM-1.0
+auth       required    pam_env.so
+auth       required    pam_permit.so
+account    required    pam_nologin.so
+account    include     system-auth
+password   include     system-auth
+session    optional    pam_keyinit.so force revoke
+session    include     system-auth
+session    required    pam_loginuid.so
+session    optional    pam_console.so
diff --git a/redhat/kdebase/pamd.kdm-trinity.mga2 b/redhat/kdebase/pamd.kdm-trinity.mga2
new file mode 100644
index 000000000..3263a6891
--- /dev/null
+++ b/redhat/kdebase/pamd.kdm-trinity.mga2
@@ -0,0 +1,13 @@
+#%PAM-1.0
+auth       required    pam_env.so
+auth       required    pam_succeed_if.so 
+auth       sufficient  pam_succeed_if.so user ingroup nopasswdlogin
+auth       substack    system-auth
+account    required    pam_nologin.so
+account    include     system-auth
+password   include     system-auth
+session    optional    pam_keyinit.so force revoke
+session    required    pam_loginuid.so
+session    include     system-auth
+session    optional    pam_console.so
+session    required    pam_namespace.so
diff --git a/redhat/kdebase/pamd.kscreensaver-trinity.mga2 b/redhat/kdebase/pamd.kscreensaver-trinity.mga2
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/kdebase/pamd.kscreensaver-trinity.mga2
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth       include	system-auth
+account    include	system-auth
+password   include	system-auth
+session    include	system-auth
diff --git a/redhat/kdebase/trinity-kdebase-3.5.13.spec b/redhat/kdebase/trinity-kdebase-3.5.13.spec
index e3eb82eab..5fa527e4c 100644
--- a/redhat/kdebase/trinity-kdebase-3.5.13.spec
+++ b/redhat/kdebase/trinity-kdebase-3.5.13.spec
@@ -1,25 +1,30 @@
 # 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
-%define tde_appdir %{_datadir}/applications/kde
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%define tde_bindir %{_prefix}/bin
+%define tde_datadir %{_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{_prefix}/include
+%define tde_libdir %{_prefix}/%{_lib}
+
+%define tde_tdeappdir %{tde_datadir}/applications/kde
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
 
 # Older RHEL/Fedora versions use packages named "qt", "qt-devel", ..
 # whereas newer versions use "qt3", "qt3-devel" ...
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 8
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 8 || 0%{?mgaversion}
 %define _qt_suffix 3
 %endif
 
 
 Name:		trinity-tdebase
 Version:	3.5.13
-Release:	25%{?release}%{?dist}%{?_variant}
+Release:	26%{?release}%{?dist}%{?_variant}
 License:	GPL
 Summary:	Trinity Base Programs
 Group:		User Interface/Desktops
@@ -161,6 +166,8 @@ Patch59:	kdebase-3.5.13-fix_fancy_logout.patch
 Patch60:	kdebase-3.5.13-update_default_konq_max_image_prev_size.patch
 ## [tdebase] Fix menu crash with disabled search field [Bug #1081] [Commit #0afb2d8a]
 Patch61:	kdebase-3.5.13-fix_menu_crash_with_disabled_search.patch
+## [tdebase] Add xscreensaver support to CMake [Bug #659] [Commit #80deb529]
+Patch62:	kdebase-3.5.13-add_xscreensaver_support.patch
 
 ### FEDORA / RHEL distribution-specific settings ###
 
@@ -168,6 +175,7 @@ Patch61:	kdebase-3.5.13-fix_menu_crash_with_disabled_search.patch
 %if 0%{?fedora} == 15
 Requires:	lovelock-backgrounds-single
 %define tde_bg /usr/share/backgrounds/lovelock/default/standard/lovelock.png
+%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
 
 Requires:	fedora-release-notes
 %define tde_aboutlabel Fedora 15
@@ -178,6 +186,7 @@ Requires:	fedora-release-notes
 %if 0%{?fedora} == 16
 Requires:	verne-backgrounds-single
 %define tde_bg /usr/share/backgrounds/verne/default/standard/verne.png
+%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
 
 Requires:	fedora-release-notes
 %define tde_aboutlabel Fedora 16
@@ -188,6 +197,7 @@ Requires:	fedora-release-notes
 %if 0%{?fedora} == 17
 Requires:	beefy-miracle-backgrounds-single
 %define tde_bg /usr/share/backgrounds/beefy-miracle/default/standard/beefy-miracle.png
+%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
 
 Requires:	fedora-release-notes
 %define tde_aboutlabel Fedora 17
@@ -198,6 +208,7 @@ Requires:	fedora-release-notes
 %if 0%{?rhel} == 5
 Requires:	desktop-backgrounds-basic
 %define tde_bg /usr/share/backgrounds/images/default.jpg
+%define tde_starticon /usr/share/pixmaps/redhat-starthere.png
 
 Requires:	indexhtml
 %define tde_aboutlabel Enterprise Linux 5
@@ -208,12 +219,23 @@ Requires:	indexhtml
 %if 0%{?rhel} == 6
 Requires:	redhat-logos
 %define tde_bg /usr/share/backgrounds/default.png
+%define tde_starticon /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png
 
 Requires:	redhat-indexhtml
 %define tde_aboutlabel Enterprise Linux 6
 %define tde_aboutpage /usr/share/doc/HTML/index.html
 %endif
 
+# Mageia 2 Theme
+%if 0%{?mgaversion} == 2
+Requires:	mageia-theme-Default
+%define tde_bg /usr/share/mga/backgrounds/default.jpg
+%define tde_starticon /usr/share/icons/hicolor/scalable/apps/mageia-menu.svg
+
+Requires:	indexhtml
+%define tde_aboutlabel Mageia 2
+%define tde_aboutpage /usr/share/mga/about/index.html
+%endif
 
 BuildRequires:	cmake >= 2.8
 BuildRequires:	tqtinterface-devel
@@ -222,9 +244,7 @@ BuildRequires:	trinity-kdelibs-devel
 BuildRequires:	gcc-c++ make
 BuildRequires:	qt%{?_qt_suffix}-devel
 BuildRequires:	openssl-devel
-BuildRequires:	avahi-devel avahi-qt3-devel
 BuildRequires:	imake
-BuildRequires:	xorg-x11-proto-devel
 BuildRequires:	OpenEXR-devel
 BuildRequires:	libsmbclient-devel
 BuildRequires:	dbus-devel
@@ -237,20 +257,15 @@ BuildRequires:	libraw1394-devel
 BuildRequires:	openldap-devel
 BuildRequires:	libvorbis-devel
 BuildRequires:	pam-devel
-BuildRequires:	libXdmcp-devel
 BuildRequires:	libxkbfile-devel
 BuildRequires:	libusb-devel
 BuildRequires:	esound-devel
 BuildRequires:	glib2-devel
-BuildRequires:	libXcomposite-devel
-BuildRequires:	libXtst-devel
-BuildRequires:	libXdamage-devel
-BuildRequires:	xorg-x11-font-utils
-BuildRequires:	jack-audio-connection-kit-devel
 BuildRequires:	nas-devel
 BuildRequires:	pcre-devel
+BuildRequires:	avahi-tqt-devel
 
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion}
 BuildRequires:	libudev-devel
 %endif
 
@@ -258,6 +273,30 @@ BuildRequires:	libudev-devel
 BuildRequires:	perl-Digest-MD5
 %endif
 
+%if 0%{?mgaversion}
+BuildRequires:	%{_lib}avahi-client-devel
+BuildRequires:	%{_lib}jack-devel
+BuildRequires:	%{_lib}xcomposite1-devel
+BuildRequires:	%{_lib}xdamage-devel
+BuildRequires:	%{_lib}xdmcp6-devel
+BuildRequires:	%{_lib}xtst-devel
+BuildRequires:	x11-font-util
+BuildRequires:	x11-proto-devel
+BuildRequires:	%{_lib}xscrnsaver1-devel
+Requires:		%{_lib}avahi-client3
+%else
+BuildRequires:	avahi-devel
+BuildRequires:	jack-audio-connection-kit-devel
+BuildRequires:	libXcomposite-devel
+BuildRequires:	libXdamage-devel
+BuildRequires:	libXdmcp-devel
+BuildRequires:	libXtst-devel
+BuildRequires:	xorg-x11-font-utils
+BuildRequires:	xorg-x11-proto-devel
+BuildRequires:	xscreensaver
+Requires:		avahi-qt3
+%endif
+
 # tdebase is a metapackage that installs all sub-packages
 Requires: %{name}-runtime-data-common = %{version}-%{release}
 Requires: %{name}-data = %{version}-%{release}
@@ -296,15 +335,16 @@ Requires:	trinity-arts
 Requires:	trinity-kdelibs
 Requires:	qt%{?_qt_suffix}
 Requires:	openssl
-Requires:	avahi avahi-qt3
+Requires:	avahi
 Requires:	dbus-tqt
 
 # RHEL 6 Configuration files are provided in separate packages
+%if 0%{?rhel} || 0%{?fedora}
 %if "%{?_prefix}" == "/usr"
 Requires:	kde-settings-kdm
 %endif
 Requires:	redhat-menus
-
+%endif
 
 %description
 TDE (the Trinity Desktop Environment) is a powerful Open Source graphical
@@ -317,6 +357,9 @@ set necessary to run TDE as a desktop environment. This includes the
 window manager, taskbar, control center, a text editor, file manager,
 web browser, X terminal emulator, and many other programs and components.
 
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING COPYING-DOCS README README.pam
 
 ##########
 
@@ -354,7 +397,7 @@ Install tdebase-devel if you want to develop or compile Konqueror,
 Kate plugins or KWin styles.
 
 %files devel
-%{_datadir}/cmake/*.cmake
+%{tde_datadir}/cmake/*.cmake
 
 ##########
 
@@ -376,22 +419,22 @@ Protocol handlers (KIOslaves) for personal information management, including:
 
 %files kio-pim-plugins
 %defattr(-,root,root,-)
-%{tde_libdir}/kio_ldap.la
-%{tde_libdir}/kio_ldap.so
-%{tde_libdir}/kio_nntp.la
-%{tde_libdir}/kio_nntp.so
-%{tde_libdir}/kio_pop3.la
-%{tde_libdir}/kio_pop3.so
-%{tde_libdir}/kio_smtp.la
-%{tde_libdir}/kio_smtp.so
-%{_datadir}/services/ldap.protocol
-%{_datadir}/services/ldaps.protocol
-%{_datadir}/services/nntp.protocol
-%{_datadir}/services/nntps.protocol
-%{_datadir}/services/pop3.protocol
-%{_datadir}/services/pop3s.protocol
-%{_datadir}/services/smtp.protocol
-%{_datadir}/services/smtps.protocol
+%{tde_tdelibdir}/kio_ldap.la
+%{tde_tdelibdir}/kio_ldap.so
+%{tde_tdelibdir}/kio_nntp.la
+%{tde_tdelibdir}/kio_nntp.so
+%{tde_tdelibdir}/kio_pop3.la
+%{tde_tdelibdir}/kio_pop3.so
+%{tde_tdelibdir}/kio_smtp.la
+%{tde_tdelibdir}/kio_smtp.so
+%{tde_datadir}/services/ldap.protocol
+%{tde_datadir}/services/ldaps.protocol
+%{tde_datadir}/services/nntp.protocol
+%{tde_datadir}/services/nntps.protocol
+%{tde_datadir}/services/pop3.protocol
+%{tde_datadir}/services/pop3s.protocol
+%{tde_datadir}/services/smtp.protocol
+%{tde_datadir}/services/smtps.protocol
 
 ##########
 
@@ -408,30 +451,30 @@ Such as the desktop right-click-"Create New" list
 
 %files runtime-data-common
 %defattr(-,root,root,-)
-%{_datadir}/autostart/khotkeys.desktop
-%{_datadir}/desktop-directories/*
-%{_datadir}/icons/hicolor/*/apps/kxkb.png
-%{_datadir}/icons/hicolor/*/apps/knetattach.*
-%{_datadir}/icons/hicolor/*/apps/khotkeys.png
-%{_datadir}/icons/hicolor/*/apps/kmenuedit.png
-%{_datadir}/icons/hicolor/*/apps/ksplash.png
-%{_datadir}/locale/en_US/entry.desktop
-%{_datadir}/locale/l10n/*.desktop
-%{_datadir}/locale/l10n/*/entry.desktop
-%{_datadir}/locale/l10n/*/flag.png
-%{_datadir}/sounds/pop.wav
-%{_datadir}/templates
+%{tde_datadir}/autostart/khotkeys.desktop
+%{tde_datadir}/desktop-directories/*
+%{tde_datadir}/icons/hicolor/*/apps/kxkb.png
+%{tde_datadir}/icons/hicolor/*/apps/knetattach.*
+%{tde_datadir}/icons/hicolor/*/apps/khotkeys.png
+%{tde_datadir}/icons/hicolor/*/apps/kmenuedit.png
+%{tde_datadir}/icons/hicolor/*/apps/ksplash.png
+%{tde_datadir}/locale/en_US/entry.desktop
+%{tde_datadir}/locale/l10n/*.desktop
+%{tde_datadir}/locale/l10n/*/entry.desktop
+%{tde_datadir}/locale/l10n/*/flag.png
+%{tde_datadir}/sounds/pop.wav
+%{tde_datadir}/templates
 
 %post runtime-data-common
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 
 %postun runtime-data-common
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 
 ##########
@@ -447,23 +490,23 @@ creates menu entries for them.
 
 %files -n trinity-kappfinder
 %defattr(-,root,root,-)
-%{_bindir}/kappfinder
-%{tde_appdir}/kappfinder.desktop
-%{_datadir}/applnk/System/kappfinder.desktop
-%{_datadir}/apps/kappfinder
-%{_datadir}/icons/hicolor/*/apps/kappfinder.png
+%{tde_bindir}/kappfinder
+%{tde_tdeappdir}/kappfinder.desktop
+%{tde_datadir}/applnk/System/kappfinder.desktop
+%{tde_datadir}/apps/kappfinder
+%{tde_datadir}/icons/hicolor/*/apps/kappfinder.png
 
 %post -n trinity-kappfinder
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 update-desktop-database %{tde_appdir} 2> /dev/null || : 
 
 %postun -n trinity-kappfinder
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 update-desktop-database %{tde_appdir} 2> /dev/null || : 
 
@@ -477,7 +520,7 @@ Group:		Environment/Libraries
 %{summary}
 
 %files -n trinity-libkateinterfaces
-%{_libdir}/libkateinterfaces.so.*
+%{tde_libdir}/libkateinterfaces.so.*
 
 ##########
 
@@ -509,33 +552,33 @@ Some random features:
 
 %files -n trinity-kate
 %defattr(-,root,root,-)
-%{_bindir}/kate
-%{tde_libdir}/kate.la
-%{tde_libdir}/kate.so
-%{_libdir}/libkateutils.so.*
-%{_libdir}/lib[kt]deinit_kate.la
-%{_libdir}/lib[kt]deinit_kate.so
-%{tde_appdir}/kate.desktop
-%{_datadir}/apps/kate/
-%{_datadir}/apps/kconf_update/kate-2.4.upd
-%{_datadir}/config/katerc
-%{_datadir}/icons/hicolor/*/apps/kate.png
-%{_datadir}/icons/hicolor/*/apps/kate2.svgz
-%{_datadir}/servicetypes/kateplugin.desktop
-%{tde_docdir}/HTML/en/kate/
+%{tde_bindir}/kate
+%{tde_tdelibdir}/kate.la
+%{tde_tdelibdir}/kate.so
+%{tde_libdir}/libkateutils.so.*
+%{tde_libdir}/lib[kt]deinit_kate.la
+%{tde_libdir}/lib[kt]deinit_kate.so
+%{tde_tdeappdir}/kate.desktop
+%{tde_datadir}/apps/kate/
+%{tde_datadir}/apps/kconf_update/kate-2.4.upd
+%{tde_datadir}/config/katerc
+%{tde_datadir}/icons/hicolor/*/apps/kate.png
+%{tde_datadir}/icons/hicolor/*/apps/kate2.svgz
+%{tde_datadir}/servicetypes/kateplugin.desktop
+%{tde_tdedocdir}/HTML/en/kate/
 
 %post -n trinity-kate
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 update-desktop-database %{tde_appdir} 2> /dev/null || : 
 /sbin/ldconfig || :
 
 %postun -n trinity-kate
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 update-desktop-database %{tde_appdir} 2> /dev/null || : 
 /sbin/ldconfig || :
@@ -551,11 +594,11 @@ Requires:	trinity-kate = %{version}-%{release}
 %{summary}
 
 %files -n trinity-kate-devel
-%{_includedir}/kate/
-%{_libdir}/libkateutils.so
-%{_libdir}/libkateutils.la
-%{_libdir}/libkateinterfaces.so
-%{_libdir}/libkateinterfaces.la
+%{tde_includedir}/kate/
+%{tde_libdir}/libkateutils.so
+%{tde_libdir}/libkateutils.la
+%{tde_libdir}/libkateinterfaces.so
+%{tde_libdir}/libkateinterfaces.la
 
 %post -n trinity-kate-devel
 /sbin/ldconfig || :
@@ -576,29 +619,29 @@ Kwrite is a text editor for TDE.
 
 %files -n trinity-kwrite
 %defattr(-,root,root,-)
-%{_bindir}/kwrite
-%{tde_libdir}/kwrite.la
-%{tde_libdir}/kwrite.so
-%{_libdir}/lib[kt]deinit_kwrite.la
-%{_libdir}/lib[kt]deinit_kwrite.so
-%{tde_appdir}/kwrite.desktop
-%{_datadir}/apps/kwrite/kwriteui.rc
-%{_datadir}/icons/hicolor/*/apps/kwrite.png
-%{_datadir}/icons/hicolor/*/apps/kwrite2.svgz
-%{tde_docdir}/HTML/en/kwrite/
+%{tde_bindir}/kwrite
+%{tde_tdelibdir}/kwrite.la
+%{tde_tdelibdir}/kwrite.so
+%{tde_libdir}/lib[kt]deinit_kwrite.la
+%{tde_libdir}/lib[kt]deinit_kwrite.so
+%{tde_tdeappdir}/kwrite.desktop
+%{tde_datadir}/apps/kwrite/kwriteui.rc
+%{tde_datadir}/icons/hicolor/*/apps/kwrite.png
+%{tde_datadir}/icons/hicolor/*/apps/kwrite2.svgz
+%{tde_tdedocdir}/HTML/en/kwrite/
 
 
 %post -n trinity-kwrite
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 update-desktop-database %{tde_appdir} 2> /dev/null || : 
 
 %postun -n trinity-kwrite
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 update-desktop-database %{tde_appdir} 2> /dev/null || : 
 
@@ -625,252 +668,252 @@ plugdev group.
 
 %files -n trinity-kcontrol
 %defattr(-,root,root,-)
-%{_bindir}/kaccess
-%{_bindir}/kcontrol
-%{_bindir}/kdeinstallktheme
-%{_bindir}/keditfiletype
-%{_bindir}/kfontinst
-%{_bindir}/kfontview
-%{_bindir}/kinfocenter
-%{_bindir}/klocaldomainurifilterhelper
-%{_bindir}/krdb
-%{tde_libdir}/fontthumbnail.la
-%{tde_libdir}/fontthumbnail.so
-%{tde_libdir}/kaccess.la
-%{tde_libdir}/kaccess.so
-%{tde_libdir}/kcm_access.la
-%{tde_libdir}/kcm_access.so
-%{tde_libdir}/kcm_arts.la
-%{tde_libdir}/kcm_arts.so
-%{tde_libdir}/kcm_background.la
-%{tde_libdir}/kcm_background.so
-%{tde_libdir}/kcm_bell.la
-%{tde_libdir}/kcm_bell.so
-%{tde_libdir}/kcm_clock.la
-%{tde_libdir}/kcm_clock.so
-%{tde_libdir}/kcm_colors.la
-%{tde_libdir}/kcm_colors.so
-%{tde_libdir}/kcm_componentchooser.la
-%{tde_libdir}/kcm_componentchooser.so
-%{tde_libdir}/kcm_crypto.la
-%{tde_libdir}/kcm_crypto.so
-%{tde_libdir}/kcm_css.la
-%{tde_libdir}/kcm_css.so
-%{tde_libdir}/kcm_display.la
-%{tde_libdir}/kcm_display.so
-%{tde_libdir}/kcm_energy.la
-%{tde_libdir}/kcm_energy.so
-%{tde_libdir}/kcm_filetypes.la
-%{tde_libdir}/kcm_filetypes.so
-%{tde_libdir}/kcm_fontinst.la
-%{tde_libdir}/kcm_fontinst.so
-%{tde_libdir}/kcm_fonts.la
-%{tde_libdir}/kcm_fonts.so
-#%{tde_libdir}/kcm_hwmanager.la
-#%{tde_libdir}/kcm_hwmanager.so
-%{tde_libdir}/kcm_icons.la
-%{tde_libdir}/kcm_icons.so
-%{tde_libdir}/kcm_info.la
-%{tde_libdir}/kcm_info.so
-%{tde_libdir}/kcm_input.la
-%{tde_libdir}/kcm_input.so
-%{tde_libdir}/kcm_ioslaveinfo.la
-%{tde_libdir}/kcm_ioslaveinfo.so
-%{tde_libdir}/kcm_joystick.la
-%{tde_libdir}/kcm_joystick.so
-%{tde_libdir}/kcm_kded.la
-%{tde_libdir}/kcm_kded.so
-%{tde_libdir}/kcm_[kt]dm.la
-%{tde_libdir}/kcm_[kt]dm.so
-%{tde_libdir}/kcm_kdnssd.so
-%{tde_libdir}/kcm_kdnssd.la
-%{tde_libdir}/kcm_keys.la
-%{tde_libdir}/kcm_keys.so
-%{tde_libdir}/kcm_kicker.la
-%{tde_libdir}/kcm_kicker.so
-%{tde_libdir}/kcm_kio.la
-%{tde_libdir}/kcm_kio.so
-%{tde_libdir}/kcm_knotify.la
-%{tde_libdir}/kcm_knotify.so
-%{tde_libdir}/kcm_konqhtml.la
-%{tde_libdir}/kcm_konqhtml.so
-%{tde_libdir}/kcm_konq.la
-%{tde_libdir}/kcm_konq.so
-%{tde_libdir}/kcm_kthememanager.la
-%{tde_libdir}/kcm_kthememanager.so
-%{tde_libdir}/kcm_kurifilt.la
-%{tde_libdir}/kcm_kurifilt.so
-%{tde_libdir}/kcm_launch.la
-%{tde_libdir}/kcm_launch.so
-%{tde_libdir}/kcm_locale.la
-%{tde_libdir}/kcm_locale.so
-%{tde_libdir}/kcm_nic.la
-%{tde_libdir}/kcm_nic.so
-%{tde_libdir}/kcm_performance.la
-%{tde_libdir}/kcm_performance.so
-%{tde_libdir}/kcm_privacy.la
-%{tde_libdir}/kcm_privacy.so
-%{tde_libdir}/kcm_samba.la
-%{tde_libdir}/kcm_samba.so
-%{tde_libdir}/kcm_screensaver.la
-%{tde_libdir}/kcm_screensaver.so
-%{tde_libdir}/kcm_smserver.la
-%{tde_libdir}/kcm_smserver.so
-%{tde_libdir}/kcm_spellchecking.la
-%{tde_libdir}/kcm_spellchecking.so
-%{tde_libdir}/kcm_style.la
-%{tde_libdir}/kcm_style.so
-%{tde_libdir}/kcm_taskbar.la
-%{tde_libdir}/kcm_taskbar.so
-%{tde_libdir}/kcm_usb.la
-%{tde_libdir}/kcm_usb.so
-%{tde_libdir}/kcm_view1394.la
-%{tde_libdir}/kcm_view1394.so
-%{tde_libdir}/kcm_xinerama.la
-%{tde_libdir}/kcm_xinerama.so
-%{tde_libdir}/kcontrol.la
-%{tde_libdir}/kcontrol.so
-%{tde_libdir}/kfile_font.la
-%{tde_libdir}/kfile_font.so
-%{tde_libdir}/kio_fonts.la
-%{tde_libdir}/kio_fonts.so
-%{tde_libdir}/kstyle_keramik_config.la
-%{tde_libdir}/kstyle_keramik_config.so
-%{tde_libdir}/libkfontviewpart.la
-%{tde_libdir}/libkfontviewpart.so
-%{tde_libdir}/libkshorturifilter.la
-%{tde_libdir}/libkshorturifilter.so
-%{tde_libdir}/libkuriikwsfilter.la
-%{tde_libdir}/libkuriikwsfilter.so
-%{tde_libdir}/libkurisearchfilter.la
-%{tde_libdir}/libkurisearchfilter.so
-%{tde_libdir}/liblocaldomainurifilter.la
-%{tde_libdir}/liblocaldomainurifilter.so
-%{_libdir}/lib[kt]deinit_kaccess.la
-%{_libdir}/lib[kt]deinit_kaccess.so
-%{_libdir}/lib[kt]deinit_kcontrol.la
-%{_libdir}/lib[kt]deinit_kcontrol.so
-%{_libdir}/libkfontinst.so.*
-%{tde_appdir}/arts.desktop
-%{tde_appdir}/background.desktop
-%{tde_appdir}/bell.desktop
-%{tde_appdir}/cache.desktop
-%{tde_appdir}/cdinfo.desktop
-%{tde_appdir}/clock.desktop
-%{tde_appdir}/colors.desktop
-%{tde_appdir}/componentchooser.desktop
-%{tde_appdir}/cookies.desktop
-%{tde_appdir}/crypto.desktop
-%{tde_appdir}/desktopbehavior.desktop
-%{tde_appdir}/desktop.desktop
-%{tde_appdir}/desktoppath.desktop
-%{tde_appdir}/devices.desktop
-%{tde_appdir}/display.desktop
-%{tde_appdir}/dma.desktop
-%{tde_appdir}/ebrowsing.desktop
-%{tde_appdir}/filebrowser.desktop
-%{tde_appdir}/filetypes.desktop
-%{tde_appdir}/fonts.desktop
-#%{tde_appdir}/hwmanager.desktop
-%{tde_appdir}/icons.desktop
-%{tde_appdir}/installktheme.desktop
-%{tde_appdir}/interrupts.desktop
-%{tde_appdir}/ioports.desktop
-%{tde_appdir}/ioslaveinfo.desktop
-%{tde_appdir}/joystick.desktop
-%{tde_appdir}/kcm_kdnssd.desktop
-%{tde_appdir}/kcmaccess.desktop
-%{tde_appdir}/kcmcss.desktop
-%{tde_appdir}/kcmfontinst.desktop
-%{tde_appdir}/kcmkded.desktop
-%{tde_appdir}/kcmlaunch.desktop
-%{tde_appdir}/kcmnotify.desktop
-%{tde_appdir}/kcmperformance.desktop
-%{tde_appdir}/kcmsmserver.desktop
-%{tde_appdir}/kcmtaskbar.desktop
-%{tde_appdir}/kcmusb.desktop
-%{tde_appdir}/kcmview1394.desktop
-%{tde_appdir}/KControl.desktop
-%{tde_appdir}/[kt]dm.desktop
-%{tde_appdir}/keys.desktop
-%{tde_appdir}/kfontview.desktop
-%{tde_appdir}/khtml_behavior.desktop
-%{tde_appdir}/khtml_fonts.desktop
-%{tde_appdir}/khtml_java_js.desktop
-%{tde_appdir}/kinfocenter.desktop
-%{tde_appdir}/kthememanager.desktop
-%{tde_appdir}/lanbrowser.desktop
-%{tde_appdir}/language.desktop
-%{tde_appdir}/media.desktop
-%{tde_appdir}/memory.desktop
-%{tde_appdir}/mouse.desktop
-%{tde_appdir}/netpref.desktop
-%{tde_appdir}/nic.desktop
-%{tde_appdir}/opengl.desktop
-%{tde_appdir}/panel_appearance.desktop
-%{tde_appdir}/panel.desktop
-%{tde_appdir}/partitions.desktop
-%{tde_appdir}/pci.desktop
-%{tde_appdir}/privacy.desktop
-%{tde_appdir}/processor.desktop
-%{tde_appdir}/proxy.desktop
-%{tde_appdir}/screensaver.desktop
-%{tde_appdir}/scsi.desktop
-%{tde_appdir}/smbstatus.desktop
-%{tde_appdir}/sound.desktop
-%{tde_appdir}/spellchecking.desktop
-%{tde_appdir}/style.desktop
-%{tde_appdir}/useragent.desktop
-%{tde_appdir}/xserver.desktop
-%{_datadir}/applnk/.hidden/energy.desktop
-%{_datadir}/applnk/.hidden/fileappearance.desktop
-%{_datadir}/applnk/.hidden/filebehavior.desktop
-%{_datadir}/applnk/.hidden/filepreviews.desktop
-%{_datadir}/applnk/.hidden/kcmkonqyperformance.desktop
-%{_datadir}/applnk/.hidden/kicker_config_appearance.desktop
-%{_datadir}/applnk/.hidden/kicker_config.desktop
-%{_datadir}/applnk/.hidden/smb.desktop
-%{_datadir}/applnk/.hidden/xinerama.desktop
-%{_datadir}/applnk/Settings/LookNFeel/
-%{_datadir}/applnk/Settings/WebBrowsing/khtml_appearance.desktop
-%{_datadir}/applnk/Settings/WebBrowsing/nsplugin.desktop
-%{_datadir}/applnk/Settings/WebBrowsing/smb.desktop
-%{_datadir}/apps/kcm_componentchooser/kcm_browser.desktop
-%{_datadir}/apps/kcm_componentchooser/kcm_kemail.desktop
-%{_datadir}/apps/kcm_componentchooser/kcm_terminal.desktop
-%{_datadir}/apps/konqsidebartng/virtual_folders/services/fonts.desktop
-%{_datadir}/apps/konqueror/servicemenus/installfont.desktop
-%{_datadir}/mimelnk/application/x-ktheme.desktop
-%{_datadir}/mimelnk/fonts/folder.desktop
-%{_datadir}/mimelnk/fonts/package.desktop
-%{_datadir}/mimelnk/fonts/system-folder.desktop
-%{_datadir}/services/fonts.protocol
-%{_datadir}/services/fontthumbnail.desktop
-%{_datadir}/services/kaccess.desktop
-%{_datadir}/services/kfile_font.desktop
-%{_datadir}/services/kfontviewpart.desktop
-%{_datadir}/services/kshorturifilter.desktop
-%{_datadir}/services/kuriikwsfilter.desktop
-%{_datadir}/services/kurisearchfilter.desktop
-%{_datadir}/services/localdomainurifilter.desktop
-
-%{_datadir}/apps/usb.ids
-%{_datadir}/apps/kcmview1394/oui.db
+%{tde_bindir}/kaccess
+%{tde_bindir}/kcontrol
+%{tde_bindir}/kdeinstallktheme
+%{tde_bindir}/keditfiletype
+%{tde_bindir}/kfontinst
+%{tde_bindir}/kfontview
+%{tde_bindir}/kinfocenter
+%{tde_bindir}/klocaldomainurifilterhelper
+%{tde_bindir}/krdb
+%{tde_tdelibdir}/fontthumbnail.la
+%{tde_tdelibdir}/fontthumbnail.so
+%{tde_tdelibdir}/kaccess.la
+%{tde_tdelibdir}/kaccess.so
+%{tde_tdelibdir}/kcm_access.la
+%{tde_tdelibdir}/kcm_access.so
+%{tde_tdelibdir}/kcm_arts.la
+%{tde_tdelibdir}/kcm_arts.so
+%{tde_tdelibdir}/kcm_background.la
+%{tde_tdelibdir}/kcm_background.so
+%{tde_tdelibdir}/kcm_bell.la
+%{tde_tdelibdir}/kcm_bell.so
+%{tde_tdelibdir}/kcm_clock.la
+%{tde_tdelibdir}/kcm_clock.so
+%{tde_tdelibdir}/kcm_colors.la
+%{tde_tdelibdir}/kcm_colors.so
+%{tde_tdelibdir}/kcm_componentchooser.la
+%{tde_tdelibdir}/kcm_componentchooser.so
+%{tde_tdelibdir}/kcm_crypto.la
+%{tde_tdelibdir}/kcm_crypto.so
+%{tde_tdelibdir}/kcm_css.la
+%{tde_tdelibdir}/kcm_css.so
+%{tde_tdelibdir}/kcm_display.la
+%{tde_tdelibdir}/kcm_display.so
+%{tde_tdelibdir}/kcm_energy.la
+%{tde_tdelibdir}/kcm_energy.so
+%{tde_tdelibdir}/kcm_filetypes.la
+%{tde_tdelibdir}/kcm_filetypes.so
+%{tde_tdelibdir}/kcm_fontinst.la
+%{tde_tdelibdir}/kcm_fontinst.so
+%{tde_tdelibdir}/kcm_fonts.la
+%{tde_tdelibdir}/kcm_fonts.so
+#%{tde_tdelibdir}/kcm_hwmanager.la
+#%{tde_tdelibdir}/kcm_hwmanager.so
+%{tde_tdelibdir}/kcm_icons.la
+%{tde_tdelibdir}/kcm_icons.so
+%{tde_tdelibdir}/kcm_info.la
+%{tde_tdelibdir}/kcm_info.so
+%{tde_tdelibdir}/kcm_input.la
+%{tde_tdelibdir}/kcm_input.so
+%{tde_tdelibdir}/kcm_ioslaveinfo.la
+%{tde_tdelibdir}/kcm_ioslaveinfo.so
+%{tde_tdelibdir}/kcm_joystick.la
+%{tde_tdelibdir}/kcm_joystick.so
+%{tde_tdelibdir}/kcm_kded.la
+%{tde_tdelibdir}/kcm_kded.so
+%{tde_tdelibdir}/kcm_[kt]dm.la
+%{tde_tdelibdir}/kcm_[kt]dm.so
+%{tde_tdelibdir}/kcm_kdnssd.so
+%{tde_tdelibdir}/kcm_kdnssd.la
+%{tde_tdelibdir}/kcm_keys.la
+%{tde_tdelibdir}/kcm_keys.so
+%{tde_tdelibdir}/kcm_kicker.la
+%{tde_tdelibdir}/kcm_kicker.so
+%{tde_tdelibdir}/kcm_kio.la
+%{tde_tdelibdir}/kcm_kio.so
+%{tde_tdelibdir}/kcm_knotify.la
+%{tde_tdelibdir}/kcm_knotify.so
+%{tde_tdelibdir}/kcm_konqhtml.la
+%{tde_tdelibdir}/kcm_konqhtml.so
+%{tde_tdelibdir}/kcm_konq.la
+%{tde_tdelibdir}/kcm_konq.so
+%{tde_tdelibdir}/kcm_kthememanager.la
+%{tde_tdelibdir}/kcm_kthememanager.so
+%{tde_tdelibdir}/kcm_kurifilt.la
+%{tde_tdelibdir}/kcm_kurifilt.so
+%{tde_tdelibdir}/kcm_launch.la
+%{tde_tdelibdir}/kcm_launch.so
+%{tde_tdelibdir}/kcm_locale.la
+%{tde_tdelibdir}/kcm_locale.so
+%{tde_tdelibdir}/kcm_nic.la
+%{tde_tdelibdir}/kcm_nic.so
+%{tde_tdelibdir}/kcm_performance.la
+%{tde_tdelibdir}/kcm_performance.so
+%{tde_tdelibdir}/kcm_privacy.la
+%{tde_tdelibdir}/kcm_privacy.so
+%{tde_tdelibdir}/kcm_samba.la
+%{tde_tdelibdir}/kcm_samba.so
+%{tde_tdelibdir}/kcm_screensaver.la
+%{tde_tdelibdir}/kcm_screensaver.so
+%{tde_tdelibdir}/kcm_smserver.la
+%{tde_tdelibdir}/kcm_smserver.so
+%{tde_tdelibdir}/kcm_spellchecking.la
+%{tde_tdelibdir}/kcm_spellchecking.so
+%{tde_tdelibdir}/kcm_style.la
+%{tde_tdelibdir}/kcm_style.so
+%{tde_tdelibdir}/kcm_taskbar.la
+%{tde_tdelibdir}/kcm_taskbar.so
+%{tde_tdelibdir}/kcm_usb.la
+%{tde_tdelibdir}/kcm_usb.so
+%{tde_tdelibdir}/kcm_view1394.la
+%{tde_tdelibdir}/kcm_view1394.so
+%{tde_tdelibdir}/kcm_xinerama.la
+%{tde_tdelibdir}/kcm_xinerama.so
+%{tde_tdelibdir}/kcontrol.la
+%{tde_tdelibdir}/kcontrol.so
+%{tde_tdelibdir}/kfile_font.la
+%{tde_tdelibdir}/kfile_font.so
+%{tde_tdelibdir}/kio_fonts.la
+%{tde_tdelibdir}/kio_fonts.so
+%{tde_tdelibdir}/kstyle_keramik_config.la
+%{tde_tdelibdir}/kstyle_keramik_config.so
+%{tde_tdelibdir}/libkfontviewpart.la
+%{tde_tdelibdir}/libkfontviewpart.so
+%{tde_tdelibdir}/libkshorturifilter.la
+%{tde_tdelibdir}/libkshorturifilter.so
+%{tde_tdelibdir}/libkuriikwsfilter.la
+%{tde_tdelibdir}/libkuriikwsfilter.so
+%{tde_tdelibdir}/libkurisearchfilter.la
+%{tde_tdelibdir}/libkurisearchfilter.so
+%{tde_tdelibdir}/liblocaldomainurifilter.la
+%{tde_tdelibdir}/liblocaldomainurifilter.so
+%{tde_libdir}/lib[kt]deinit_kaccess.la
+%{tde_libdir}/lib[kt]deinit_kaccess.so
+%{tde_libdir}/lib[kt]deinit_kcontrol.la
+%{tde_libdir}/lib[kt]deinit_kcontrol.so
+%{tde_libdir}/libkfontinst.so.*
+%{tde_tdeappdir}/arts.desktop
+%{tde_tdeappdir}/background.desktop
+%{tde_tdeappdir}/bell.desktop
+%{tde_tdeappdir}/cache.desktop
+%{tde_tdeappdir}/cdinfo.desktop
+%{tde_tdeappdir}/clock.desktop
+%{tde_tdeappdir}/colors.desktop
+%{tde_tdeappdir}/componentchooser.desktop
+%{tde_tdeappdir}/cookies.desktop
+%{tde_tdeappdir}/crypto.desktop
+%{tde_tdeappdir}/desktopbehavior.desktop
+%{tde_tdeappdir}/desktop.desktop
+%{tde_tdeappdir}/desktoppath.desktop
+%{tde_tdeappdir}/devices.desktop
+%{tde_tdeappdir}/display.desktop
+%{tde_tdeappdir}/dma.desktop
+%{tde_tdeappdir}/ebrowsing.desktop
+%{tde_tdeappdir}/filebrowser.desktop
+%{tde_tdeappdir}/filetypes.desktop
+%{tde_tdeappdir}/fonts.desktop
+#%{tde_tdeappdir}/hwmanager.desktop
+%{tde_tdeappdir}/icons.desktop
+%{tde_tdeappdir}/installktheme.desktop
+%{tde_tdeappdir}/interrupts.desktop
+%{tde_tdeappdir}/ioports.desktop
+%{tde_tdeappdir}/ioslaveinfo.desktop
+%{tde_tdeappdir}/joystick.desktop
+%{tde_tdeappdir}/kcm_kdnssd.desktop
+%{tde_tdeappdir}/kcmaccess.desktop
+%{tde_tdeappdir}/kcmcss.desktop
+%{tde_tdeappdir}/kcmfontinst.desktop
+%{tde_tdeappdir}/kcmkded.desktop
+%{tde_tdeappdir}/kcmlaunch.desktop
+%{tde_tdeappdir}/kcmnotify.desktop
+%{tde_tdeappdir}/kcmperformance.desktop
+%{tde_tdeappdir}/kcmsmserver.desktop
+%{tde_tdeappdir}/kcmtaskbar.desktop
+%{tde_tdeappdir}/kcmusb.desktop
+%{tde_tdeappdir}/kcmview1394.desktop
+%{tde_tdeappdir}/KControl.desktop
+%{tde_tdeappdir}/[kt]dm.desktop
+%{tde_tdeappdir}/keys.desktop
+%{tde_tdeappdir}/kfontview.desktop
+%{tde_tdeappdir}/khtml_behavior.desktop
+%{tde_tdeappdir}/khtml_fonts.desktop
+%{tde_tdeappdir}/khtml_java_js.desktop
+%{tde_tdeappdir}/kinfocenter.desktop
+%{tde_tdeappdir}/kthememanager.desktop
+%{tde_tdeappdir}/lanbrowser.desktop
+%{tde_tdeappdir}/language.desktop
+%{tde_tdeappdir}/media.desktop
+%{tde_tdeappdir}/memory.desktop
+%{tde_tdeappdir}/mouse.desktop
+%{tde_tdeappdir}/netpref.desktop
+%{tde_tdeappdir}/nic.desktop
+%{tde_tdeappdir}/opengl.desktop
+%{tde_tdeappdir}/panel_appearance.desktop
+%{tde_tdeappdir}/panel.desktop
+%{tde_tdeappdir}/partitions.desktop
+%{tde_tdeappdir}/pci.desktop
+%{tde_tdeappdir}/privacy.desktop
+%{tde_tdeappdir}/processor.desktop
+%{tde_tdeappdir}/proxy.desktop
+%{tde_tdeappdir}/screensaver.desktop
+%{tde_tdeappdir}/scsi.desktop
+%{tde_tdeappdir}/smbstatus.desktop
+%{tde_tdeappdir}/sound.desktop
+%{tde_tdeappdir}/spellchecking.desktop
+%{tde_tdeappdir}/style.desktop
+%{tde_tdeappdir}/useragent.desktop
+%{tde_tdeappdir}/xserver.desktop
+%{tde_datadir}/applnk/.hidden/energy.desktop
+%{tde_datadir}/applnk/.hidden/fileappearance.desktop
+%{tde_datadir}/applnk/.hidden/filebehavior.desktop
+%{tde_datadir}/applnk/.hidden/filepreviews.desktop
+%{tde_datadir}/applnk/.hidden/kcmkonqyperformance.desktop
+%{tde_datadir}/applnk/.hidden/kicker_config_appearance.desktop
+%{tde_datadir}/applnk/.hidden/kicker_config.desktop
+%{tde_datadir}/applnk/.hidden/smb.desktop
+%{tde_datadir}/applnk/.hidden/xinerama.desktop
+%{tde_datadir}/applnk/Settings/LookNFeel/
+%{tde_datadir}/applnk/Settings/WebBrowsing/khtml_appearance.desktop
+%{tde_datadir}/applnk/Settings/WebBrowsing/nsplugin.desktop
+%{tde_datadir}/applnk/Settings/WebBrowsing/smb.desktop
+%{tde_datadir}/apps/kcm_componentchooser/kcm_browser.desktop
+%{tde_datadir}/apps/kcm_componentchooser/kcm_kemail.desktop
+%{tde_datadir}/apps/kcm_componentchooser/kcm_terminal.desktop
+%{tde_datadir}/apps/konqsidebartng/virtual_folders/services/fonts.desktop
+%{tde_datadir}/apps/konqueror/servicemenus/installfont.desktop
+%{tde_datadir}/mimelnk/application/x-ktheme.desktop
+%{tde_datadir}/mimelnk/fonts/folder.desktop
+%{tde_datadir}/mimelnk/fonts/package.desktop
+%{tde_datadir}/mimelnk/fonts/system-folder.desktop
+%{tde_datadir}/services/fonts.protocol
+%{tde_datadir}/services/fontthumbnail.desktop
+%{tde_datadir}/services/kaccess.desktop
+%{tde_datadir}/services/kfile_font.desktop
+%{tde_datadir}/services/kfontviewpart.desktop
+%{tde_datadir}/services/kshorturifilter.desktop
+%{tde_datadir}/services/kuriikwsfilter.desktop
+%{tde_datadir}/services/kurisearchfilter.desktop
+%{tde_datadir}/services/localdomainurifilter.desktop
+
+%{tde_datadir}/apps/usb.ids
+%{tde_datadir}/apps/kcmview1394/oui.db
 
 # The following features are not compiled under RHEL 5
 %if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
-%{_bindir}/krandrtray
-%{tde_libdir}/kcm_displayconfig.la
-%{tde_libdir}/kcm_displayconfig.so
-%{tde_libdir}/kcm_iccconfig.la
-%{tde_libdir}/kcm_iccconfig.so
-%{tde_libdir}/kcm_randr.la
-%{tde_libdir}/kcm_randr.so
-%{tde_appdir}/displayconfig.desktop
-%{tde_appdir}/iccconfig.desktop
-%{tde_appdir}/krandrtray.desktop
-%{_datadir}/applnk/.hidden/randr.desktop
-%{_datadir}/autostart/krandrtray-autostart.desktop
+%{tde_bindir}/krandrtray
+%{tde_tdelibdir}/kcm_displayconfig.la
+%{tde_tdelibdir}/kcm_displayconfig.so
+%{tde_tdelibdir}/kcm_iccconfig.la
+%{tde_tdelibdir}/kcm_iccconfig.so
+%{tde_tdelibdir}/kcm_randr.la
+%{tde_tdelibdir}/kcm_randr.so
+%{tde_tdeappdir}/displayconfig.desktop
+%{tde_tdeappdir}/iccconfig.desktop
+%{tde_tdeappdir}/krandrtray.desktop
+%{tde_datadir}/applnk/.hidden/randr.desktop
+%{tde_datadir}/autostart/krandrtray-autostart.desktop
 %endif
 
 %post -n trinity-kcontrol
@@ -892,8 +935,8 @@ Requires:	trinity-kcontrol = %{version}-%{release}
 %{summary}
 
 %files -n trinity-kcontrol-devel
-%{_libdir}/libkfontinst.la
-%{_libdir}/libkfontinst.so
+%{tde_libdir}/libkfontinst.la
+%{tde_libdir}/libkfontinst.so
 
 %post -n trinity-kcontrol-devel
 /sbin/ldconfig || :
@@ -918,82 +961,82 @@ TDE applications, particularly those in the TDE base module.
 
 %files bin
 %defattr(-,root,root,-)
-%{_bindir}/krootbacking
-#%{_bindir}/tdeinit_phase1
-%attr(4511,root,root) %{_bindir}/[kt]dmtsak
-%{_bindir}/tsak
-%{_bindir}/kdebugdialog
-%{_bindir}/kreadconfig
-%{_bindir}/kwriteconfig
-%{_bindir}/kstart
-%{_datadir}/config/kxkb_groups
-%{_bindir}/drkonqi
-%{_bindir}/kapplymousetheme
-%{_bindir}/kblankscrn.kss
-%attr(4755,root,root) %{_bindir}/kcheckpass
-%{_bindir}/kcminit
-%{_bindir}/kcminit_startup
-%{_bindir}/kdcop
-%{_bindir}/[kt]desu
-%attr(0755,root,root) %{_bindir}/[kt]desud
-%{_bindir}/kdialog
-%{_bindir}/khotkeys
-%{_bindir}/knetattach
-%{_bindir}/krandom.kss
-%{_bindir}/ksystraycmd
-%{_bindir}/kxkb
-%{_libdir}/kconf_update_bin/khotkeys_update
-%{tde_libdir}/kcminit.la
-%{tde_libdir}/kcminit.so
-%{tde_libdir}/kcminit_startup.la
-%{tde_libdir}/kcminit_startup.so
-%{tde_libdir}/kcm_keyboard.la
-%{tde_libdir}/kcm_keyboard.so
-%{tde_libdir}/kcm_khotkeys_init.la
-%{tde_libdir}/kcm_khotkeys_init.so
-%{tde_libdir}/kcm_khotkeys.la
-%{tde_libdir}/kcm_khotkeys.so
-%{tde_libdir}/kded_khotkeys.la
-%{tde_libdir}/kded_khotkeys.so
-%{tde_libdir}/kgreet_classic.la
-%{tde_libdir}/kgreet_classic.so
-%{tde_libdir}/kgreet_winbind.la
-%{tde_libdir}/kgreet_winbind.so
-%{tde_libdir}/khotkeys.la
-%{tde_libdir}/khotkeys.so
-%{tde_libdir}/khotkeys_arts.la
-%{tde_libdir}/khotkeys_arts.so
-%{tde_libdir}/kxkb.la
-%{tde_libdir}/kxkb.so
-%{_libdir}/lib[kt]deinit_kcminit.la
-%{_libdir}/lib[kt]deinit_kcminit.so
-%{_libdir}/lib[kt]deinit_kcminit_startup.la
-%{_libdir}/lib[kt]deinit_kcminit_startup.so
-%{_libdir}/lib[kt]deinit_khotkeys.la
-%{_libdir}/lib[kt]deinit_khotkeys.so
-%{_libdir}/lib[kt]deinit_kxkb.la
-%{_libdir}/lib[kt]deinit_kxkb.so
-%{_libdir}/libkhotkeys_shared.so.*
-%{tde_appdir}/keyboard.desktop
-%{tde_appdir}/keyboard_layout.desktop
-%{tde_appdir}/khotkeys.desktop
-%{tde_appdir}/knetattach.desktop
-%{_datadir}/applnk/System/ScreenSavers/
-%{_datadir}/apps/drkonqi/
-%{_datadir}/apps/kconf_update/khotkeys_32b1_update.upd
-%{_datadir}/apps/kconf_update/khotkeys_printscreen.upd
-%{_datadir}/apps/kconf_update/konqueror_gestures_trinity21_update.upd
-%{_datadir}/apps/kdcop/kdcopui.rc
-%{_datadir}/apps/khotkeys/
-%{_datadir}/services/kded/khotkeys.desktop
-%{_datadir}/services/kxkb.desktop
+%{tde_bindir}/krootbacking
+#%{tde_bindir}/tdeinit_phase1
+%attr(4511,root,root) %{tde_bindir}/[kt]dmtsak
+%{tde_bindir}/tsak
+%{tde_bindir}/kdebugdialog
+%{tde_bindir}/kreadconfig
+%{tde_bindir}/kwriteconfig
+%{tde_bindir}/kstart
+%{tde_datadir}/config/kxkb_groups
+%{tde_bindir}/drkonqi
+%{tde_bindir}/kapplymousetheme
+%{tde_bindir}/kblankscrn.kss
+%attr(4755,root,root) %{tde_bindir}/kcheckpass
+%{tde_bindir}/kcminit
+%{tde_bindir}/kcminit_startup
+%{tde_bindir}/kdcop
+%{tde_bindir}/[kt]desu
+%attr(0755,root,root) %{tde_bindir}/[kt]desud
+%{tde_bindir}/kdialog
+%{tde_bindir}/khotkeys
+%{tde_bindir}/knetattach
+%{tde_bindir}/krandom.kss
+%{tde_bindir}/ksystraycmd
+%{tde_bindir}/kxkb
+%{tde_libdir}/kconf_update_bin/khotkeys_update
+%{tde_tdelibdir}/kcminit.la
+%{tde_tdelibdir}/kcminit.so
+%{tde_tdelibdir}/kcminit_startup.la
+%{tde_tdelibdir}/kcminit_startup.so
+%{tde_tdelibdir}/kcm_keyboard.la
+%{tde_tdelibdir}/kcm_keyboard.so
+%{tde_tdelibdir}/kcm_khotkeys_init.la
+%{tde_tdelibdir}/kcm_khotkeys_init.so
+%{tde_tdelibdir}/kcm_khotkeys.la
+%{tde_tdelibdir}/kcm_khotkeys.so
+%{tde_tdelibdir}/kded_khotkeys.la
+%{tde_tdelibdir}/kded_khotkeys.so
+%{tde_tdelibdir}/kgreet_classic.la
+%{tde_tdelibdir}/kgreet_classic.so
+%{tde_tdelibdir}/kgreet_winbind.la
+%{tde_tdelibdir}/kgreet_winbind.so
+%{tde_tdelibdir}/khotkeys.la
+%{tde_tdelibdir}/khotkeys.so
+%{tde_tdelibdir}/khotkeys_arts.la
+%{tde_tdelibdir}/khotkeys_arts.so
+%{tde_tdelibdir}/kxkb.la
+%{tde_tdelibdir}/kxkb.so
+%{tde_libdir}/lib[kt]deinit_kcminit.la
+%{tde_libdir}/lib[kt]deinit_kcminit.so
+%{tde_libdir}/lib[kt]deinit_kcminit_startup.la
+%{tde_libdir}/lib[kt]deinit_kcminit_startup.so
+%{tde_libdir}/lib[kt]deinit_khotkeys.la
+%{tde_libdir}/lib[kt]deinit_khotkeys.so
+%{tde_libdir}/lib[kt]deinit_kxkb.la
+%{tde_libdir}/lib[kt]deinit_kxkb.so
+%{tde_libdir}/libkhotkeys_shared.so.*
+%{tde_tdeappdir}/keyboard.desktop
+%{tde_tdeappdir}/keyboard_layout.desktop
+%{tde_tdeappdir}/khotkeys.desktop
+%{tde_tdeappdir}/knetattach.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/
+%{tde_datadir}/apps/drkonqi/
+%{tde_datadir}/apps/kconf_update/khotkeys_32b1_update.upd
+%{tde_datadir}/apps/kconf_update/khotkeys_printscreen.upd
+%{tde_datadir}/apps/kconf_update/konqueror_gestures_trinity21_update.upd
+%{tde_datadir}/apps/kdcop/kdcopui.rc
+%{tde_datadir}/apps/khotkeys/
+%{tde_datadir}/services/kded/khotkeys.desktop
+%{tde_datadir}/services/kxkb.desktop
 %{_sysconfdir}/pam.d/kcheckpass-trinity
 %{_sysconfdir}/pam.d/kscreensaver-trinity
-%{tde_docdir}/HTML/en/kdcop/
-%{tde_docdir}/HTML/en/kdebugdialog//
-%{tde_docdir}/HTML/en/[kt]desu/
-%{tde_docdir}/HTML/en/knetattach/
-%{tde_docdir}/HTML/en/kxkb/
+%{tde_tdedocdir}/HTML/en/kdcop/
+%{tde_tdedocdir}/HTML/en/kdebugdialog//
+%{tde_tdedocdir}/HTML/en/[kt]desu/
+%{tde_tdedocdir}/HTML/en/knetattach/
+%{tde_tdedocdir}/HTML/en/kxkb/
 
 %post bin
 /sbin/ldconfig || :
@@ -1017,8 +1060,8 @@ Provides:	tdebase-bin-devel = %{version}-%{release}
 %{summary}
 
 %files bin-devel
-%{_libdir}/libkhotkeys_shared.la
-%{_libdir}/libkhotkeys_shared.so
+%{tde_libdir}/libkhotkeys_shared.la
+%{tde_libdir}/libkhotkeys_shared.so
 
 %post bin-devel
 /sbin/ldconfig || :
@@ -1042,259 +1085,259 @@ needed for a basic TDE desktop installation.
 
 %files data
 %defattr(-,root,root,-)
-%{_datadir}/config/kshorturifilterrc
-%{_datadir}/applnk/.hidden/battery.desktop
-%{_datadir}/applnk/.hidden/bwarning.desktop
-%{_datadir}/applnk/.hidden/cwarning.desktop
-%{_datadir}/applnk/.hidden/.directory
-%{_datadir}/applnk/.hidden/email.desktop
-%{_datadir}/applnk/.hidden/kcmkonq.desktop
-%{_datadir}/applnk/.hidden/kcmkxmlrpcd.desktop
-%{_datadir}/applnk/.hidden/konqhtml.desktop
-%{_datadir}/applnk/.hidden/passwords.desktop
-%{_datadir}/applnk/.hidden/power.desktop
-%{_datadir}/applnk/.hidden/socks.desktop
-%{_datadir}/applnk/.hidden/userinfo.desktop
-%{_datadir}/applnk/.hidden/virtualdesktops.desktop
-%{_datadir}/apps/kaccess/eventsrc
-%{_datadir}/apps/kcmcss/template.css
-%{_datadir}/apps/kcminput/
-%{_datadir}/apps/kcmkeys/
-%{_datadir}/apps/kcmlocale/pics/background.png
-%{_datadir}/apps/kconf_update/convertShortcuts.pl
-%{_datadir}/apps/kconf_update/kaccel.upd
-%{_datadir}/apps/kconf_update/kcmdisplayrc.upd
-%{_datadir}/apps/kconf_update/kuriikwsfilter.upd
-%{_datadir}/apps/kconf_update/mouse_cursor_theme.upd
-%{_datadir}/apps/kconf_update/socks.upd
-%{_datadir}/apps/kcontrol/
-%{_datadir}/apps/kdisplay/
-%{_datadir}/apps/kfontview/
-%{_datadir}/apps/kinfocenter/kinfocenterui.rc
-%{_datadir}/apps/kthememanager/themes/*
-%{_datadir}/icons/crystalsvg/*/apps/access.png
-%{_datadir}/icons/crystalsvg/*/apps/acroread.png
-%{_datadir}/icons/crystalsvg/*/apps/applixware.png
-%{_datadir}/icons/crystalsvg/*/apps/arts.png
-%{_datadir}/icons/crystalsvg/*/apps/background.png
-%{_datadir}/icons/crystalsvg/*/apps/bell.png
-%{_datadir}/icons/crystalsvg/*/apps/cache.png
-%{_datadir}/icons/crystalsvg/*/apps/clanbomber.png
-%{_datadir}/icons/crystalsvg/*/apps/clock.png
-%{_datadir}/icons/crystalsvg/*/apps/colors.png
-%{_datadir}/icons/crystalsvg/*/apps/date.png
-%{_datadir}/icons/crystalsvg/*/apps/email.png
-%{_datadir}/icons/crystalsvg/*/apps/energy.png
-%{_datadir}/icons/crystalsvg/*/apps/energy_star.png
-%{_datadir}/icons/crystalsvg/*/apps/filetypes.png
-%{_datadir}/icons/crystalsvg/*/apps/fonts.png
-%{_datadir}/icons/crystalsvg/*/apps/gimp.png
-%{_datadir}/icons/crystalsvg/*/apps/help_index.png
-%{_datadir}/icons/crystalsvg/*/apps/hwinfo.png
-%{_datadir}/icons/crystalsvg/*/apps/kcmdevices.png
-%{_datadir}/icons/crystalsvg/*/apps/kcmdf.png
-%{_datadir}/icons/crystalsvg/*/apps/kcmkwm.png
-%{_datadir}/icons/crystalsvg/*/apps/kcmmemory.png
-%{_datadir}/icons/crystalsvg/*/apps/kcmpartitions.png
-%{_datadir}/icons/crystalsvg/*/apps/kcmpci.png
-%{_datadir}/icons/crystalsvg/*/apps/kcontrol.png
-%{_datadir}/icons/crystalsvg/*/apps/[kt]dmconfig.png
-%{_datadir}/icons/crystalsvg/*/apps/key_bindings.png
-%{_datadir}/icons/crystalsvg/*/apps/kfm_home.png
-%{_datadir}/icons/crystalsvg/*/apps/kscreensaver.png
-%{_datadir}/icons/crystalsvg/*/apps/kthememgr.png
-%{_datadir}/icons/crystalsvg/*/apps/licq.png
-%{_datadir}/icons/crystalsvg/*/apps/linuxconf.png
-%{_datadir}/icons/crystalsvg/*/apps/locale.png
-%{_datadir}/icons/crystalsvg/*/apps/looknfeel.png
-%{_datadir}/icons/crystalsvg/*/apps/multimedia.png
-%{_datadir}/icons/crystalsvg/*/apps/netscape.png
-%{_datadir}/icons/crystalsvg/*/apps/package_applications.png
-%{_datadir}/icons/crystalsvg/*/apps/package_development.png
-%{_datadir}/icons/crystalsvg/*/apps/package_favourite.png
-%{_datadir}/icons/crystalsvg/*/apps/package_games.png
-%{_datadir}/icons/crystalsvg/*/apps/package_multimedia.png
-%{_datadir}/icons/crystalsvg/*/apps/package_network.png
-%{_datadir}/icons/crystalsvg/*/apps/package.png
-%{_datadir}/icons/crystalsvg/*/apps/package_settings.png
-%{_datadir}/icons/crystalsvg/*/apps/package_toys.png
-%{_datadir}/icons/crystalsvg/*/apps/package_utilities.png
-%{_datadir}/icons/crystalsvg/*/apps/penguin.png
-%{_datadir}/icons/crystalsvg/*/apps/personal.png
-%{_datadir}/icons/crystalsvg/*/apps/phppg.png
-%{_datadir}/icons/crystalsvg/*/apps/proxy.png
-%{_datadir}/icons/crystalsvg/*/apps/pysol.png
-%{_datadir}/icons/crystalsvg/*/apps/randr.png
-%{_datadir}/icons/crystalsvg/*/apps/samba.png
-%{_datadir}/icons/crystalsvg/*/apps/staroffice.png
-%{_datadir}/icons/crystalsvg/*/apps/stylesheet.png
-%{_datadir}/icons/crystalsvg/*/apps/terminal.png
-%{_datadir}/icons/crystalsvg/*/apps/tux.png
-%{_datadir}/icons/crystalsvg/*/apps/wp.png
-%{_datadir}/icons/crystalsvg/*/apps/xclock.png
-%{_datadir}/icons/crystalsvg/*/apps/xfmail.png
-%{_datadir}/icons/crystalsvg/*/apps/xmag.png
-%{_datadir}/icons/crystalsvg/*/apps/xpaint.png
-%{_datadir}/icons/crystalsvg/scalable/apps/access.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/acroread.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/aim.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/aktion.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/antivirus.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/applixware.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/arts.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/background.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/bell.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/browser.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/cache.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/camera.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/clanbomber.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/clock.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/colors.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/core.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/date.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/display.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/download_manager.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/email.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/energy.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/error.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/fifteenpieces.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/filetypes.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/fonts.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/galeon.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/gnome_apps.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/hardware.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/hwinfo.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/ieee1394.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/kcmdevices.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/kcmkwm.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/kcmx.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/locale.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/my_mac.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/netscape.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/openoffice.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/package_development.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/package_toys.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/penguin.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/personal.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/quicktime.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/realplayer.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/samba.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/shell.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/staroffice.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/stylesheet.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/terminal.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/tux.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/wine.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/x.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/xapp.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/xcalc.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/xchat.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/xclock.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/xeyes.svgz
-%{_datadir}/icons/crystalsvg/scalable/apps/xpaint.svgz
-%{_datadir}/icons/crystalsvg/*/devices/laptop.png
-%{_datadir}/icons/crystalsvg/*/devices/laptop.svgz
-%{_datadir}/icons/crystalsvg/*/actions/newfont.png
-%{_datadir}/icons/crystalsvg/*/apps/abiword.png
-%{_datadir}/icons/crystalsvg/*/apps/agent.png
-%{_datadir}/icons/crystalsvg/*/apps/alevt.png
-%{_datadir}/icons/crystalsvg/*/apps/assistant.png
-%{_datadir}/icons/crystalsvg/*/apps/blender.png
-%{_datadir}/icons/crystalsvg/*/apps/bluefish.png
-%{_datadir}/icons/crystalsvg/*/apps/cookie.png
-%{_datadir}/icons/crystalsvg/*/apps/designer.png
-%{_datadir}/icons/crystalsvg/*/apps/dia.png
-%{_datadir}/icons/crystalsvg/*/apps/dlgedit.png
-%{_datadir}/icons/crystalsvg/*/apps/eclipse.png
-%{_datadir}/icons/crystalsvg/*/apps/edu_languages.png
-%{_datadir}/icons/crystalsvg/*/apps/edu_mathematics.png
-%{_datadir}/icons/crystalsvg/*/apps/edu_miscellaneous.png
-%{_datadir}/icons/crystalsvg/*/apps/edu_science.png
-%{_datadir}/icons/crystalsvg/*/apps/emacs.png
-%{_datadir}/icons/crystalsvg/*/apps/enhanced_browsing.png
-%{_datadir}/icons/crystalsvg/*/apps/evolution.png
-%{_datadir}/icons/crystalsvg/*/apps/fifteenpieces.png
-%{_datadir}/icons/crystalsvg/*/apps/gabber.png
-%{_datadir}/icons/crystalsvg/*/apps/gaim.png
-%{_datadir}/icons/crystalsvg/*/apps/gnome_apps.png
-%{_datadir}/icons/crystalsvg/*/apps/gnomemeeting.png
-%{_datadir}/icons/crystalsvg/*/apps/gnucash.png
-%{_datadir}/icons/crystalsvg/*/apps/gnumeric.png
-%{_datadir}/icons/crystalsvg/*/apps/gv.png
-%{_datadir}/icons/crystalsvg/*/apps/gvim.png
-%{_datadir}/icons/crystalsvg/*/apps/icons.png
-%{_datadir}/icons/crystalsvg/*/apps/iconthemes.png
-%{_datadir}/icons/crystalsvg/*/apps/ieee1394.png
-%{_datadir}/icons/crystalsvg/*/apps/input_devices_settings.png
-%{_datadir}/icons/crystalsvg/*/apps/kcmkicker.png
-%{_datadir}/icons/crystalsvg/*/apps/kcmmidi.png
-%{_datadir}/icons/crystalsvg/*/apps/kcmprocessor.png
-%{_datadir}/icons/crystalsvg/*/apps/kcmscsi.png
-%{_datadir}/icons/crystalsvg/*/apps/kcmsound.png
-%{_datadir}/icons/crystalsvg/*/apps/kcmsystem.png
-%{_datadir}/icons/crystalsvg/*/apps/kcmx.png
-%{_datadir}/icons/crystalsvg/*/apps/keyboard.png
-%{_datadir}/icons/crystalsvg/*/apps/keyboard_layout.png
-%{_datadir}/icons/crystalsvg/*/apps/knotify.png
-%{_datadir}/icons/crystalsvg/*/apps/kvirc.png
-%{_datadir}/icons/crystalsvg/*/apps/linguist.png
-%{_datadir}/icons/crystalsvg/*/apps/lyx.png
-%{_datadir}/icons/crystalsvg/*/apps/mac.png
-%{_datadir}/icons/crystalsvg/*/apps/mathematica.png
-%{_datadir}/icons/crystalsvg/*/apps/nedit.png
-%{_datadir}/icons/crystalsvg/*/apps/opera.png
-%{_datadir}/icons/crystalsvg/*/apps/package_application.png
-%{_datadir}/icons/crystalsvg/*/apps/package_editors.png
-%{_datadir}/icons/crystalsvg/*/apps/package_edutainment.png
-%{_datadir}/icons/crystalsvg/*/apps/package_games_arcade.png
-%{_datadir}/icons/crystalsvg/*/apps/package_games_board.png
-%{_datadir}/icons/crystalsvg/*/apps/package_games_card.png
-%{_datadir}/icons/crystalsvg/*/apps/package_games_strategy.png
-%{_datadir}/icons/crystalsvg/*/apps/package_graphics.png
-%{_datadir}/icons/crystalsvg/*/apps/package_system.png
-%{_datadir}/icons/crystalsvg/*/apps/package_wordprocessing.png
-%{_datadir}/icons/crystalsvg/*/apps/pan.png
-%{_datadir}/icons/crystalsvg/*/apps/panel_settings.png
-%{_datadir}/icons/crystalsvg/*/apps/plan.png
-%{_datadir}/icons/crystalsvg/*/apps/planner.png
-%{_datadir}/icons/crystalsvg/*/apps/pybliographic.png
-%{_datadir}/icons/crystalsvg/*/apps/realplayer.png
-%{_datadir}/icons/crystalsvg/*/apps/remote.png
-%{_datadir}/icons/crystalsvg/*/apps/scribus.png
-%{_datadir}/icons/crystalsvg/*/apps/sodipodi.png
-%{_datadir}/icons/crystalsvg/*/apps/style.png
-%{_datadir}/icons/crystalsvg/*/apps/usb.png
-%{_datadir}/icons/crystalsvg/*/apps/vnc.png
-%{_datadir}/icons/crystalsvg/*/apps/wabi.png
-%{_datadir}/icons/crystalsvg/*/apps/wine.png
-%{_datadir}/icons/crystalsvg/*/apps/xcalc.png
-%{_datadir}/icons/crystalsvg/*/apps/xchat.png
-%{_datadir}/icons/crystalsvg/*/apps/xclipboard.png
-%{_datadir}/icons/crystalsvg/*/apps/xconsole.png
-%{_datadir}/icons/crystalsvg/*/apps/xedit.png
-%{_datadir}/icons/crystalsvg/*/apps/xemacs.png
-%{_datadir}/icons/crystalsvg/*/apps/xeyes.png
-%{_datadir}/icons/crystalsvg/*/apps/xfig.png
-%{_datadir}/icons/crystalsvg/*/apps/xload.png
-%{_datadir}/icons/crystalsvg/*/apps/xmms.png
-%{_datadir}/icons/crystalsvg/*/apps/xosview.png
-%{_datadir}/icons/crystalsvg/*/apps/xv.png
-%{_datadir}/icons/crystalsvg/*/apps/galeon.png
-%{_datadir}/icons/crystalsvg/*/apps/kcmdrkonqi.png
-%{_datadir}/icons/crystalsvg/*/apps/pinguin.png
-%{_datadir}/icons/crystalsvg/*/apps/x.png
-%{_datadir}/icons/crystalsvg/*/apps/xapp.png
-%{_datadir}/icons/crystalsvg/*/apps/xawtv.png
-%{_datadir}/icons/crystalsvg/*/apps/kcmopengl.png
-%{_datadir}/icons/crystalsvg/*/apps/wmaker_apps.png
-%{_datadir}/icons/crystalsvg/*/apps/qtella.png
-%{_datadir}/services/searchproviders
-%{_datadir}/services/useragentstrings/*.desktop
-%{_datadir}/servicetypes/searchprovider.desktop
-%{_datadir}/servicetypes/uasprovider.desktop
-%exclude %{_datadir}/sounds/pop.wav
-%{_datadir}/sounds/
-%{_datadir}/wallpapers/*
+%{tde_datadir}/config/kshorturifilterrc
+%{tde_datadir}/applnk/.hidden/battery.desktop
+%{tde_datadir}/applnk/.hidden/bwarning.desktop
+%{tde_datadir}/applnk/.hidden/cwarning.desktop
+%{tde_datadir}/applnk/.hidden/.directory
+%{tde_datadir}/applnk/.hidden/email.desktop
+%{tde_datadir}/applnk/.hidden/kcmkonq.desktop
+%{tde_datadir}/applnk/.hidden/kcmkxmlrpcd.desktop
+%{tde_datadir}/applnk/.hidden/konqhtml.desktop
+%{tde_datadir}/applnk/.hidden/passwords.desktop
+%{tde_datadir}/applnk/.hidden/power.desktop
+%{tde_datadir}/applnk/.hidden/socks.desktop
+%{tde_datadir}/applnk/.hidden/userinfo.desktop
+%{tde_datadir}/applnk/.hidden/virtualdesktops.desktop
+%{tde_datadir}/apps/kaccess/eventsrc
+%{tde_datadir}/apps/kcmcss/template.css
+%{tde_datadir}/apps/kcminput/
+%{tde_datadir}/apps/kcmkeys/
+%{tde_datadir}/apps/kcmlocale/pics/background.png
+%{tde_datadir}/apps/kconf_update/convertShortcuts.pl
+%{tde_datadir}/apps/kconf_update/kaccel.upd
+%{tde_datadir}/apps/kconf_update/kcmdisplayrc.upd
+%{tde_datadir}/apps/kconf_update/kuriikwsfilter.upd
+%{tde_datadir}/apps/kconf_update/mouse_cursor_theme.upd
+%{tde_datadir}/apps/kconf_update/socks.upd
+%{tde_datadir}/apps/kcontrol/
+%{tde_datadir}/apps/kdisplay/
+%{tde_datadir}/apps/kfontview/
+%{tde_datadir}/apps/kinfocenter/kinfocenterui.rc
+%{tde_datadir}/apps/kthememanager/themes/*
+%{tde_datadir}/icons/crystalsvg/*/apps/access.png
+%{tde_datadir}/icons/crystalsvg/*/apps/acroread.png
+%{tde_datadir}/icons/crystalsvg/*/apps/applixware.png
+%{tde_datadir}/icons/crystalsvg/*/apps/arts.png
+%{tde_datadir}/icons/crystalsvg/*/apps/background.png
+%{tde_datadir}/icons/crystalsvg/*/apps/bell.png
+%{tde_datadir}/icons/crystalsvg/*/apps/cache.png
+%{tde_datadir}/icons/crystalsvg/*/apps/clanbomber.png
+%{tde_datadir}/icons/crystalsvg/*/apps/clock.png
+%{tde_datadir}/icons/crystalsvg/*/apps/colors.png
+%{tde_datadir}/icons/crystalsvg/*/apps/date.png
+%{tde_datadir}/icons/crystalsvg/*/apps/email.png
+%{tde_datadir}/icons/crystalsvg/*/apps/energy.png
+%{tde_datadir}/icons/crystalsvg/*/apps/energy_star.png
+%{tde_datadir}/icons/crystalsvg/*/apps/filetypes.png
+%{tde_datadir}/icons/crystalsvg/*/apps/fonts.png
+%{tde_datadir}/icons/crystalsvg/*/apps/gimp.png
+%{tde_datadir}/icons/crystalsvg/*/apps/help_index.png
+%{tde_datadir}/icons/crystalsvg/*/apps/hwinfo.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kcmdevices.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kcmdf.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kcmkwm.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kcmmemory.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kcmpartitions.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kcmpci.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kcontrol.png
+%{tde_datadir}/icons/crystalsvg/*/apps/[kt]dmconfig.png
+%{tde_datadir}/icons/crystalsvg/*/apps/key_bindings.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kfm_home.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kscreensaver.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kthememgr.png
+%{tde_datadir}/icons/crystalsvg/*/apps/licq.png
+%{tde_datadir}/icons/crystalsvg/*/apps/linuxconf.png
+%{tde_datadir}/icons/crystalsvg/*/apps/locale.png
+%{tde_datadir}/icons/crystalsvg/*/apps/looknfeel.png
+%{tde_datadir}/icons/crystalsvg/*/apps/multimedia.png
+%{tde_datadir}/icons/crystalsvg/*/apps/netscape.png
+%{tde_datadir}/icons/crystalsvg/*/apps/package_applications.png
+%{tde_datadir}/icons/crystalsvg/*/apps/package_development.png
+%{tde_datadir}/icons/crystalsvg/*/apps/package_favourite.png
+%{tde_datadir}/icons/crystalsvg/*/apps/package_games.png
+%{tde_datadir}/icons/crystalsvg/*/apps/package_multimedia.png
+%{tde_datadir}/icons/crystalsvg/*/apps/package_network.png
+%{tde_datadir}/icons/crystalsvg/*/apps/package.png
+%{tde_datadir}/icons/crystalsvg/*/apps/package_settings.png
+%{tde_datadir}/icons/crystalsvg/*/apps/package_toys.png
+%{tde_datadir}/icons/crystalsvg/*/apps/package_utilities.png
+%{tde_datadir}/icons/crystalsvg/*/apps/penguin.png
+%{tde_datadir}/icons/crystalsvg/*/apps/personal.png
+%{tde_datadir}/icons/crystalsvg/*/apps/phppg.png
+%{tde_datadir}/icons/crystalsvg/*/apps/proxy.png
+%{tde_datadir}/icons/crystalsvg/*/apps/pysol.png
+%{tde_datadir}/icons/crystalsvg/*/apps/randr.png
+%{tde_datadir}/icons/crystalsvg/*/apps/samba.png
+%{tde_datadir}/icons/crystalsvg/*/apps/staroffice.png
+%{tde_datadir}/icons/crystalsvg/*/apps/stylesheet.png
+%{tde_datadir}/icons/crystalsvg/*/apps/terminal.png
+%{tde_datadir}/icons/crystalsvg/*/apps/tux.png
+%{tde_datadir}/icons/crystalsvg/*/apps/wp.png
+%{tde_datadir}/icons/crystalsvg/*/apps/xclock.png
+%{tde_datadir}/icons/crystalsvg/*/apps/xfmail.png
+%{tde_datadir}/icons/crystalsvg/*/apps/xmag.png
+%{tde_datadir}/icons/crystalsvg/*/apps/xpaint.png
+%{tde_datadir}/icons/crystalsvg/scalable/apps/access.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/acroread.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/aim.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/aktion.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/antivirus.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/applixware.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/arts.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/background.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/bell.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/browser.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/cache.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/camera.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/clanbomber.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/clock.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/colors.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/core.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/date.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/display.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/download_manager.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/email.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/energy.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/error.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/fifteenpieces.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/filetypes.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/fonts.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/galeon.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/gnome_apps.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/hardware.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/hwinfo.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/ieee1394.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/kcmdevices.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/kcmkwm.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/kcmx.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/locale.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/my_mac.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/netscape.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/openoffice.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/package_development.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/package_toys.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/penguin.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/personal.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/quicktime.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/realplayer.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/samba.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/shell.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/staroffice.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/stylesheet.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/terminal.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/tux.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/wine.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/x.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/xapp.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/xcalc.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/xchat.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/xclock.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/xeyes.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/xpaint.svgz
+%{tde_datadir}/icons/crystalsvg/*/devices/laptop.png
+%{tde_datadir}/icons/crystalsvg/*/devices/laptop.svgz
+%{tde_datadir}/icons/crystalsvg/*/actions/newfont.png
+%{tde_datadir}/icons/crystalsvg/*/apps/abiword.png
+%{tde_datadir}/icons/crystalsvg/*/apps/agent.png
+%{tde_datadir}/icons/crystalsvg/*/apps/alevt.png
+%{tde_datadir}/icons/crystalsvg/*/apps/assistant.png
+%{tde_datadir}/icons/crystalsvg/*/apps/blender.png
+%{tde_datadir}/icons/crystalsvg/*/apps/bluefish.png
+%{tde_datadir}/icons/crystalsvg/*/apps/cookie.png
+%{tde_datadir}/icons/crystalsvg/*/apps/designer.png
+%{tde_datadir}/icons/crystalsvg/*/apps/dia.png
+%{tde_datadir}/icons/crystalsvg/*/apps/dlgedit.png
+%{tde_datadir}/icons/crystalsvg/*/apps/eclipse.png
+%{tde_datadir}/icons/crystalsvg/*/apps/edu_languages.png
+%{tde_datadir}/icons/crystalsvg/*/apps/edu_mathematics.png
+%{tde_datadir}/icons/crystalsvg/*/apps/edu_miscellaneous.png
+%{tde_datadir}/icons/crystalsvg/*/apps/edu_science.png
+%{tde_datadir}/icons/crystalsvg/*/apps/emacs.png
+%{tde_datadir}/icons/crystalsvg/*/apps/enhanced_browsing.png
+%{tde_datadir}/icons/crystalsvg/*/apps/evolution.png
+%{tde_datadir}/icons/crystalsvg/*/apps/fifteenpieces.png
+%{tde_datadir}/icons/crystalsvg/*/apps/gabber.png
+%{tde_datadir}/icons/crystalsvg/*/apps/gaim.png
+%{tde_datadir}/icons/crystalsvg/*/apps/gnome_apps.png
+%{tde_datadir}/icons/crystalsvg/*/apps/gnomemeeting.png
+%{tde_datadir}/icons/crystalsvg/*/apps/gnucash.png
+%{tde_datadir}/icons/crystalsvg/*/apps/gnumeric.png
+%{tde_datadir}/icons/crystalsvg/*/apps/gv.png
+%{tde_datadir}/icons/crystalsvg/*/apps/gvim.png
+%{tde_datadir}/icons/crystalsvg/*/apps/icons.png
+%{tde_datadir}/icons/crystalsvg/*/apps/iconthemes.png
+%{tde_datadir}/icons/crystalsvg/*/apps/ieee1394.png
+%{tde_datadir}/icons/crystalsvg/*/apps/input_devices_settings.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kcmkicker.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kcmmidi.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kcmprocessor.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kcmscsi.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kcmsound.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kcmsystem.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kcmx.png
+%{tde_datadir}/icons/crystalsvg/*/apps/keyboard.png
+%{tde_datadir}/icons/crystalsvg/*/apps/keyboard_layout.png
+%{tde_datadir}/icons/crystalsvg/*/apps/knotify.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kvirc.png
+%{tde_datadir}/icons/crystalsvg/*/apps/linguist.png
+%{tde_datadir}/icons/crystalsvg/*/apps/lyx.png
+%{tde_datadir}/icons/crystalsvg/*/apps/mac.png
+%{tde_datadir}/icons/crystalsvg/*/apps/mathematica.png
+%{tde_datadir}/icons/crystalsvg/*/apps/nedit.png
+%{tde_datadir}/icons/crystalsvg/*/apps/opera.png
+%{tde_datadir}/icons/crystalsvg/*/apps/package_application.png
+%{tde_datadir}/icons/crystalsvg/*/apps/package_editors.png
+%{tde_datadir}/icons/crystalsvg/*/apps/package_edutainment.png
+%{tde_datadir}/icons/crystalsvg/*/apps/package_games_arcade.png
+%{tde_datadir}/icons/crystalsvg/*/apps/package_games_board.png
+%{tde_datadir}/icons/crystalsvg/*/apps/package_games_card.png
+%{tde_datadir}/icons/crystalsvg/*/apps/package_games_strategy.png
+%{tde_datadir}/icons/crystalsvg/*/apps/package_graphics.png
+%{tde_datadir}/icons/crystalsvg/*/apps/package_system.png
+%{tde_datadir}/icons/crystalsvg/*/apps/package_wordprocessing.png
+%{tde_datadir}/icons/crystalsvg/*/apps/pan.png
+%{tde_datadir}/icons/crystalsvg/*/apps/panel_settings.png
+%{tde_datadir}/icons/crystalsvg/*/apps/plan.png
+%{tde_datadir}/icons/crystalsvg/*/apps/planner.png
+%{tde_datadir}/icons/crystalsvg/*/apps/pybliographic.png
+%{tde_datadir}/icons/crystalsvg/*/apps/realplayer.png
+%{tde_datadir}/icons/crystalsvg/*/apps/remote.png
+%{tde_datadir}/icons/crystalsvg/*/apps/scribus.png
+%{tde_datadir}/icons/crystalsvg/*/apps/sodipodi.png
+%{tde_datadir}/icons/crystalsvg/*/apps/style.png
+%{tde_datadir}/icons/crystalsvg/*/apps/usb.png
+%{tde_datadir}/icons/crystalsvg/*/apps/vnc.png
+%{tde_datadir}/icons/crystalsvg/*/apps/wabi.png
+%{tde_datadir}/icons/crystalsvg/*/apps/wine.png
+%{tde_datadir}/icons/crystalsvg/*/apps/xcalc.png
+%{tde_datadir}/icons/crystalsvg/*/apps/xchat.png
+%{tde_datadir}/icons/crystalsvg/*/apps/xclipboard.png
+%{tde_datadir}/icons/crystalsvg/*/apps/xconsole.png
+%{tde_datadir}/icons/crystalsvg/*/apps/xedit.png
+%{tde_datadir}/icons/crystalsvg/*/apps/xemacs.png
+%{tde_datadir}/icons/crystalsvg/*/apps/xeyes.png
+%{tde_datadir}/icons/crystalsvg/*/apps/xfig.png
+%{tde_datadir}/icons/crystalsvg/*/apps/xload.png
+%{tde_datadir}/icons/crystalsvg/*/apps/xmms.png
+%{tde_datadir}/icons/crystalsvg/*/apps/xosview.png
+%{tde_datadir}/icons/crystalsvg/*/apps/xv.png
+%{tde_datadir}/icons/crystalsvg/*/apps/galeon.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kcmdrkonqi.png
+%{tde_datadir}/icons/crystalsvg/*/apps/pinguin.png
+%{tde_datadir}/icons/crystalsvg/*/apps/x.png
+%{tde_datadir}/icons/crystalsvg/*/apps/xapp.png
+%{tde_datadir}/icons/crystalsvg/*/apps/xawtv.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kcmopengl.png
+%{tde_datadir}/icons/crystalsvg/*/apps/wmaker_apps.png
+%{tde_datadir}/icons/crystalsvg/*/apps/qtella.png
+%{tde_datadir}/services/searchproviders
+%{tde_datadir}/services/useragentstrings/*.desktop
+%{tde_datadir}/servicetypes/searchprovider.desktop
+%{tde_datadir}/servicetypes/uasprovider.desktop
+%exclude %{tde_datadir}/sounds/pop.wav
+%{tde_datadir}/sounds/
+%{tde_datadir}/wallpapers/*
 
 %if "%{_prefix}" != "/usr"
 %{_prefix}/etc/xdg/menus/applications-merged/kde-essential.menu
@@ -1308,20 +1351,20 @@ needed for a basic TDE desktop installation.
 %{_sysconfdir}/xdg/menus/kde-settings.menu
 %endif
 
-%exclude %{tde_docdir}/HTML/en/kcontrol/kcmkonsole/
-%{tde_docdir}/HTML/en/kcontrol/
-%{tde_docdir}/HTML/en/kinfocenter/
+%exclude %{tde_tdedocdir}/HTML/en/kcontrol/kcmkonsole/
+%{tde_tdedocdir}/HTML/en/kcontrol/
+%{tde_tdedocdir}/HTML/en/kinfocenter/
 
 %post data
 for f in crystalsvg ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 
 %postun data
 for f in crystalsvg ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 
 ##########
@@ -1349,141 +1392,141 @@ group.
 
 %files kio-plugins
 %defattr(-,root,root,-)
-%{_bindir}/kio_media_mounthelper
-%{_bindir}/ktrash
-%{tde_libdir}/cursorthumbnail.la
-%{tde_libdir}/cursorthumbnail.so
-%{tde_libdir}/djvuthumbnail.la
-%{tde_libdir}/djvuthumbnail.so
-%{tde_libdir}/exrthumbnail.la
-%{tde_libdir}/exrthumbnail.so
-%{tde_libdir}/htmlthumbnail.la
-%{tde_libdir}/htmlthumbnail.so
-%{tde_libdir}/imagethumbnail.la
-%{tde_libdir}/imagethumbnail.so
-%{tde_libdir}/kcm_cgi.la
-%{tde_libdir}/kcm_cgi.so
-%{tde_libdir}/kcm_media.la
-%{tde_libdir}/kcm_media.so
-%{tde_libdir}/kded_homedirnotify.la
-%{tde_libdir}/kded_homedirnotify.so
-%{tde_libdir}/kded_mediamanager.la
-%{tde_libdir}/kded_mediamanager.so
-%{tde_libdir}/kded_medianotifier.la
-%{tde_libdir}/kded_medianotifier.so
-%{tde_libdir}/kded_remotedirnotify.la
-%{tde_libdir}/kded_remotedirnotify.so
-%{tde_libdir}/kded_systemdirnotify.la
-%{tde_libdir}/kded_systemdirnotify.so
-%{tde_libdir}/kfile_media.la
-%{tde_libdir}/kfile_media.so
-%{tde_libdir}/kfile_trash.la
-%{tde_libdir}/kfile_trash.so
-%{tde_libdir}/kio_about.la
-%{tde_libdir}/kio_about.so
-%{tde_libdir}/kio_cgi.la
-%{tde_libdir}/kio_cgi.so
-%{tde_libdir}/kio_filter.la
-%{tde_libdir}/kio_filter.so
-%{tde_libdir}/kio_finger.la
-%{tde_libdir}/kio_finger.so
-%{tde_libdir}/kio_fish.la
-%{tde_libdir}/kio_fish.so
-%{tde_libdir}/kio_floppy.la
-%{tde_libdir}/kio_floppy.so
-%{tde_libdir}/kio_home.la
-%{tde_libdir}/kio_home.so
-%{tde_libdir}/kio_info.la
-%{tde_libdir}/kio_info.so
-%{tde_libdir}/kio_mac.la
-%{tde_libdir}/kio_mac.so
-%{tde_libdir}/kio_man.la
-%{tde_libdir}/kio_man.so
-%{tde_libdir}/kio_media.la
-%{tde_libdir}/kio_media.so
-%{tde_libdir}/kio_nfs.la
-%{tde_libdir}/kio_nfs.so
-%{tde_libdir}/kio_remote.la
-%{tde_libdir}/kio_remote.so
-%{tde_libdir}/kio_settings.la
-%{tde_libdir}/kio_settings.so
-%{tde_libdir}/kio_sftp.la
-%{tde_libdir}/kio_sftp.so
-%{tde_libdir}/kio_smb.la
-%{tde_libdir}/kio_smb.so
-%{tde_libdir}/kio_system.la
-%{tde_libdir}/kio_system.so
-%{tde_libdir}/kio_tar.la
-%{tde_libdir}/kio_tar.so
-%{tde_libdir}/kio_thumbnail.la
-%{tde_libdir}/kio_thumbnail.so
-%{tde_libdir}/kio_trash.la
-%{tde_libdir}/kio_trash.so
-%{tde_libdir}/libkmanpart.la
-%{tde_libdir}/libkmanpart.so
-%{tde_libdir}/media_propsdlgplugin.la
-%{tde_libdir}/media_propsdlgplugin.so
-%{tde_libdir}/textthumbnail.la
-%{tde_libdir}/textthumbnail.so
-%{tde_appdir}/kcmcgi.desktop
-%{_datadir}/apps/kio_finger/kio_finger.css
-%{_datadir}/apps/kio_finger/kio_finger.pl
-%{_datadir}/apps/kio_info/kde-info2html
-%{_datadir}/apps/kio_info/kde-info2html.conf
-%{_datadir}/apps/kio_man/kio_man.css
-%{_datadir}/apps/konqueror/dirtree/remote/smb-network.desktop
-%{_datadir}/apps/remoteview/smb-network.desktop
-%{_datadir}/apps/systemview/*.desktop
-%{_datadir}/config.kcfg/mediamanagersettings.kcfg
-%{_datadir}/mimelnk/application/x-smb-server.desktop
-%{_datadir}/mimelnk/application/x-smb-workgroup.desktop
-%{_datadir}/mimelnk/inode/system_directory.desktop
-%{_datadir}/mimelnk/media/*.desktop
-%{_datadir}/services/about.protocol
-%{_datadir}/services/applications.protocol
-%{_datadir}/services/ar.protocol
-%{_datadir}/services/bzip.protocol
-%{_datadir}/services/bzip2.protocol
-%{_datadir}/services/cgi.protocol
-%{_datadir}/services/cursorthumbnail.desktop
-%{_datadir}/services/djvuthumbnail.desktop
-%{_datadir}/services/exrthumbnail.desktop
-%{_datadir}/services/finger.protocol
-%{_datadir}/services/fish.protocol
-%{_datadir}/services/floppy.protocol
-%{_datadir}/services/gzip.protocol
-%{_datadir}/services/home.protocol
-%{_datadir}/services/htmlthumbnail.desktop
-%{_datadir}/services/imagethumbnail.desktop
-%{_datadir}/services/info.protocol
-%{_datadir}/services/kded/homedirnotify.desktop
-%{_datadir}/services/kded/mediamanager.desktop
-%{_datadir}/services/kded/medianotifier.desktop
-%{_datadir}/services/kded/remotedirnotify.desktop
-%{_datadir}/services/kded/systemdirnotify.desktop
-%{_datadir}/services/kfile_media.desktop
-%{_datadir}/services/kfile_trash_system.desktop
-%{_datadir}/services/kmanpart.desktop
-%{_datadir}/services/mac.protocol
-%{_datadir}/services/man.protocol
-%{_datadir}/services/media.protocol
-%{_datadir}/services/media_propsdlgplugin.desktop
-%{_datadir}/services/nfs.protocol
-%{_datadir}/services/nxfish.protocol
-%{_datadir}/services/programs.protocol
-%{_datadir}/services/remote.protocol
-%{_datadir}/services/settings.protocol
-%{_datadir}/services/sftp.protocol
-%{_datadir}/services/smb.protocol
-%{_datadir}/services/system.protocol
-%{_datadir}/services/tar.protocol
-%{_datadir}/services/textthumbnail.desktop
-%{_datadir}/services/thumbnail.protocol
-%{_datadir}/services/trash.protocol
-%{_datadir}/services/zip.protocol
-%{_datadir}/servicetypes/thumbcreator.desktop
-%{_datadir}/services/kfile_trash.desktop
-%{tde_docdir}/HTML/en/kioslave/
+%{tde_bindir}/kio_media_mounthelper
+%{tde_bindir}/ktrash
+%{tde_tdelibdir}/cursorthumbnail.la
+%{tde_tdelibdir}/cursorthumbnail.so
+%{tde_tdelibdir}/djvuthumbnail.la
+%{tde_tdelibdir}/djvuthumbnail.so
+%{tde_tdelibdir}/exrthumbnail.la
+%{tde_tdelibdir}/exrthumbnail.so
+%{tde_tdelibdir}/htmlthumbnail.la
+%{tde_tdelibdir}/htmlthumbnail.so
+%{tde_tdelibdir}/imagethumbnail.la
+%{tde_tdelibdir}/imagethumbnail.so
+%{tde_tdelibdir}/kcm_cgi.la
+%{tde_tdelibdir}/kcm_cgi.so
+%{tde_tdelibdir}/kcm_media.la
+%{tde_tdelibdir}/kcm_media.so
+%{tde_tdelibdir}/kded_homedirnotify.la
+%{tde_tdelibdir}/kded_homedirnotify.so
+%{tde_tdelibdir}/kded_mediamanager.la
+%{tde_tdelibdir}/kded_mediamanager.so
+%{tde_tdelibdir}/kded_medianotifier.la
+%{tde_tdelibdir}/kded_medianotifier.so
+%{tde_tdelibdir}/kded_remotedirnotify.la
+%{tde_tdelibdir}/kded_remotedirnotify.so
+%{tde_tdelibdir}/kded_systemdirnotify.la
+%{tde_tdelibdir}/kded_systemdirnotify.so
+%{tde_tdelibdir}/kfile_media.la
+%{tde_tdelibdir}/kfile_media.so
+%{tde_tdelibdir}/kfile_trash.la
+%{tde_tdelibdir}/kfile_trash.so
+%{tde_tdelibdir}/kio_about.la
+%{tde_tdelibdir}/kio_about.so
+%{tde_tdelibdir}/kio_cgi.la
+%{tde_tdelibdir}/kio_cgi.so
+%{tde_tdelibdir}/kio_filter.la
+%{tde_tdelibdir}/kio_filter.so
+%{tde_tdelibdir}/kio_finger.la
+%{tde_tdelibdir}/kio_finger.so
+%{tde_tdelibdir}/kio_fish.la
+%{tde_tdelibdir}/kio_fish.so
+%{tde_tdelibdir}/kio_floppy.la
+%{tde_tdelibdir}/kio_floppy.so
+%{tde_tdelibdir}/kio_home.la
+%{tde_tdelibdir}/kio_home.so
+%{tde_tdelibdir}/kio_info.la
+%{tde_tdelibdir}/kio_info.so
+%{tde_tdelibdir}/kio_mac.la
+%{tde_tdelibdir}/kio_mac.so
+%{tde_tdelibdir}/kio_man.la
+%{tde_tdelibdir}/kio_man.so
+%{tde_tdelibdir}/kio_media.la
+%{tde_tdelibdir}/kio_media.so
+%{tde_tdelibdir}/kio_nfs.la
+%{tde_tdelibdir}/kio_nfs.so
+%{tde_tdelibdir}/kio_remote.la
+%{tde_tdelibdir}/kio_remote.so
+%{tde_tdelibdir}/kio_settings.la
+%{tde_tdelibdir}/kio_settings.so
+%{tde_tdelibdir}/kio_sftp.la
+%{tde_tdelibdir}/kio_sftp.so
+%{tde_tdelibdir}/kio_smb.la
+%{tde_tdelibdir}/kio_smb.so
+%{tde_tdelibdir}/kio_system.la
+%{tde_tdelibdir}/kio_system.so
+%{tde_tdelibdir}/kio_tar.la
+%{tde_tdelibdir}/kio_tar.so
+%{tde_tdelibdir}/kio_thumbnail.la
+%{tde_tdelibdir}/kio_thumbnail.so
+%{tde_tdelibdir}/kio_trash.la
+%{tde_tdelibdir}/kio_trash.so
+%{tde_tdelibdir}/libkmanpart.la
+%{tde_tdelibdir}/libkmanpart.so
+%{tde_tdelibdir}/media_propsdlgplugin.la
+%{tde_tdelibdir}/media_propsdlgplugin.so
+%{tde_tdelibdir}/textthumbnail.la
+%{tde_tdelibdir}/textthumbnail.so
+%{tde_tdeappdir}/kcmcgi.desktop
+%{tde_datadir}/apps/kio_finger/kio_finger.css
+%{tde_datadir}/apps/kio_finger/kio_finger.pl
+%{tde_datadir}/apps/kio_info/kde-info2html
+%{tde_datadir}/apps/kio_info/kde-info2html.conf
+%{tde_datadir}/apps/kio_man/kio_man.css
+%{tde_datadir}/apps/konqueror/dirtree/remote/smb-network.desktop
+%{tde_datadir}/apps/remoteview/smb-network.desktop
+%{tde_datadir}/apps/systemview/*.desktop
+%{tde_datadir}/config.kcfg/mediamanagersettings.kcfg
+%{tde_datadir}/mimelnk/application/x-smb-server.desktop
+%{tde_datadir}/mimelnk/application/x-smb-workgroup.desktop
+%{tde_datadir}/mimelnk/inode/system_directory.desktop
+%{tde_datadir}/mimelnk/media/*.desktop
+%{tde_datadir}/services/about.protocol
+%{tde_datadir}/services/applications.protocol
+%{tde_datadir}/services/ar.protocol
+%{tde_datadir}/services/bzip.protocol
+%{tde_datadir}/services/bzip2.protocol
+%{tde_datadir}/services/cgi.protocol
+%{tde_datadir}/services/cursorthumbnail.desktop
+%{tde_datadir}/services/djvuthumbnail.desktop
+%{tde_datadir}/services/exrthumbnail.desktop
+%{tde_datadir}/services/finger.protocol
+%{tde_datadir}/services/fish.protocol
+%{tde_datadir}/services/floppy.protocol
+%{tde_datadir}/services/gzip.protocol
+%{tde_datadir}/services/home.protocol
+%{tde_datadir}/services/htmlthumbnail.desktop
+%{tde_datadir}/services/imagethumbnail.desktop
+%{tde_datadir}/services/info.protocol
+%{tde_datadir}/services/kded/homedirnotify.desktop
+%{tde_datadir}/services/kded/mediamanager.desktop
+%{tde_datadir}/services/kded/medianotifier.desktop
+%{tde_datadir}/services/kded/remotedirnotify.desktop
+%{tde_datadir}/services/kded/systemdirnotify.desktop
+%{tde_datadir}/services/kfile_media.desktop
+%{tde_datadir}/services/kfile_trash_system.desktop
+%{tde_datadir}/services/kmanpart.desktop
+%{tde_datadir}/services/mac.protocol
+%{tde_datadir}/services/man.protocol
+%{tde_datadir}/services/media.protocol
+%{tde_datadir}/services/media_propsdlgplugin.desktop
+%{tde_datadir}/services/nfs.protocol
+%{tde_datadir}/services/nxfish.protocol
+%{tde_datadir}/services/programs.protocol
+%{tde_datadir}/services/remote.protocol
+%{tde_datadir}/services/settings.protocol
+%{tde_datadir}/services/sftp.protocol
+%{tde_datadir}/services/smb.protocol
+%{tde_datadir}/services/system.protocol
+%{tde_datadir}/services/tar.protocol
+%{tde_datadir}/services/textthumbnail.desktop
+%{tde_datadir}/services/thumbnail.protocol
+%{tde_datadir}/services/trash.protocol
+%{tde_datadir}/services/zip.protocol
+%{tde_datadir}/servicetypes/thumbcreator.desktop
+%{tde_datadir}/services/kfile_trash.desktop
+%{tde_tdedocdir}/HTML/en/kioslave/
 
 %post kio-plugins
 update-desktop-database %{tde_appdir} 2> /dev/null || : 
@@ -1504,18 +1547,18 @@ system passwords.
 
 %files -n trinity-kdepasswd
 %defattr(-,root,root,-)
-%{_bindir}/kdepasswd
-%{tde_libdir}/kcm_useraccount.la
-%{tde_libdir}/kcm_useraccount.so
-%{tde_appdir}/kcm_useraccount.desktop
-%{tde_appdir}/kdepasswd.desktop
-%exclude %{_datadir}/apps/[kt]dm/pics/users/default1.png
-%exclude %{_datadir}/apps/[kt]dm/pics/users/default2.png
-%exclude %{_datadir}/apps/[kt]dm/pics/users/default3.png
-%exclude %{_datadir}/apps/[kt]dm/pics/users/root1.png
-%{_datadir}/apps/[kt]dm/pics/users/*.png
-%{_datadir}/config.kcfg/kcm_useraccount.kcfg
-%{_datadir}/config.kcfg/kcm_useraccount_pass.kcfg
+%{tde_bindir}/kdepasswd
+%{tde_tdelibdir}/kcm_useraccount.la
+%{tde_tdelibdir}/kcm_useraccount.so
+%{tde_tdeappdir}/kcm_useraccount.desktop
+%{tde_tdeappdir}/kdepasswd.desktop
+%exclude %{tde_datadir}/apps/[kt]dm/pics/users/default1.png
+%exclude %{tde_datadir}/apps/[kt]dm/pics/users/default2.png
+%exclude %{tde_datadir}/apps/[kt]dm/pics/users/default3.png
+%exclude %{tde_datadir}/apps/[kt]dm/pics/users/root1.png
+%{tde_datadir}/apps/[kt]dm/pics/users/*.png
+%{tde_datadir}/config.kcfg/kcm_useraccount.kcfg
+%{tde_datadir}/config.kcfg/kcm_useraccount_pass.kcfg
 
 %post -n trinity-kdepasswd
 update-desktop-database %{tde_appdir} 2> /dev/null || : 
@@ -1540,56 +1583,56 @@ Installation of smbclient will make you able to use smb shared printers.
 
 %files -n trinity-tdeprint
 %defattr(-,root,root,-)
-%{_bindir}/[kt]deprintfax
-%{_bindir}/kjobviewer
-%{_bindir}/kprinter
-%{tde_libdir}/kcm_printmgr.la
-%{tde_libdir}/kcm_printmgr.so
-%{tde_libdir}/kio_print.la
-%{tde_libdir}/kio_print.so
-%{tde_libdir}/kjobviewer.la
-%{tde_libdir}/kjobviewer.so
-%{tde_libdir}/kprinter.la
-%{tde_libdir}/kprinter.so
-%{tde_libdir}/lib[kt]deprint_part.la
-%{tde_libdir}/lib[kt]deprint_part.so
-%{_libdir}/lib[kt]deinit_kjobviewer.la
-%{_libdir}/lib[kt]deinit_kjobviewer.so
-%{_libdir}/lib[kt]deinit_kprinter.la
-%{_libdir}/lib[kt]deinit_kprinter.so
-%{tde_appdir}/[kt]deprintfax.desktop
-%{tde_appdir}/kjobviewer.desktop
-%{tde_appdir}/printers.desktop
-%{_datadir}/apps/[kt]deprintfax/
-%{_datadir}/apps/[kt]deprint_part/[kt]deprint_part.rc
-%{_datadir}/apps/[kt]deprint/
-%{_datadir}/apps/kjobviewer/kjobviewerui.rc
-%{_datadir}/icons/hicolor/*/apps/[kt]deprintfax.png
-%{_datadir}/icons/hicolor/*/apps/kjobviewer.png
-%{_datadir}/icons/hicolor/*/apps/printmgr.png
-%{_datadir}/icons/hicolor/*/apps/[kt]deprintfax.svgz
-%{_datadir}/icons/hicolor/*/apps/kjobviewer.svgz
-%{_datadir}/icons/hicolor/*/apps/printmgr.svgz
-%{_datadir}/mimelnk/print
-%{_datadir}/services/[kt]deprint_part.desktop
-%{_datadir}/services/printdb.protocol
-%{_datadir}/services/print.protocol
-%{tde_docdir}/HTML/en/[kt]deprint/
+%{tde_bindir}/[kt]deprintfax
+%{tde_bindir}/kjobviewer
+%{tde_bindir}/kprinter
+%{tde_tdelibdir}/kcm_printmgr.la
+%{tde_tdelibdir}/kcm_printmgr.so
+%{tde_tdelibdir}/kio_print.la
+%{tde_tdelibdir}/kio_print.so
+%{tde_tdelibdir}/kjobviewer.la
+%{tde_tdelibdir}/kjobviewer.so
+%{tde_tdelibdir}/kprinter.la
+%{tde_tdelibdir}/kprinter.so
+%{tde_tdelibdir}/lib[kt]deprint_part.la
+%{tde_tdelibdir}/lib[kt]deprint_part.so
+%{tde_libdir}/lib[kt]deinit_kjobviewer.la
+%{tde_libdir}/lib[kt]deinit_kjobviewer.so
+%{tde_libdir}/lib[kt]deinit_kprinter.la
+%{tde_libdir}/lib[kt]deinit_kprinter.so
+%{tde_tdeappdir}/[kt]deprintfax.desktop
+%{tde_tdeappdir}/kjobviewer.desktop
+%{tde_tdeappdir}/printers.desktop
+%{tde_datadir}/apps/[kt]deprintfax/
+%{tde_datadir}/apps/[kt]deprint_part/[kt]deprint_part.rc
+%{tde_datadir}/apps/[kt]deprint/
+%{tde_datadir}/apps/kjobviewer/kjobviewerui.rc
+%{tde_datadir}/icons/hicolor/*/apps/[kt]deprintfax.png
+%{tde_datadir}/icons/hicolor/*/apps/kjobviewer.png
+%{tde_datadir}/icons/hicolor/*/apps/printmgr.png
+%{tde_datadir}/icons/hicolor/*/apps/[kt]deprintfax.svgz
+%{tde_datadir}/icons/hicolor/*/apps/kjobviewer.svgz
+%{tde_datadir}/icons/hicolor/*/apps/printmgr.svgz
+%{tde_datadir}/mimelnk/print
+%{tde_datadir}/services/[kt]deprint_part.desktop
+%{tde_datadir}/services/printdb.protocol
+%{tde_datadir}/services/print.protocol
+%{tde_tdedocdir}/HTML/en/[kt]deprint/
 
 %post -n trinity-tdeprint
 /sbin/ldconfig || :
 update-desktop-database %{tde_appdir} 2> /dev/null || : 
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 
 %postun -n trinity-tdeprint
 /sbin/ldconfig || :
 update-desktop-database %{tde_appdir} 2> /dev/null || : 
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 
 ##########
@@ -1609,38 +1652,38 @@ the TDE desktop.
 
 %files -n trinity-kdesktop
 %defattr(-,root,root,-)
-%{_datadir}/config/kdesktop_custom_menu1
-%{_datadir}/config/kdesktop_custom_menu2
-%{_bindir}/kcheckrunning
-%{_bindir}/kxdglauncher
-%{_bindir}/kdeeject
-%{_bindir}/kdesktop
-%{_bindir}/kdesktop_lock
-%{_bindir}/kwebdesktop
-%{tde_libdir}/kdesktop.la
-%{tde_libdir}/kdesktop.so
-%{_libdir}/lib[kt]deinit_kdesktop.la
-%{_libdir}/lib[kt]deinit_kdesktop.so
-%{_datadir}/apps/kdesktop/
-%{_datadir}/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop
-%{_datadir}/autostart/kdesktop.desktop
-%{_datadir}/config.kcfg/kdesktop.kcfg
-%{_datadir}/config.kcfg/klaunch.kcfg
-%{_datadir}/config.kcfg/kwebdesktop.kcfg
-%{_datadir}/icons/crystalsvg/*/apps/error.png
+%{tde_datadir}/config/kdesktop_custom_menu1
+%{tde_datadir}/config/kdesktop_custom_menu2
+%{tde_bindir}/kcheckrunning
+%{tde_bindir}/kxdglauncher
+%{tde_bindir}/kdeeject
+%{tde_bindir}/kdesktop
+%{tde_bindir}/kdesktop_lock
+%{tde_bindir}/kwebdesktop
+%{tde_tdelibdir}/kdesktop.la
+%{tde_tdelibdir}/kdesktop.so
+%{tde_libdir}/lib[kt]deinit_kdesktop.la
+%{tde_libdir}/lib[kt]deinit_kdesktop.so
+%{tde_datadir}/apps/kdesktop/
+%{tde_datadir}/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop
+%{tde_datadir}/autostart/kdesktop.desktop
+%{tde_datadir}/config.kcfg/kdesktop.kcfg
+%{tde_datadir}/config.kcfg/klaunch.kcfg
+%{tde_datadir}/config.kcfg/kwebdesktop.kcfg
+%{tde_datadir}/icons/crystalsvg/*/apps/error.png
 
 %post -n trinity-kdesktop
 /sbin/ldconfig || :
 for f in crystalsvg ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 
 %postun -n trinity-kdesktop
 /sbin/ldconfig || :
 for f in crystalsvg ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 
 ##########
@@ -1654,9 +1697,9 @@ Requires:	trinity-kdesktop = %{version}-%{release}
 %{summary}
 
 %files -n trinity-kdesktop-devel
-%{_includedir}/KBackgroundIface.h
-%{_includedir}/KDesktopIface.h
-%{_includedir}/KScreensaverIface.h
+%{tde_includedir}/KBackgroundIface.h
+%{tde_includedir}/KDesktopIface.h
+%{tde_includedir}/KScreensaverIface.h
 
 ##########
 
@@ -1667,8 +1710,12 @@ Requires:	%{name}-bin = %{version}-%{release}
 Requires:	%{name}-data = %{version}-%{release}
 Requires:	pam
 
-# Provides the global Xsession script (/etc/X11/xinit/Xsession)
+# Provides the global Xsession script (/etc/X11/xinit/Xsession or /etc/X11/Xsession)
+%if 0%{?mgaversion}
+Requires:	xinitrc
+%else
 Requires:	xorg-x11-xinit
+%endif
 
 # Required for Fedora LiveCD
 Provides:	service(graphical-login)
@@ -1691,30 +1738,41 @@ already. Most users won't need this.
 
 %files -n trinity-tdm
 %defattr(-,root,root,-)
-%{tde_libdir}/kgreet_pam.la
-%{tde_libdir}/kgreet_pam.so
-%{_bindir}/gen[kt]dmconf
-%{_bindir}/[kt]dm
-%{_bindir}/[kt]dm_config
-%{_bindir}/[kt]dmctl
-%{_bindir}/[kt]dm_greet
-%{_bindir}/krootimage
-%{_datadir}/apps/[kt]dm/pics/kdelogo.png
-%{_datadir}/apps/[kt]dm/pics/kdelogo-crystal.png
-%{_datadir}/apps/[kt]dm/pics/shutdown.jpg
-%{_datadir}/apps/[kt]dm/pics/users/default1.png
-%{_datadir}/apps/[kt]dm/pics/users/default2.png
-%{_datadir}/apps/[kt]dm/pics/users/default3.png
-%{_datadir}/apps/[kt]dm/pics/users/root1.png
-%{_datadir}/apps/[kt]dm/sessions/*.desktop
-%{_datadir}/apps/[kt]dm/themes/
-%{_datadir}/config/[kt]dm/
-%{tde_docdir}/HTML/en/[kt]dm/
-
-# RHEL/Fedora specific
-/usr/share/xsessions/*.desktop
+%{tde_tdelibdir}/kgreet_pam.la
+%{tde_tdelibdir}/kgreet_pam.so
+%{tde_bindir}/gen[kt]dmconf
+%{tde_bindir}/[kt]dm
+%{tde_bindir}/[kt]dm_config
+%{tde_bindir}/[kt]dmctl
+%{tde_bindir}/[kt]dm_greet
+%{tde_bindir}/krootimage
+%{tde_datadir}/apps/[kt]dm/pics/kdelogo.png
+%{tde_datadir}/apps/[kt]dm/pics/kdelogo-crystal.png
+%{tde_datadir}/apps/[kt]dm/pics/shutdown.jpg
+%{tde_datadir}/apps/[kt]dm/pics/users/default1.png
+%{tde_datadir}/apps/[kt]dm/pics/users/default2.png
+%{tde_datadir}/apps/[kt]dm/pics/users/default3.png
+%{tde_datadir}/apps/[kt]dm/pics/users/root1.png
+%{tde_datadir}/apps/[kt]dm/sessions/*.desktop
+%{tde_datadir}/apps/[kt]dm/themes/
+%{tde_datadir}/config/[kt]dm/
+%{tde_tdedocdir}/HTML/en/[kt]dm/
+
+# Distribution specific stuff
+%if 0%{?rhel} || 0%{?fedora}
+%{_usr}/share/xsessions/tde.desktop
+%endif
 %{_sysconfdir}/pam.d/kdm-trinity
 %{_sysconfdir}/pam.d/kdm-trinity-np
+%if 0%{?mgaversion}
+%{_sysconfdir}/X11/wmsession.d/*
+
+%post -n trinity-tdm
+%make_session
+
+%postun -n trinity-tdm
+%make_session
+%endif
 
 ##########
 
@@ -1727,7 +1785,7 @@ Requires:	trinity-tdm = %{version}-%{release}
 %{summary}
 
 %files -n trinity-tdm-devel
-%{_includedir}/kgreeterplugin.h
+%{tde_includedir}/kgreeterplugin.h
 
 ##########
 
@@ -1742,28 +1800,28 @@ workstations.
 
 %files -n trinity-kfind
 %defattr(-,root,root,-)
-%{_bindir}/kfind
-%{tde_libdir}/libkfindpart.la
-%{tde_libdir}/libkfindpart.so
-%{tde_appdir}/Kfind.desktop
-%{_datadir}/apps/kfindpart/
-%{_datadir}/icons/hicolor/*/apps/kfind.png
-%{_datadir}/services/kfindpart.desktop
-%{_datadir}/servicetypes/findpart.desktop
-%{tde_docdir}/HTML/en/kfind/
+%{tde_bindir}/kfind
+%{tde_tdelibdir}/libkfindpart.la
+%{tde_tdelibdir}/libkfindpart.so
+%{tde_tdeappdir}/Kfind.desktop
+%{tde_datadir}/apps/kfindpart/
+%{tde_datadir}/icons/hicolor/*/apps/kfind.png
+%{tde_datadir}/services/kfindpart.desktop
+%{tde_datadir}/servicetypes/findpart.desktop
+%{tde_tdedocdir}/HTML/en/kfind/
 
 %post -n trinity-kfind
 update-desktop-database %{tde_appdir} 2> /dev/null || : 
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 
 %postun -n trinity-kfind
 update-desktop-database %{tde_appdir} 2> /dev/null || : 
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 
 ##########
@@ -1782,38 +1840,38 @@ documentation.
 
 %files -n trinity-khelpcenter
 %defattr(-,root,root,-)
-%{_bindir}/khc_beagle_index.pl
-%{_bindir}/khc_beagle_search.pl
-%{_bindir}/khc_docbookdig.pl
-%{_bindir}/khc_htdig.pl
-%{_bindir}/khc_htsearch.pl
-%{_bindir}/khc_indexbuilder
-%{_bindir}/khc_mansearch.pl
-%{_bindir}/khelpcenter
-%{tde_libdir}/khelpcenter.la
-%{tde_libdir}/khelpcenter.so
-%{_libdir}/lib[kt]deinit_khelpcenter.la
-%{_libdir}/lib[kt]deinit_khelpcenter.so
-%{tde_appdir}/Help.desktop
-%{_datadir}/apps/khelpcenter/
-%{_datadir}/config.kcfg/khelpcenter.kcfg
-%{_datadir}/icons/hicolor/*/apps/khelpcenter.*
-%{_datadir}/services/khelpcenter.desktop
-%{tde_docdir}/HTML/en/khelpcenter/
+%{tde_bindir}/khc_beagle_index.pl
+%{tde_bindir}/khc_beagle_search.pl
+%{tde_bindir}/khc_docbookdig.pl
+%{tde_bindir}/khc_htdig.pl
+%{tde_bindir}/khc_htsearch.pl
+%{tde_bindir}/khc_indexbuilder
+%{tde_bindir}/khc_mansearch.pl
+%{tde_bindir}/khelpcenter
+%{tde_tdelibdir}/khelpcenter.la
+%{tde_tdelibdir}/khelpcenter.so
+%{tde_libdir}/lib[kt]deinit_khelpcenter.la
+%{tde_libdir}/lib[kt]deinit_khelpcenter.so
+%{tde_tdeappdir}/Help.desktop
+%{tde_datadir}/apps/khelpcenter/
+%{tde_datadir}/config.kcfg/khelpcenter.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/khelpcenter.*
+%{tde_datadir}/services/khelpcenter.desktop
+%{tde_tdedocdir}/HTML/en/khelpcenter/
 
 %post -n trinity-khelpcenter
 update-desktop-database %{tde_appdir} 2> /dev/null || : 
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 /sbin/ldconfig || :
 
 %postun -n trinity-khelpcenter
 update-desktop-database %{tde_appdir} 2> /dev/null || : 
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 /sbin/ldconfig || :
 
@@ -1831,119 +1889,119 @@ functionality.
 
 %files -n trinity-kicker
 %defattr(-,root,root,-)
-%{_bindir}/appletproxy
-%{_bindir}/extensionproxy
-%{_bindir}/kasbar
-%{_bindir}/kicker
-%{_libdir}/kconf_update_bin/kicker-3.4-reverseLayout
-%{tde_libdir}/appletproxy.la
-%{tde_libdir}/appletproxy.so
-%{tde_libdir}/clock_panelapplet.la
-%{tde_libdir}/clock_panelapplet.so
-%{tde_libdir}/dockbar_panelextension.la
-%{tde_libdir}/dockbar_panelextension.so
-%{tde_libdir}/extensionproxy.la
-%{tde_libdir}/extensionproxy.so
-%{tde_libdir}/kasbar_panelextension.la
-%{tde_libdir}/kasbar_panelextension.so
-%{tde_libdir}/kicker.la
-%{tde_libdir}/kickermenu_find.la
-%{tde_libdir}/kickermenu_find.so
-%{tde_libdir}/kickermenu_kate.so
-%{tde_libdir}/kickermenu_kate.la
-%{tde_libdir}/kickermenu_[kt]deprint.la
-%{tde_libdir}/kickermenu_[kt]deprint.so
-%{tde_libdir}/kickermenu_konqueror.la
-%{tde_libdir}/kickermenu_konqueror.so
-%{tde_libdir}/kickermenu_konsole.la
-%{tde_libdir}/kickermenu_konsole.so
-%{tde_libdir}/kickermenu_prefmenu.la
-%{tde_libdir}/kickermenu_prefmenu.so
-%{tde_libdir}/kickermenu_recentdocs.la
-%{tde_libdir}/kickermenu_recentdocs.so
-%{tde_libdir}/kickermenu_remotemenu.la
-%{tde_libdir}/kickermenu_remotemenu.so
-%{tde_libdir}/kickermenu_systemmenu.la
-%{tde_libdir}/kickermenu_systemmenu.so
-%{tde_libdir}/kicker.so
-%{tde_libdir}/launcher_panelapplet.la
-%{tde_libdir}/launcher_panelapplet.so
-%{tde_libdir}/lockout_panelapplet.la
-%{tde_libdir}/lockout_panelapplet.so
-%{tde_libdir}/media_panelapplet.la
-%{tde_libdir}/media_panelapplet.so
-%{tde_libdir}/menu_panelapplet.la
-%{tde_libdir}/menu_panelapplet.so
-%{tde_libdir}/minipager_panelapplet.la
-%{tde_libdir}/minipager_panelapplet.so
-%{tde_libdir}/naughty_panelapplet.la
-%{tde_libdir}/naughty_panelapplet.so
-%{tde_libdir}/run_panelapplet.la
-%{tde_libdir}/run_panelapplet.so
-%{tde_libdir}/sidebar_panelextension.la
-%{tde_libdir}/sidebar_panelextension.so
-%{tde_libdir}/systemtray_panelapplet.la
-%{tde_libdir}/systemtray_panelapplet.so
-%{tde_libdir}/taskbar_panelapplet.la
-%{tde_libdir}/taskbar_panelapplet.so
-%{tde_libdir}/taskbar_panelextension.la
-%{tde_libdir}/taskbar_panelextension.so
-%{tde_libdir}/trash_panelapplet.la
-%{tde_libdir}/trash_panelapplet.so
-%{_libdir}/libkasbar.so.*
-%{_libdir}/lib[kt]deinit_appletproxy.la
-%{_libdir}/lib[kt]deinit_appletproxy.so
-%{_libdir}/lib[kt]deinit_extensionproxy.la
-%{_libdir}/lib[kt]deinit_extensionproxy.so
-%{_libdir}/lib[kt]deinit_kicker.la
-%{_libdir}/lib[kt]deinit_kicker.so
-%{_libdir}/libkickermain.so.*
-%{_libdir}/libtaskbar.so.*
-%{_libdir}/libtaskmanager.so.*
-%{_libdir}/libkickoffsearch_interfaces.so.*
-%{tde_appdir}/kcmkicker.desktop
-%{_datadir}/applnk/.hidden/kicker_config_arrangement.desktop
-%{_datadir}/applnk/.hidden/kicker_config_hiding.desktop
-%{_datadir}/applnk/.hidden/kicker_config_menus.desktop
-%{_datadir}/apps/clockapplet/pics/lcd.png
-%{_datadir}/apps/kconf_update/kicker-3.1-properSizeSetting.pl
-%{_datadir}/apps/kconf_update/kicker-3.5-kconfigXTize.pl
-%{_datadir}/apps/kconf_update/kicker-3.5-taskbarEnums.pl
-%{_datadir}/apps/kconf_update/kickerrc.upd
-%{_datadir}/apps/kicker
-%{_datadir}/apps/naughtyapplet/pics/naughty-happy.png
-%{_datadir}/apps/naughtyapplet/pics/naughty-sad.png
-%{_datadir}/autostart/panel.desktop
-%{_datadir}/config.kcfg/kickerSettings.kcfg
-%{_datadir}/config.kcfg/launcherapplet.kcfg
-%{_datadir}/config.kcfg/pagersettings.kcfg
-%{_datadir}/config.kcfg/taskbar.kcfg
-%{_datadir}/icons/crystalsvg/*/apps/systemtray.png
-%{_datadir}/icons/crystalsvg/*/apps/taskbar.png
-%{_datadir}/icons/crystalsvg/*/apps/kbinaryclock.png
-%{_datadir}/icons/crystalsvg/*/apps/kdisknav.png
-%{_datadir}/icons/crystalsvg/*/apps/kicker.png
-%{_datadir}/icons/crystalsvg/*/apps/panel.png
-%{_datadir}/icons/crystalsvg/*/apps/runprocesscatcher.png
-%{_datadir}/icons/crystalsvg/*/apps/window_list.png
-%{_datadir}/icons/crystalsvg/*/apps/kbinaryclock.svgz
-%{_datadir}/icons/crystalsvg/*/apps/systemtray.svgz
-%{_datadir}/servicetypes/kickoffsearchplugin.desktop
-%{tde_docdir}/HTML/en/kicker/
+%{tde_bindir}/appletproxy
+%{tde_bindir}/extensionproxy
+%{tde_bindir}/kasbar
+%{tde_bindir}/kicker
+%{tde_libdir}/kconf_update_bin/kicker-3.4-reverseLayout
+%{tde_tdelibdir}/appletproxy.la
+%{tde_tdelibdir}/appletproxy.so
+%{tde_tdelibdir}/clock_panelapplet.la
+%{tde_tdelibdir}/clock_panelapplet.so
+%{tde_tdelibdir}/dockbar_panelextension.la
+%{tde_tdelibdir}/dockbar_panelextension.so
+%{tde_tdelibdir}/extensionproxy.la
+%{tde_tdelibdir}/extensionproxy.so
+%{tde_tdelibdir}/kasbar_panelextension.la
+%{tde_tdelibdir}/kasbar_panelextension.so
+%{tde_tdelibdir}/kicker.la
+%{tde_tdelibdir}/kickermenu_find.la
+%{tde_tdelibdir}/kickermenu_find.so
+%{tde_tdelibdir}/kickermenu_kate.so
+%{tde_tdelibdir}/kickermenu_kate.la
+%{tde_tdelibdir}/kickermenu_[kt]deprint.la
+%{tde_tdelibdir}/kickermenu_[kt]deprint.so
+%{tde_tdelibdir}/kickermenu_konqueror.la
+%{tde_tdelibdir}/kickermenu_konqueror.so
+%{tde_tdelibdir}/kickermenu_konsole.la
+%{tde_tdelibdir}/kickermenu_konsole.so
+%{tde_tdelibdir}/kickermenu_prefmenu.la
+%{tde_tdelibdir}/kickermenu_prefmenu.so
+%{tde_tdelibdir}/kickermenu_recentdocs.la
+%{tde_tdelibdir}/kickermenu_recentdocs.so
+%{tde_tdelibdir}/kickermenu_remotemenu.la
+%{tde_tdelibdir}/kickermenu_remotemenu.so
+%{tde_tdelibdir}/kickermenu_systemmenu.la
+%{tde_tdelibdir}/kickermenu_systemmenu.so
+%{tde_tdelibdir}/kicker.so
+%{tde_tdelibdir}/launcher_panelapplet.la
+%{tde_tdelibdir}/launcher_panelapplet.so
+%{tde_tdelibdir}/lockout_panelapplet.la
+%{tde_tdelibdir}/lockout_panelapplet.so
+%{tde_tdelibdir}/media_panelapplet.la
+%{tde_tdelibdir}/media_panelapplet.so
+%{tde_tdelibdir}/menu_panelapplet.la
+%{tde_tdelibdir}/menu_panelapplet.so
+%{tde_tdelibdir}/minipager_panelapplet.la
+%{tde_tdelibdir}/minipager_panelapplet.so
+%{tde_tdelibdir}/naughty_panelapplet.la
+%{tde_tdelibdir}/naughty_panelapplet.so
+%{tde_tdelibdir}/run_panelapplet.la
+%{tde_tdelibdir}/run_panelapplet.so
+%{tde_tdelibdir}/sidebar_panelextension.la
+%{tde_tdelibdir}/sidebar_panelextension.so
+%{tde_tdelibdir}/systemtray_panelapplet.la
+%{tde_tdelibdir}/systemtray_panelapplet.so
+%{tde_tdelibdir}/taskbar_panelapplet.la
+%{tde_tdelibdir}/taskbar_panelapplet.so
+%{tde_tdelibdir}/taskbar_panelextension.la
+%{tde_tdelibdir}/taskbar_panelextension.so
+%{tde_tdelibdir}/trash_panelapplet.la
+%{tde_tdelibdir}/trash_panelapplet.so
+%{tde_libdir}/libkasbar.so.*
+%{tde_libdir}/lib[kt]deinit_appletproxy.la
+%{tde_libdir}/lib[kt]deinit_appletproxy.so
+%{tde_libdir}/lib[kt]deinit_extensionproxy.la
+%{tde_libdir}/lib[kt]deinit_extensionproxy.so
+%{tde_libdir}/lib[kt]deinit_kicker.la
+%{tde_libdir}/lib[kt]deinit_kicker.so
+%{tde_libdir}/libkickermain.so.*
+%{tde_libdir}/libtaskbar.so.*
+%{tde_libdir}/libtaskmanager.so.*
+%{tde_libdir}/libkickoffsearch_interfaces.so.*
+%{tde_tdeappdir}/kcmkicker.desktop
+%{tde_datadir}/applnk/.hidden/kicker_config_arrangement.desktop
+%{tde_datadir}/applnk/.hidden/kicker_config_hiding.desktop
+%{tde_datadir}/applnk/.hidden/kicker_config_menus.desktop
+%{tde_datadir}/apps/clockapplet/pics/lcd.png
+%{tde_datadir}/apps/kconf_update/kicker-3.1-properSizeSetting.pl
+%{tde_datadir}/apps/kconf_update/kicker-3.5-kconfigXTize.pl
+%{tde_datadir}/apps/kconf_update/kicker-3.5-taskbarEnums.pl
+%{tde_datadir}/apps/kconf_update/kickerrc.upd
+%{tde_datadir}/apps/kicker
+%{tde_datadir}/apps/naughtyapplet/pics/naughty-happy.png
+%{tde_datadir}/apps/naughtyapplet/pics/naughty-sad.png
+%{tde_datadir}/autostart/panel.desktop
+%{tde_datadir}/config.kcfg/kickerSettings.kcfg
+%{tde_datadir}/config.kcfg/launcherapplet.kcfg
+%{tde_datadir}/config.kcfg/pagersettings.kcfg
+%{tde_datadir}/config.kcfg/taskbar.kcfg
+%{tde_datadir}/icons/crystalsvg/*/apps/systemtray.png
+%{tde_datadir}/icons/crystalsvg/*/apps/taskbar.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kbinaryclock.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kdisknav.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kicker.png
+%{tde_datadir}/icons/crystalsvg/*/apps/panel.png
+%{tde_datadir}/icons/crystalsvg/*/apps/runprocesscatcher.png
+%{tde_datadir}/icons/crystalsvg/*/apps/window_list.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kbinaryclock.svgz
+%{tde_datadir}/icons/crystalsvg/*/apps/systemtray.svgz
+%{tde_datadir}/servicetypes/kickoffsearchplugin.desktop
+%{tde_tdedocdir}/HTML/en/kicker/
 
 %post -n trinity-kicker
 update-desktop-database %{tde_appdir} 2> /dev/null || : 
 for f in crystalsvg ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 /sbin/ldconfig || :
 
 %postun -n trinity-kicker
 update-desktop-database %{tde_appdir} 2> /dev/null || : 
 for f in crystalsvg ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 /sbin/ldconfig || :
 
@@ -1958,18 +2016,18 @@ Requires:	trinity-kicker = %{version}-%{release}
 %{summary}
 
 %files -n trinity-kicker-devel
-%{_includedir}/kickoff-search-plugin.h
-%{_includedir}/kickoffsearchinterface.h
-%{_libdir}/libkasbar.la
-%{_libdir}/libkasbar.so
-%{_libdir}/libkickermain.la
-%{_libdir}/libkickermain.so
-%{_libdir}/libkickoffsearch_interfaces.la
-%{_libdir}/libkickoffsearch_interfaces.so
-%{_libdir}/libtaskbar.la
-%{_libdir}/libtaskbar.so
-%{_libdir}/libtaskmanager.la
-%{_libdir}/libtaskmanager.so
+%{tde_includedir}/kickoff-search-plugin.h
+%{tde_includedir}/kickoffsearchinterface.h
+%{tde_libdir}/libkasbar.la
+%{tde_libdir}/libkasbar.so
+%{tde_libdir}/libkickermain.la
+%{tde_libdir}/libkickermain.so
+%{tde_libdir}/libkickoffsearch_interfaces.la
+%{tde_libdir}/libkickoffsearch_interfaces.so
+%{tde_libdir}/libtaskbar.la
+%{tde_libdir}/libtaskbar.so
+%{tde_libdir}/libtaskmanager.la
+%{tde_libdir}/libtaskmanager.so
 
 %post -n trinity-kicker-devel
 /sbin/ldconfig || :
@@ -1992,37 +2050,37 @@ web browser if the clipboard contains a URL.
 
 %files -n trinity-klipper
 %defattr(-,root,root,-)
-%{_bindir}/klipper
-%{_datadir}/config/klipperrc
-%{tde_libdir}/klipper.la
-%{tde_libdir}/klipper.so
-%{tde_libdir}/klipper_panelapplet.la
-%{tde_libdir}/klipper_panelapplet.so
-%{_libdir}/lib[kt]deinit_klipper.la
-%{_libdir}/lib[kt]deinit_klipper.so
-%{tde_appdir}/klipper.desktop
-%{_datadir}/apps/kconf_update/klipper-1-2.pl
-%{_datadir}/apps/kconf_update/klipper-trinity1.sh
-%{_datadir}/apps/kconf_update/klipperrc.upd
-%{_datadir}/apps/kconf_update/klippershortcuts.upd
-%{_datadir}/apps/kicker/applets/klipper.desktop
-%{_datadir}/autostart/klipper.desktop
-%{_datadir}/icons/hicolor/*/apps/klipper.*
-%{tde_docdir}/HTML/en/klipper/
+%{tde_bindir}/klipper
+%{tde_datadir}/config/klipperrc
+%{tde_tdelibdir}/klipper.la
+%{tde_tdelibdir}/klipper.so
+%{tde_tdelibdir}/klipper_panelapplet.la
+%{tde_tdelibdir}/klipper_panelapplet.so
+%{tde_libdir}/lib[kt]deinit_klipper.la
+%{tde_libdir}/lib[kt]deinit_klipper.so
+%{tde_tdeappdir}/klipper.desktop
+%{tde_datadir}/apps/kconf_update/klipper-1-2.pl
+%{tde_datadir}/apps/kconf_update/klipper-trinity1.sh
+%{tde_datadir}/apps/kconf_update/klipperrc.upd
+%{tde_datadir}/apps/kconf_update/klippershortcuts.upd
+%{tde_datadir}/apps/kicker/applets/klipper.desktop
+%{tde_datadir}/autostart/klipper.desktop
+%{tde_datadir}/icons/hicolor/*/apps/klipper.*
+%{tde_tdedocdir}/HTML/en/klipper/
 
 %post -n trinity-klipper
 update-desktop-database %{tde_appdir} 2> /dev/null || : 
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 /sbin/ldconfig || :
 
 %postun -n trinity-klipper
 update-desktop-database %{tde_appdir} 2> /dev/null || : 
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 /sbin/ldconfig || :
 
@@ -2039,21 +2097,21 @@ structure.
 
 %files -n trinity-kmenuedit
 %defattr(-,root,root,-)
-%{_bindir}/kcontroledit
-%{_bindir}/kmenuedit
-%{tde_libdir}/kcontroledit.la
-%{tde_libdir}/kcontroledit.so
-%{tde_libdir}/kmenuedit.la
-%{tde_libdir}/kmenuedit.so
-%{_libdir}/lib[kt]deinit_kcontroledit.la
-%{_libdir}/lib[kt]deinit_kcontroledit.so
-%{_libdir}/lib[kt]deinit_kmenuedit.la
-%{_libdir}/lib[kt]deinit_kmenuedit.so
-%{tde_appdir}/kmenuedit.desktop
-%{_datadir}/applnk/System/kmenuedit.desktop
-%{_datadir}/apps/kcontroledit/
-%{_datadir}/apps/kmenuedit/
-%{tde_docdir}/HTML/en/kmenuedit/
+%{tde_bindir}/kcontroledit
+%{tde_bindir}/kmenuedit
+%{tde_tdelibdir}/kcontroledit.la
+%{tde_tdelibdir}/kcontroledit.so
+%{tde_tdelibdir}/kmenuedit.la
+%{tde_tdelibdir}/kmenuedit.so
+%{tde_libdir}/lib[kt]deinit_kcontroledit.la
+%{tde_libdir}/lib[kt]deinit_kcontroledit.so
+%{tde_libdir}/lib[kt]deinit_kmenuedit.la
+%{tde_libdir}/lib[kt]deinit_kmenuedit.so
+%{tde_tdeappdir}/kmenuedit.desktop
+%{tde_datadir}/applnk/System/kmenuedit.desktop
+%{tde_datadir}/apps/kcontroledit/
+%{tde_datadir}/apps/kmenuedit/
+%{tde_tdedocdir}/HTML/en/kmenuedit/
 
 %post -n trinity-kmenuedit
 update-desktop-database %{tde_appdir} 2> /dev/null || : 
@@ -2097,128 +2155,130 @@ ever launching another application.
 
 %files -n trinity-konqueror
 %defattr(-,root,root,-)
-%{_datadir}/config/konqsidebartng.rc
-%{_bindir}/kbookmarkmerger
-%{_bindir}/keditbookmarks
-%{_bindir}/kfmclient
-%{_bindir}/konqueror
-%{tde_libdir}/kcm_history.la
-%{tde_libdir}/kcm_history.so
-%{tde_libdir}/kded_konqy_preloader.la
-%{tde_libdir}/kded_konqy_preloader.so
-%{tde_libdir}/keditbookmarks.la
-%{tde_libdir}/keditbookmarks.so
-%{tde_libdir}/kfmclient.la
-%{tde_libdir}/kfmclient.so
-%{tde_libdir}/konq_aboutpage.la
-%{tde_libdir}/konq_aboutpage.so
-%{tde_libdir}/konq_iconview.la
-%{tde_libdir}/konq_iconview.so
-%{tde_libdir}/konq_listview.la
-%{tde_libdir}/konq_listview.so
-%{tde_libdir}/konq_remoteencoding.la
-%{tde_libdir}/konq_remoteencoding.so
-%{tde_libdir}/konq_shellcmdplugin.la
-%{tde_libdir}/konq_shellcmdplugin.so
-%{tde_libdir}/konq_sidebar.la
-%{tde_libdir}/konq_sidebar.so
-%{tde_libdir}/konq_sidebartree_bookmarks.la
-%{tde_libdir}/konq_sidebartree_bookmarks.so
-%{tde_libdir}/konq_sidebartree_dirtree.la
-%{tde_libdir}/konq_sidebartree_dirtree.so
-%{tde_libdir}/konq_sidebartree_history.la
-%{tde_libdir}/konq_sidebartree_history.so
-%{tde_libdir}/konqsidebar_tree.la
-%{tde_libdir}/konqsidebar_tree.so
-%{tde_libdir}/konqsidebar_web.la
-%{tde_libdir}/konqsidebar_web.so
-%{tde_libdir}/konqueror.la
-%{tde_libdir}/konqueror.so
-%{tde_libdir}/libkhtmlkttsdplugin.la
-%{tde_libdir}/libkhtmlkttsdplugin.so
-%{_libdir}/lib[kt]deinit_keditbookmarks.la
-%{_libdir}/lib[kt]deinit_keditbookmarks.so
-%{_libdir}/lib[kt]deinit_kfmclient.la
-%{_libdir}/lib[kt]deinit_kfmclient.so
-%{_libdir}/lib[kt]deinit_konqueror.la
-%{_libdir}/lib[kt]deinit_konqueror.so
-%{_libdir}/libkonqsidebarplugin.so.*
-%{tde_appdir}/Home.desktop
-%{tde_appdir}/kcmhistory.desktop
-%{tde_appdir}/kfmclient.desktop
-%{tde_appdir}/kfmclient_dir.desktop
-%{tde_appdir}/kfmclient_html.desktop
-%{tde_appdir}/kfmclient_war.desktop
-%{tde_appdir}/khtml_filter.desktop
-%{tde_appdir}/konqbrowser.desktop
-%{tde_appdir}/konquerorsu.desktop
-%{_datadir}/applnk/.hidden/konqfilemgr.desktop
-%{_datadir}/applnk/Internet/keditbookmarks.desktop
-%{_datadir}/applnk/konqueror.desktop
-%{_datadir}/apps/kconf_update/kfmclient_3_2.upd
-%{_datadir}/apps/kconf_update/kfmclient_3_2_update.sh
-%{_datadir}/apps/kconf_update/konqsidebartng.upd
-%{_datadir}/apps/kconf_update/move_konqsidebartng_entries.sh
-%{_datadir}/apps/keditbookmarks/keditbookmarks-genui.rc
-%{_datadir}/apps/keditbookmarks/keditbookmarksui.rc
-%{_datadir}/apps/khtml/kpartplugins/khtmlkttsd.desktop
-%{_datadir}/apps/khtml/kpartplugins/khtmlkttsd.rc
-%{_datadir}/apps/konqiconview/
-%{_datadir}/apps/konqlistview/
-%exclude %{_datadir}/apps/konqsidebartng/virtual_folders/services/fonts.desktop
-%{_datadir}/apps/konqsidebartng/
-%{_datadir}/apps/konqueror/about/
-%{_datadir}/apps/konqueror/icons/
-%{_datadir}/apps/konqueror/konq-simplebrowser.rc
-%{_datadir}/apps/konqueror/konqueror.rc
-%{_datadir}/apps/konqueror/pics/indicator_connect.png
-%{_datadir}/apps/konqueror/pics/indicator_empty.png
-%{_datadir}/apps/konqueror/pics/indicator_noconnect.png
-%{_datadir}/apps/konqueror/pics/indicator_viewactive.png
-%{_datadir}/apps/konqueror/profiles/
-%exclude %{_datadir}/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop
-%exclude %{_datadir}/apps/konqueror/servicemenus/konsolehere.desktop
-%exclude %{_datadir}/apps/konqueror/servicemenus/installfont.desktop
-%{_datadir}/apps/konqueror/servicemenus/*.desktop
-%{_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase
-%{_datadir}/apps/konqueror/tiles/*.png
-%{_datadir}/autostart/konqy_preload.desktop
-%{_datadir}/config.kcfg/keditbookmarks.kcfg
-%{_datadir}/config.kcfg/konq_listview.kcfg
-%{_datadir}/config.kcfg/konqueror.kcfg
-%{_datadir}/icons/crystalsvg/*/apps/keditbookmarks.png
-%{_datadir}/icons/crystalsvg/*/apps/kfm_home.svgz
-%{_datadir}/icons/hicolor/*/apps/kfm.png
-%{_datadir}/icons/hicolor/*/apps/konqueror.*
-%{_datadir}/services/kded/konqy_preloader.desktop
-%{_datadir}/services/konq_*.desktop
-%{_datadir}/servicetypes/konqaboutpage.desktop
-%{tde_docdir}/HTML/en/konqueror/
+%{tde_datadir}/config/konqsidebartng.rc
+%{tde_bindir}/kbookmarkmerger
+%{tde_bindir}/keditbookmarks
+%{tde_bindir}/kfmclient
+%{tde_bindir}/konqueror
+%{tde_tdelibdir}/kcm_history.la
+%{tde_tdelibdir}/kcm_history.so
+%{tde_tdelibdir}/kded_konqy_preloader.la
+%{tde_tdelibdir}/kded_konqy_preloader.so
+%{tde_tdelibdir}/keditbookmarks.la
+%{tde_tdelibdir}/keditbookmarks.so
+%{tde_tdelibdir}/kfmclient.la
+%{tde_tdelibdir}/kfmclient.so
+%{tde_tdelibdir}/konq_aboutpage.la
+%{tde_tdelibdir}/konq_aboutpage.so
+%{tde_tdelibdir}/konq_iconview.la
+%{tde_tdelibdir}/konq_iconview.so
+%{tde_tdelibdir}/konq_listview.la
+%{tde_tdelibdir}/konq_listview.so
+%{tde_tdelibdir}/konq_remoteencoding.la
+%{tde_tdelibdir}/konq_remoteencoding.so
+%{tde_tdelibdir}/konq_shellcmdplugin.la
+%{tde_tdelibdir}/konq_shellcmdplugin.so
+%{tde_tdelibdir}/konq_sidebar.la
+%{tde_tdelibdir}/konq_sidebar.so
+%{tde_tdelibdir}/konq_sidebartree_bookmarks.la
+%{tde_tdelibdir}/konq_sidebartree_bookmarks.so
+%{tde_tdelibdir}/konq_sidebartree_dirtree.la
+%{tde_tdelibdir}/konq_sidebartree_dirtree.so
+%{tde_tdelibdir}/konq_sidebartree_history.la
+%{tde_tdelibdir}/konq_sidebartree_history.so
+%{tde_tdelibdir}/konqsidebar_tree.la
+%{tde_tdelibdir}/konqsidebar_tree.so
+%{tde_tdelibdir}/konqsidebar_web.la
+%{tde_tdelibdir}/konqsidebar_web.so
+%{tde_tdelibdir}/konqueror.la
+%{tde_tdelibdir}/konqueror.so
+%{tde_tdelibdir}/libkhtmlkttsdplugin.la
+%{tde_tdelibdir}/libkhtmlkttsdplugin.so
+%{tde_libdir}/lib[kt]deinit_keditbookmarks.la
+%{tde_libdir}/lib[kt]deinit_keditbookmarks.so
+%{tde_libdir}/lib[kt]deinit_kfmclient.la
+%{tde_libdir}/lib[kt]deinit_kfmclient.so
+%{tde_libdir}/lib[kt]deinit_konqueror.la
+%{tde_libdir}/lib[kt]deinit_konqueror.so
+%{tde_libdir}/libkonqsidebarplugin.so.*
+%{tde_tdeappdir}/Home.desktop
+%{tde_tdeappdir}/kcmhistory.desktop
+%{tde_tdeappdir}/kfmclient.desktop
+%{tde_tdeappdir}/kfmclient_dir.desktop
+%{tde_tdeappdir}/kfmclient_html.desktop
+%{tde_tdeappdir}/kfmclient_war.desktop
+%{tde_tdeappdir}/khtml_filter.desktop
+%{tde_tdeappdir}/konqbrowser.desktop
+%{tde_tdeappdir}/konquerorsu.desktop
+%{tde_datadir}/applnk/.hidden/konqfilemgr.desktop
+%{tde_datadir}/applnk/Internet/keditbookmarks.desktop
+%{tde_datadir}/applnk/konqueror.desktop
+%{tde_datadir}/apps/kconf_update/kfmclient_3_2.upd
+%{tde_datadir}/apps/kconf_update/kfmclient_3_2_update.sh
+%{tde_datadir}/apps/kconf_update/konqsidebartng.upd
+%{tde_datadir}/apps/kconf_update/move_konqsidebartng_entries.sh
+%{tde_datadir}/apps/keditbookmarks/keditbookmarks-genui.rc
+%{tde_datadir}/apps/keditbookmarks/keditbookmarksui.rc
+%{tde_datadir}/apps/khtml/kpartplugins/khtmlkttsd.desktop
+%{tde_datadir}/apps/khtml/kpartplugins/khtmlkttsd.rc
+%{tde_datadir}/apps/konqiconview/
+%{tde_datadir}/apps/konqlistview/
+%exclude %{tde_datadir}/apps/konqsidebartng/virtual_folders/services/fonts.desktop
+%{tde_datadir}/apps/konqsidebartng/
+%{tde_datadir}/apps/konqueror/about/
+%{tde_datadir}/apps/konqueror/icons/
+%{tde_datadir}/apps/konqueror/konq-simplebrowser.rc
+%{tde_datadir}/apps/konqueror/konqueror.rc
+%{tde_datadir}/apps/konqueror/pics/indicator_connect.png
+%{tde_datadir}/apps/konqueror/pics/indicator_empty.png
+%{tde_datadir}/apps/konqueror/pics/indicator_noconnect.png
+%{tde_datadir}/apps/konqueror/pics/indicator_viewactive.png
+%{tde_datadir}/apps/konqueror/profiles/
+%exclude %{tde_datadir}/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop
+%exclude %{tde_datadir}/apps/konqueror/servicemenus/konsolehere.desktop
+%exclude %{tde_datadir}/apps/konqueror/servicemenus/installfont.desktop
+%{tde_datadir}/apps/konqueror/servicemenus/*.desktop
+%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase
+%{tde_datadir}/apps/konqueror/tiles/*.png
+%{tde_datadir}/autostart/konqy_preload.desktop
+%{tde_datadir}/config.kcfg/keditbookmarks.kcfg
+%{tde_datadir}/config.kcfg/konq_listview.kcfg
+%{tde_datadir}/config.kcfg/konqueror.kcfg
+%{tde_datadir}/icons/crystalsvg/*/apps/keditbookmarks.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kfm_home.svgz
+%{tde_datadir}/icons/hicolor/*/apps/kfm.png
+%{tde_datadir}/icons/hicolor/*/apps/konqueror.*
+%{tde_datadir}/services/kded/konqy_preloader.desktop
+%{tde_datadir}/services/konq_*.desktop
+%{tde_datadir}/servicetypes/konqaboutpage.desktop
+%{tde_tdedocdir}/HTML/en/konqueror/
 
 %post -n trinity-konqueror
 update-desktop-database %{tde_appdir} 2> /dev/null || : 
 for f in crystalsvg hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 /sbin/ldconfig || :
 alternatives --install \
-  %{_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop \
+  %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop \
   media_safelyremove.desktop_konqueror \
-  %{_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase \
+  %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase \
   10
 
 %postun -n trinity-konqueror
 update-desktop-database %{tde_appdir} 2> /dev/null || : 
 for f in crystalsvg hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 /sbin/ldconfig || :
+
+%preun -n trinity-konqueror
 if [ $1 -eq 0 ]; then
   alternatives --remove \
-    media_safelyremove.desktop_konqueror
-    %{_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase
+    media_safelyremove.desktop_konqueror \
+    %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase
 fi
 
 ##########
@@ -2232,10 +2292,10 @@ Requires:	trinity-konqueror = %{version}-%{release}
 %{summary}
 
 %files -n trinity-konqueror-devel
-%{_includedir}/konqsidebarplugin.h
-%{_includedir}/KonquerorIface.h
-%{_libdir}/libkonqsidebarplugin.la
-%{_libdir}/libkonqsidebarplugin.so
+%{tde_includedir}/konqsidebarplugin.h
+%{tde_includedir}/KonquerorIface.h
+%{tde_libdir}/libkonqsidebarplugin.la
+%{tde_libdir}/libkonqsidebarplugin.so
 
 %post -n trinity-konqueror-devel
 /sbin/ldconfig || :
@@ -2255,14 +2315,14 @@ This package includes support for Netscape plugins in Konqueror.
 
 %files -n trinity-konqueror-nsplugins
 %defattr(-,root,root,-)
-%{_bindir}/nspluginscan
-%{_bindir}/nspluginviewer
-%{tde_libdir}/kcm_nsplugins.la
-%{tde_libdir}/kcm_nsplugins.so
-%{tde_libdir}/libnsplugin.la
-%{tde_libdir}/libnsplugin.so
-%{tde_appdir}/khtml_plugins.desktop
-%{_datadir}/apps/plugin/nspluginpart.rc
+%{tde_bindir}/nspluginscan
+%{tde_bindir}/nspluginviewer
+%{tde_tdelibdir}/kcm_nsplugins.la
+%{tde_tdelibdir}/kcm_nsplugins.so
+%{tde_tdelibdir}/libnsplugin.la
+%{tde_tdelibdir}/libnsplugin.so
+%{tde_tdeappdir}/khtml_plugins.desktop
+%{tde_datadir}/apps/plugin/nspluginpart.rc
 
 %post -n trinity-konqueror-nsplugins
 update-desktop-database %{tde_appdir} 2> /dev/null || : 
@@ -2294,47 +2354,47 @@ Using Konsole, a user can open:
 
 %files -n trinity-konsole
 %defattr(-,root,root,-)
-%{_bindir}/konsole
-%{tde_libdir}/kcm_konsole.la
-%{tde_libdir}/kcm_konsole.so
-%{tde_libdir}/kded_kwrited.la
-%{tde_libdir}/kded_kwrited.so
-%{tde_libdir}/konsole.la
-%{tde_libdir}/konsole.so
-%{tde_libdir}/libkonsolepart.la
-%{tde_libdir}/libkonsolepart.so
-%{_libdir}/lib[kt]deinit_konsole.la
-%{_libdir}/lib[kt]deinit_konsole.so
-%{tde_appdir}/konsole.desktop
-%{tde_appdir}/konsolesu.desktop
-%{_datadir}/applnk/.hidden/kcmkonsole.desktop
-%{_datadir}/apps/kconf_update/konsole.upd
-%{_datadir}/apps/kconf_update/schemaStrip.pl
-%{_datadir}/apps/konqueror/servicemenus/konsolehere.desktop
-%{_datadir}/apps/konsole/
-%{_datadir}/icons/hicolor/*/apps/konsole.*
-%{_datadir}/mimelnk/application/x-konsole.desktop
-%{_datadir}/services/kded/kwrited.desktop
-%{_datadir}/services/konsolepart.desktop
-%{_datadir}/services/konsole-script.desktop
-%{_datadir}/services/kwrited.desktop
-%{_datadir}/servicetypes/terminalemulator.desktop
-%exclude %{tde_docdir}/HTML/en/kcontrol/kcmkonsole/
-%{tde_docdir}/HTML/en/konsole/
+%{tde_bindir}/konsole
+%{tde_tdelibdir}/kcm_konsole.la
+%{tde_tdelibdir}/kcm_konsole.so
+%{tde_tdelibdir}/kded_kwrited.la
+%{tde_tdelibdir}/kded_kwrited.so
+%{tde_tdelibdir}/konsole.la
+%{tde_tdelibdir}/konsole.so
+%{tde_tdelibdir}/libkonsolepart.la
+%{tde_tdelibdir}/libkonsolepart.so
+%{tde_libdir}/lib[kt]deinit_konsole.la
+%{tde_libdir}/lib[kt]deinit_konsole.so
+%{tde_tdeappdir}/konsole.desktop
+%{tde_tdeappdir}/konsolesu.desktop
+%{tde_datadir}/applnk/.hidden/kcmkonsole.desktop
+%{tde_datadir}/apps/kconf_update/konsole.upd
+%{tde_datadir}/apps/kconf_update/schemaStrip.pl
+%{tde_datadir}/apps/konqueror/servicemenus/konsolehere.desktop
+%{tde_datadir}/apps/konsole/
+%{tde_datadir}/icons/hicolor/*/apps/konsole.*
+%{tde_datadir}/mimelnk/application/x-konsole.desktop
+%{tde_datadir}/services/kded/kwrited.desktop
+%{tde_datadir}/services/konsolepart.desktop
+%{tde_datadir}/services/konsole-script.desktop
+%{tde_datadir}/services/kwrited.desktop
+%{tde_datadir}/servicetypes/terminalemulator.desktop
+%exclude %{tde_tdedocdir}/HTML/en/kcontrol/kcmkonsole/
+%{tde_tdedocdir}/HTML/en/konsole/
 
 %post -n trinity-konsole
 update-desktop-database %{tde_appdir} 2> /dev/null || : 
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 /sbin/ldconfig || :
 
 %postun -n trinity-konsole
 update-desktop-database %{tde_appdir} 2> /dev/null || : 
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 /sbin/ldconfig || :
 
@@ -2352,24 +2412,24 @@ applications. It is used to switch between applications or desktops.
 
 %files -n trinity-kpager
 %defattr(-,root,root,-)
-%{_bindir}/kpager
-%{tde_appdir}/kpager.desktop
-%{_datadir}/applnk/Utilities/kpager.desktop
-%{_datadir}/icons/hicolor/*/apps/kpager.png
-%{tde_docdir}/HTML/en/kpager/
+%{tde_bindir}/kpager
+%{tde_tdeappdir}/kpager.desktop
+%{tde_datadir}/applnk/Utilities/kpager.desktop
+%{tde_datadir}/icons/hicolor/*/apps/kpager.png
+%{tde_tdedocdir}/HTML/en/kpager/
 
 %post -n trinity-kpager
 update-desktop-database %{tde_appdir} 2> /dev/null || : 
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 
 %postun -n trinity-kpager
 update-desktop-database %{tde_appdir} 2> /dev/null || : 
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 
 ##########
@@ -2387,24 +2447,24 @@ automatically started. KPersonalizer can also be called later.
 
 %files -n trinity-kpersonalizer
 %defattr(-,root,root,-)
-%{_bindir}/kpersonalizer
-%{tde_appdir}/kpersonalizer.desktop
-%{_datadir}/applnk/System/kpersonalizer.desktop
-%{_datadir}/apps/kpersonalizer/
-%{_datadir}/icons/crystalsvg/*/apps/kpersonalizer.png
+%{tde_bindir}/kpersonalizer
+%{tde_tdeappdir}/kpersonalizer.desktop
+%{tde_datadir}/applnk/System/kpersonalizer.desktop
+%{tde_datadir}/apps/kpersonalizer/
+%{tde_datadir}/icons/crystalsvg/*/apps/kpersonalizer.png
 
 %post -n trinity-kpersonalizer
 update-desktop-database %{tde_appdir} 2> /dev/null || : 
 for f in crystalsvg ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 
 %postun -n trinity-kpersonalizer
 update-desktop-database %{tde_appdir} 2> /dev/null || : 
 for f in crystalsvg ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 
 ##########
@@ -2428,19 +2488,19 @@ KDE will start, but many good defaults will not be set.
 
 %files -n trinity-ksmserver
 %defattr(-,root,root,-)
-%{_bindir}/ksmserver
-%{_bindir}/start[kt]de
-%{tde_libdir}/ksmserver.la
-%{tde_libdir}/ksmserver.so
-%{_libdir}/lib[kt]deinit_ksmserver.la
-%{_libdir}/lib[kt]deinit_ksmserver.so
-%{_datadir}/apps/kconf_update/ksmserver.upd
-%{_datadir}/apps/kconf_update/move_session_config.sh
-%{_datadir}/apps/ksmserver/pics/shutdownkonq.png
+%{tde_bindir}/ksmserver
+%{tde_bindir}/start[kt]de
+%{tde_tdelibdir}/ksmserver.la
+%{tde_tdelibdir}/ksmserver.so
+%{tde_libdir}/lib[kt]deinit_ksmserver.la
+%{tde_libdir}/lib[kt]deinit_ksmserver.so
+%{tde_datadir}/apps/kconf_update/ksmserver.upd
+%{tde_datadir}/apps/kconf_update/move_session_config.sh
+%{tde_datadir}/apps/ksmserver/pics/shutdownkonq.png
 
 # Remove conflicts with redhat-menus
 %if "%{?_prefix}" != "/usr"
-%{_bindir}/plasma-desktop
+%{tde_bindir}/plasma-desktop
 %endif
 
 ##########
@@ -2456,28 +2516,28 @@ a TDE session is launched.
 
 %files -n trinity-ksplash
 %defattr(-,root,root,-)
-%{_bindir}/ksplash
-%{_bindir}/ksplashsimple
-%{tde_libdir}/kcm_ksplashthemes.la
-%{tde_libdir}/kcm_ksplashthemes.so
-%{tde_libdir}/ksplashdefault.la
-%{tde_libdir}/ksplashdefault.so
-%{tde_libdir}/ksplashunified.la
-%{tde_libdir}/ksplashunified.so
-%{tde_libdir}/ksplashredmond.la
-%{tde_libdir}/ksplashredmond.so
-%{tde_libdir}/ksplashstandard.la
-%{tde_libdir}/ksplashstandard.so
-%{_libdir}/libksplashthemes.so.*
-%{tde_appdir}/ksplashthememgr.desktop
-%{_datadir}/apps/ksplash
-%{_datadir}/services/ksplashdefault.desktop
-%{_datadir}/services/ksplash.desktop
-%{_datadir}/services/ksplashunified.desktop
-%{_datadir}/services/ksplashredmond.desktop
-%{_datadir}/services/ksplashstandard.desktop
-%{_datadir}/servicetypes/ksplashplugins.desktop
-%{tde_docdir}/HTML/en/ksplashml/
+%{tde_bindir}/ksplash
+%{tde_bindir}/ksplashsimple
+%{tde_tdelibdir}/kcm_ksplashthemes.la
+%{tde_tdelibdir}/kcm_ksplashthemes.so
+%{tde_tdelibdir}/ksplashdefault.la
+%{tde_tdelibdir}/ksplashdefault.so
+%{tde_tdelibdir}/ksplashunified.la
+%{tde_tdelibdir}/ksplashunified.so
+%{tde_tdelibdir}/ksplashredmond.la
+%{tde_tdelibdir}/ksplashredmond.so
+%{tde_tdelibdir}/ksplashstandard.la
+%{tde_tdelibdir}/ksplashstandard.so
+%{tde_libdir}/libksplashthemes.so.*
+%{tde_tdeappdir}/ksplashthememgr.desktop
+%{tde_datadir}/apps/ksplash
+%{tde_datadir}/services/ksplashdefault.desktop
+%{tde_datadir}/services/ksplash.desktop
+%{tde_datadir}/services/ksplashunified.desktop
+%{tde_datadir}/services/ksplashredmond.desktop
+%{tde_datadir}/services/ksplashstandard.desktop
+%{tde_datadir}/servicetypes/ksplashplugins.desktop
+%{tde_tdedocdir}/HTML/en/ksplashml/
 
 %post -n trinity-ksplash
 update-desktop-database %{tde_appdir} 2> /dev/null || : 
@@ -2498,9 +2558,9 @@ Requires:	trinity-ksplash = %{version}-%{release}
 %{summary}
 
 %files -n trinity-ksplash-devel
-%{_includedir}/ksplash/*
-%{_libdir}/libksplashthemes.la
-%{_libdir}/libksplashthemes.so
+%{tde_includedir}/ksplash/*
+%{tde_libdir}/libksplashthemes.la
+%{tde_libdir}/libksplashthemes.so
 
 %post -n trinity-ksplash-devel
 /sbin/ldconfig || :
@@ -2522,31 +2582,31 @@ computer.
 
 %files -n trinity-ksysguard
 %defattr(-,root,root,-)
-%{_bindir}/kpm
-%{_bindir}/ksysguard
-%{tde_libdir}/sysguard_panelapplet.la
-%{tde_libdir}/sysguard_panelapplet.so
-%{_libdir}/libksgrd.so.*
-%{tde_appdir}/ksysguard.desktop
-%{_datadir}/apps/kicker/applets/ksysguardapplet.desktop
-%{_datadir}/apps/ksysguard/
-%{_datadir}/icons/crystalsvg/*/apps/ksysguard.png
-%{_datadir}/mimelnk/application/x-ksysguard.desktop
-%{tde_docdir}/HTML/en/ksysguard/
+%{tde_bindir}/kpm
+%{tde_bindir}/ksysguard
+%{tde_tdelibdir}/sysguard_panelapplet.la
+%{tde_tdelibdir}/sysguard_panelapplet.so
+%{tde_libdir}/libksgrd.so.*
+%{tde_tdeappdir}/ksysguard.desktop
+%{tde_datadir}/apps/kicker/applets/ksysguardapplet.desktop
+%{tde_datadir}/apps/ksysguard/
+%{tde_datadir}/icons/crystalsvg/*/apps/ksysguard.png
+%{tde_datadir}/mimelnk/application/x-ksysguard.desktop
+%{tde_tdedocdir}/HTML/en/ksysguard/
 
 %post -n trinity-ksysguard
 update-desktop-database %{tde_appdir} 2> /dev/null || : 
 for f in crystalsvg ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 /sbin/ldconfig || :
 
 %postun -n trinity-ksysguard
 update-desktop-database %{tde_appdir} 2> /dev/null || : 
 for f in crystalsvg ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 /sbin/ldconfig || :
 
@@ -2561,9 +2621,9 @@ Requires:	trinity-ksysguard = %{version}-%{release}
 %{summary}
 
 %files -n trinity-ksysguard-devel
-%{_includedir}/ksgrd/*
-%{_libdir}/libksgrd.la
-%{_libdir}/libksgrd.so
+%{tde_includedir}/ksgrd/*
+%{tde_libdir}/libksgrd.la
+%{tde_libdir}/libksgrd.so
 
 %post -n trinity-ksysguard-devel
 /sbin/ldconfig || :
@@ -2585,7 +2645,7 @@ to monitor it through the daemon running there.
 
 %files -n trinity-ksysguardd
 %defattr(-,root,root,-)
-%{_bindir}/ksysguardd
+%{tde_bindir}/ksysguardd
 %config(noreplace) %{_sysconfdir}/ksysguarddrc.tde
 
 %post -n trinity-ksysguardd
@@ -2604,26 +2664,26 @@ ktip provides many useful tips on using KDE when you log in.
 
 %files -n trinity-ktip
 %defattr(-,root,root,-)
-%{_bindir}/ktip
-%{tde_appdir}/ktip.desktop
-%{_datadir}/applnk/Toys/ktip.desktop
-%{_datadir}/apps/kdewizard/pics/wizard_small.png
-%{_datadir}/apps/kdewizard/tips/
-%{_datadir}/autostart/ktip.desktop
-%{_datadir}/icons/hicolor/*/apps/ktip.*
+%{tde_bindir}/ktip
+%{tde_tdeappdir}/ktip.desktop
+%{tde_datadir}/applnk/Toys/ktip.desktop
+%{tde_datadir}/apps/kdewizard/pics/wizard_small.png
+%{tde_datadir}/apps/kdewizard/tips/
+%{tde_datadir}/autostart/ktip.desktop
+%{tde_datadir}/icons/hicolor/*/apps/ktip.*
 
 %post -n trinity-ktip
 update-desktop-database %{tde_appdir} 2> /dev/null || : 
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 
 %postun -n trinity-ktip
 update-desktop-database %{tde_appdir} 2> /dev/null || : 
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 
 ##########
@@ -2638,61 +2698,61 @@ This package contains the default X window manager for KDE.
 
 %files -n trinity-twin
 %defattr(-,root,root,-)
-%{_bindir}/kompmgr
-%{_bindir}/[kt]win
-%{_bindir}/[kt]win_killer_helper
-#%{_bindir}/[kt]win_resumer_helper
-%{_bindir}/[kt]win_rules_dialog
-%{_libdir}/kconf_update_bin/[kt]win_update_default_rules
-%{_libdir}/kconf_update_bin/[kt]win_update_window_settings
-%{tde_libdir}/kcm_[kt]win*.la
-%{tde_libdir}/kcm_[kt]win*.so
-%{tde_libdir}/[kt]win*.la
-%{tde_libdir}/[kt]win*.so
-%{_libdir}/lib[kt]decorations.so.*
-%{_libdir}/lib[kt]deinit_[kt]win_rules_dialog.la
-%{_libdir}/lib[kt]deinit_[kt]win_rules_dialog.so
-%{_libdir}/lib[kt]deinit_[kt]win.la
-%{_libdir}/lib[kt]deinit_[kt]win.so
-%{tde_appdir}/showdesktop.desktop
-%{tde_appdir}/[kt]windecoration.desktop
-%{tde_appdir}/[kt]winoptions.desktop
-%{tde_appdir}/[kt]winrules.desktop
-%{_datadir}/applnk/.hidden/[kt]winactions.desktop
-%{_datadir}/applnk/.hidden/[kt]winadvanced.desktop
-%{_datadir}/applnk/.hidden/[kt]winfocus.desktop
-%{_datadir}/applnk/.hidden/[kt]winmoving.desktop
-%{_datadir}/applnk/.hidden/[kt]wintranslucency.desktop
-%{_datadir}/apps/kconf_update/[kt]win3_plugin.pl
-%{_datadir}/apps/kconf_update/[kt]win3_plugin.upd
-%{_datadir}/apps/kconf_update/[kt]win_focus1.sh
-%{_datadir}/apps/kconf_update/[kt]win_focus1.upd
-%{_datadir}/apps/kconf_update/[kt]win_focus2.sh
-%{_datadir}/apps/kconf_update/[kt]win_focus2.upd
-%{_datadir}/apps/kconf_update/[kt]win_fsp_workarounds_1.upd
-%{_datadir}/apps/kconf_update/[kt]winiconify.upd
-%{_datadir}/apps/kconf_update/[kt]winsticky.upd
-%{_datadir}/apps/kconf_update/[kt]win.upd
-%{_datadir}/apps/kconf_update/[kt]winupdatewindowsettings.upd
-%{_datadir}/apps/kconf_update/pluginlibFix.pl
-%{_datadir}/apps/[kt]win/
-%{_datadir}/config.kcfg/[kt]win.kcfg
-%{_datadir}/icons/crystalsvg/*/apps/[kt]win.png
-%{tde_docdir}/HTML/en/kompmgr/
+%{tde_bindir}/kompmgr
+%{tde_bindir}/[kt]win
+%{tde_bindir}/[kt]win_killer_helper
+#%{tde_bindir}/[kt]win_resumer_helper
+%{tde_bindir}/[kt]win_rules_dialog
+%{tde_libdir}/kconf_update_bin/[kt]win_update_default_rules
+%{tde_libdir}/kconf_update_bin/[kt]win_update_window_settings
+%{tde_tdelibdir}/kcm_[kt]win*.la
+%{tde_tdelibdir}/kcm_[kt]win*.so
+%{tde_tdelibdir}/[kt]win*.la
+%{tde_tdelibdir}/[kt]win*.so
+%{tde_libdir}/lib[kt]decorations.so.*
+%{tde_libdir}/lib[kt]deinit_[kt]win_rules_dialog.la
+%{tde_libdir}/lib[kt]deinit_[kt]win_rules_dialog.so
+%{tde_libdir}/lib[kt]deinit_[kt]win.la
+%{tde_libdir}/lib[kt]deinit_[kt]win.so
+%{tde_tdeappdir}/showdesktop.desktop
+%{tde_tdeappdir}/[kt]windecoration.desktop
+%{tde_tdeappdir}/[kt]winoptions.desktop
+%{tde_tdeappdir}/[kt]winrules.desktop
+%{tde_datadir}/applnk/.hidden/[kt]winactions.desktop
+%{tde_datadir}/applnk/.hidden/[kt]winadvanced.desktop
+%{tde_datadir}/applnk/.hidden/[kt]winfocus.desktop
+%{tde_datadir}/applnk/.hidden/[kt]winmoving.desktop
+%{tde_datadir}/applnk/.hidden/[kt]wintranslucency.desktop
+%{tde_datadir}/apps/kconf_update/[kt]win3_plugin.pl
+%{tde_datadir}/apps/kconf_update/[kt]win3_plugin.upd
+%{tde_datadir}/apps/kconf_update/[kt]win_focus1.sh
+%{tde_datadir}/apps/kconf_update/[kt]win_focus1.upd
+%{tde_datadir}/apps/kconf_update/[kt]win_focus2.sh
+%{tde_datadir}/apps/kconf_update/[kt]win_focus2.upd
+%{tde_datadir}/apps/kconf_update/[kt]win_fsp_workarounds_1.upd
+%{tde_datadir}/apps/kconf_update/[kt]winiconify.upd
+%{tde_datadir}/apps/kconf_update/[kt]winsticky.upd
+%{tde_datadir}/apps/kconf_update/[kt]win.upd
+%{tde_datadir}/apps/kconf_update/[kt]winupdatewindowsettings.upd
+%{tde_datadir}/apps/kconf_update/pluginlibFix.pl
+%{tde_datadir}/apps/[kt]win/
+%{tde_datadir}/config.kcfg/[kt]win.kcfg
+%{tde_datadir}/icons/crystalsvg/*/apps/[kt]win.png
+%{tde_tdedocdir}/HTML/en/kompmgr/
 
 %post -n trinity-twin
 update-desktop-database %{tde_appdir} 2> /dev/null || : 
 for f in crystalsvg ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 /sbin/ldconfig || :
 
 %postun -n trinity-twin
 update-desktop-database %{tde_appdir} 2> /dev/null || : 
 for f in crystalsvg ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 /sbin/ldconfig || :
 
@@ -2707,15 +2767,15 @@ Requires:	trinity-twin = %{version}-%{release}
 %{summary}
 
 %files -n trinity-twin-devel
-%{_includedir}/[kt]win/
-%{_includedir}/kcommondecoration.h
-%{_includedir}/kdecoration.h
-%{_includedir}/kdecoration_p.h
-%{_includedir}/kdecoration_plugins_p.h
-%{_includedir}/kdecorationfactory.h
-%{_includedir}/KWinInterface.h
-%{_libdir}/libkdecorations.la
-%{_libdir}/libkdecorations.so
+%{tde_includedir}/[kt]win/
+%{tde_includedir}/kcommondecoration.h
+%{tde_includedir}/kdecoration.h
+%{tde_includedir}/kdecoration_p.h
+%{tde_includedir}/kdecoration_plugins_p.h
+%{tde_includedir}/kdecorationfactory.h
+%{tde_includedir}/KWinInterface.h
+%{tde_libdir}/libkdecorations.la
+%{tde_libdir}/libkdecorations.so
 
 %post -n trinity-twin-devel
 /sbin/ldconfig || :
@@ -2735,21 +2795,21 @@ Konqueror and the kdesktop package.
 
 %files -n trinity-libkonq
 %defattr(-,root,root,-)
-%{tde_libdir}/kded_favicons.la
-%{tde_libdir}/kded_favicons.so
-%{tde_libdir}/konq_sound.la
-%{tde_libdir}/konq_sound.so
-%{_libdir}/libkonq.so.*
-%{_datadir}/apps/kbookmark/directory_bookmarkbar.desktop
-%{_datadir}/apps/kconf_update/favicons.upd
-%{_datadir}/apps/kconf_update/move_favicons.sh
-%{_datadir}/apps/konqueror/pics/arrow_bottomleft.png
-%{_datadir}/apps/konqueror/pics/arrow_bottomright.png
-%{_datadir}/apps/konqueror/pics/arrow_topleft.png
-%{_datadir}/apps/konqueror/pics/arrow_topright.png
-%{_datadir}/apps/konqueror/pics/thumbnailfont_7x4.png
-%{_datadir}/services/kded/favicons.desktop
-%{_datadir}/servicetypes/konqpopupmenuplugin.desktop
+%{tde_tdelibdir}/kded_favicons.la
+%{tde_tdelibdir}/kded_favicons.so
+%{tde_tdelibdir}/konq_sound.la
+%{tde_tdelibdir}/konq_sound.so
+%{tde_libdir}/libkonq.so.*
+%{tde_datadir}/apps/kbookmark/directory_bookmarkbar.desktop
+%{tde_datadir}/apps/kconf_update/favicons.upd
+%{tde_datadir}/apps/kconf_update/move_favicons.sh
+%{tde_datadir}/apps/konqueror/pics/arrow_bottomleft.png
+%{tde_datadir}/apps/konqueror/pics/arrow_bottomright.png
+%{tde_datadir}/apps/konqueror/pics/arrow_topleft.png
+%{tde_datadir}/apps/konqueror/pics/arrow_topright.png
+%{tde_datadir}/apps/konqueror/pics/thumbnailfont_7x4.png
+%{tde_datadir}/services/kded/favicons.desktop
+%{tde_datadir}/servicetypes/konqpopupmenuplugin.desktop
 
 %post -n trinity-libkonq
 /sbin/ldconfig || :
@@ -2771,12 +2831,12 @@ These libraries allow you to use TDE dialogs in native TQt3 applications.
 
 %files libtqt3-integration
 %defattr(-,root,root,-)
-%{tde_libdir}/plugins/integration/libqtkde.la
-%{tde_libdir}/plugins/integration/libqtkde.so
-%{tde_libdir}/plugins/integration/libqtkde.so.*
-%{tde_libdir}/kded_kdeintegration.la
-%{tde_libdir}/kded_kdeintegration.so
-%{_datadir}/services/kded/kdeintegration.desktop
+%{tde_tdelibdir}/plugins/integration/libqtkde.la
+%{tde_tdelibdir}/plugins/integration/libqtkde.so
+%{tde_tdelibdir}/plugins/integration/libqtkde.so.*
+%{tde_tdelibdir}/kded_kdeintegration.la
+%{tde_tdelibdir}/kded_kdeintegration.so
+%{tde_datadir}/services/kded/kdeintegration.desktop
 
 ##########
 
@@ -2791,14 +2851,14 @@ Konqueror libraries.
 
 %files -n trinity-libkonq-devel
 %defattr(-,root,root,-)
-%{_includedir}/kfileivi.h
-%{_includedir}/kivdirectoryoverlay.h
-%{_includedir}/knewmenu.h
-%{_includedir}/konqbookmarkmanager.h
-%{_includedir}/konq_*.h
-%{_includedir}/libkonq_export.h
-%{_libdir}/libkonq.la
-%{_libdir}/libkonq.so
+%{tde_includedir}/kfileivi.h
+%{tde_includedir}/kivdirectoryoverlay.h
+%{tde_includedir}/knewmenu.h
+%{tde_includedir}/konqbookmarkmanager.h
+%{tde_includedir}/konq_*.h
+%{tde_includedir}/libkonq_export.h
+%{tde_libdir}/libkonq.la
+%{tde_libdir}/libkonq.so
 
 %post -n trinity-libkonq-devel
 /sbin/ldconfig || :
@@ -2819,13 +2879,15 @@ Konqueror libraries.
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
-%patch13 -p1
+%if 0%{?rhel} || 0%{?fedora}
+%patch13 -p1 -b .Xsession
+%endif
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
 
 %patch20 -p4
-%if 0%{?rhel} > 0
+%if 0%{?rhel} || 0%{?mgaversion}
 %patch21 -p1
 %endif
 %patch22 -p1
@@ -2839,7 +2901,7 @@ Konqueror libraries.
 %patch30 -p1
 %patch31 -p1
 %patch32 -p1
-%if 0%{?fedora} >= 15
+%if 0%{?fedora} >= 15 || 0%{?mgaversion}
 %patch33 -p1
 %patch34 -p1
 %endif
@@ -2870,6 +2932,7 @@ Konqueror libraries.
 %patch59 -p1
 %patch60 -p1
 %patch61 -p1
+%patch62 -p1
 
 # Applies an optional distro-specific graphical theme
 %if "%{?tde_bg}" != ""
@@ -2901,16 +2964,25 @@ Konqueror libraries.
 %__sed -i "startkde" \
 	-e "s|/opt/trinity|%{_prefix}|g"
 
+# TDE default start button icon
+%__sed -i "startkde" \
+	-e "s|%%{tde_starticon}|%{tde_starticon}|g"
+
+
 %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}"
 
-%__mkdir build
-cd build
+%{?!mgaversion:%__mkdir build; cd build}
 %cmake \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  -DCMAKE_SKIP_RPATH="OFF" \
   -DWITH_SASL=ON \
   -DWITH_LDAP=ON \
   -DWITH_SAMBA=ON \
@@ -2930,32 +3002,48 @@ cd build
   -DWITH_LIBUSB=ON \
   -DWITH_LIBRAW1394=ON \
   -DWITH_PAM=ON \
-  -DWITH_SHADOW=OFF \
   -DWITH_XDMCP=ON \
   -DWITH_XINERAMA=ON \
   -DWITH_ARTS=ON \
-  -DWITH_I8K=OFF \
+  -DWITH_I8K=ON \
   -DWITH_HAL=ON \
   -DBUILD_ALL=ON \
   -DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" \
   -DKDM_PAM_SERVICE="kdm-trinity" \
   -DKSCREENSAVER_PAM_SERVICE="kscreensaver-trinity" \
+  -DWITH_XSCREENSAVER=ON \
   ..
 
-%__make %{?_smp_mflags} 
+%__make %{?_smp_mflags}
 
 %install
 %__rm -rf %{?buildroot}
 %__make install DESTDIR=%{?buildroot} -C build
 
+
 # Adds a GDM/KDM/XDM session called 'TDE'
+%if 0%{?rhel} || 0%{?fedora}
 %__install -D -m 644 \
-	"%{?buildroot}%{_datadir}/apps/kdm/sessions/tde.desktop" \
+	"%{?buildroot}%{tde_datadir}/apps/kdm/sessions/tde.desktop" \
 	"%{?buildroot}%{_usr}/share/xsessions/tde.desktop"
 
 # Force session name to be 'TDE'
 %__sed -i "%{?buildroot}%{_usr}/share/xsessions/tde.desktop" \
 	-e "s,^Name=.*,Name=TDE,"
+%endif
+
+# Mageia/Mandriva stores its session file in different folder than RHEL/Fedora
+%if 0%{?mgaversion}
+%__install -d -m 755 %{?buildroot}%{_sysconfdir}/X11/wmsession.d
+cat <<EOF >"%{?buildroot}%{_sysconfdir}/X11/wmsession.d/45TDE"
+NAME=TDE
+ICON=kde-wmsession.xpm
+DESC=The Trinity Desktop Environment
+EXEC=%{tde_bindir}/startkde
+SCRIPT:
+exec %{tde_bindir}/startkde
+EOF
+%endif
 
 # Renames '/etc/ksysguarddrc' to avoid conflict with KDE4 'ksysguard'
 %__mv -f \
@@ -2964,7 +3052,7 @@ cd build
 
 # TDE 3.5.12: add script "plasma-desktop" to avoid conflict with KDE4
 %if "%{?_prefix}" != "/usr"
-%__install -m 755 "%{SOURCE1}" "%{?buildroot}%{_bindir}"
+%__install -m 755 "%{SOURCE1}" "%{?buildroot}%{tde_bindir}"
 %endif
 
 # PAM configuration files
@@ -2974,7 +3062,7 @@ cd build
 %__install -D -m 644 "%{SOURCE5}" "%{?buildroot}%{_sysconfdir}/pam.d/kscreensaver-trinity"
 
 # KDM configuration for RHEL/Fedora
-%__sed -i "%{?buildroot}%{_datadir}/config/kdm/kdmrc" \
+%__sed -i "%{?buildroot}%{tde_datadir}/config/kdm/kdmrc" \
 %if 0%{?fedora} >= 16
 	-e "s/^#*MinShowUID=.*/MinShowUID=1000/"
 %else
@@ -2988,24 +3076,26 @@ cd build
 %endif
 
 # Symlinks 'usb.ids'
-%__rm -f "%{?buildroot}%{_datadir}/apps/usb.ids"
-%__ln_s -f "/usr/share/hwdata/usb.ids" "%{?buildroot}%{_datadir}/apps/usb.ids"
+%__rm -f "%{?buildroot}%{tde_datadir}/apps/usb.ids"
+%__ln_s -f "/usr/share/hwdata/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids"
 
 # Makes 'media_safelyremove.desktop' an alternative
-%__mv -f %{buildroot}%{_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop %{buildroot}%{_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase
-%__ln_s /etc/alternatives/media_safelyremove.desktop_tdebase %{buildroot}%{_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop
+%__mv -f %{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop %{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase
+%__ln_s /etc/alternatives/media_safelyremove.desktop_tdebase %{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop
 
 
 %clean
 %__rm -rf %{?buildroot}
 
 
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING COPYING-DOCS README README.pam
 
 
 %changelog
+* Sat Jul 14 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-26
+- Add xscreensaver support to CMake [Bug #659] [Commit #80deb529]
+- Enables 'shadow' support
+- Enables 'i8k' support
+
 * Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-25
 - Fix menu crash with disabled search field [Bug #1081] [Commit #0afb2d8a]
 - Makes 'media_safelyremove.desktop' an alternative
diff --git a/redhat/kdebindings/kdebindings-3.5.13-missing_ldflags.patch b/redhat/kdebindings/kdebindings-3.5.13-missing_ldflags.patch
new file mode 100644
index 000000000..6bd08744a
--- /dev/null
+++ b/redhat/kdebindings/kdebindings-3.5.13-missing_ldflags.patch
@@ -0,0 +1,32 @@
+--- kdebindings/smoke/kde/Makefile.am.ORI	2012-07-30 14:03:33.850946697 +0200
++++ kdebindings/smoke/kde/Makefile.am	2012-07-30 14:04:22.961921086 +0200
+@@ -9,7 +9,7 @@
+ libsmokekde_la_LDFLAGS = -version-info 3:2:2 -no-undefined $(all_libraries) $(GLINC) $(KDE_RPATH)
+ 
+ # the libraries to link against.
+-libsmokekde_la_LIBADD   = $(LIB_KHTML) -lkjs -lfontconfig $(LIB_KMDI) $(LIB_KNS) $(LIB_KSPELL) $(LIB_KUTILS) $(LIB_KDEPRINT) $(GLLIB)
++libsmokekde_la_LIBADD   = $(LIB_KHTML) -lkjs -lfontconfig $(LIB_KMDI) $(LIB_KNS) $(LIB_KSPELL) $(LIB_KUTILS) $(LIB_KDEPRINT) $(GLLIB) -lqt-mt -lkdeui -lkdecore -lDCOP -lkio -lkparts -lkdefx
+ 
+ x_sources =  x_1.cpp x_2.cpp x_3.cpp x_4.cpp x_5.cpp x_6.cpp x_7.cpp \
+    x_8.cpp x_9.cpp x_10.cpp x_11.cpp x_12.cpp x_13.cpp x_14.cpp x_15.cpp \
+--- kdebindings/kdejava/koala/kdejava/Makefile.am.ORI	2012-07-30 14:18:07.024345627 +0200
++++ kdebindings/kdejava/koala/kdejava/Makefile.am	2012-07-30 14:18:19.055092255 +0200
+@@ -33,6 +33,6 @@
+ 
+ libkdejava_la_LDFLAGS = $(all_libraries) -no-undefined -version-info $(SOMAJOR):$(SOMINOR):$(SOSUBMINOR) 
+ 
+-libkdejava_la_LIBADD = $(top_builddir)/qtjava/javalib/qtjava/libqtjavasupport.la -lkmdi $(LIB_KHTML) $(LIB_KSPELL) $(LIB_KIO)
++libkdejava_la_LIBADD = $(top_builddir)/qtjava/javalib/qtjava/libqtjavasupport.la -lkmdi $(LIB_KHTML) $(LIB_KSPELL) $(LIB_KIO) -lkdecore -lkparts -lkdeui -lkutils -lDCOP -lkdefx -lkdeprint
+ 
+ KDE_OPTIONS = qtonly nofinal
+--- kdebindings/xparts/src/kde/Makefile.am.ORI	2012-07-30 14:27:24.347613550 +0200
++++ kdebindings/xparts/src/kde/Makefile.am	2010-08-12 05:12:49.000000000 +0200
+@@ -5,7 +5,7 @@
+ 
+ libkdexparts_la_SOURCES = xparthost_kpart.cpp xparthost.skel xpart.stub \
+ 	kbrowsersignals.cpp xbrowsersignals.skel xbrowserextension.stub
+-libkdexparts_la_LIBADD = $(LIB_KPARTS)
++libkdexparts_la_LIBADD = $(LIB_KPARTS) -lDCOP -lqt-mt -lkdecore -lkdeui
+ libkdexparts_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0 
+ 
+ xpart_DIR=$(srcdir)/../interfaces
diff --git a/redhat/kdebindings/trinity-kdebindings-3.5.13.spec b/redhat/kdebindings/trinity-kdebindings-3.5.13.spec
index eb60e3a60..0e6db1035 100644
--- a/redhat/kdebindings/trinity-kdebindings-3.5.13.spec
+++ b/redhat/kdebindings/trinity-kdebindings-3.5.13.spec
@@ -1,45 +1,52 @@
 # 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
-%define _mandir %{_datadir}/man
 %endif
 
 # TDE 3.5.13 specific building variables
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%define tde_bindir %{_prefix}/bin
+%define tde_datadir %{_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{_prefix}/include
+%define tde_libdir %{_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
 
-# 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/')
+%define tde_tdeappdir %{tde_datadir}/applications/kde
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
 
+%define _docdir %{tde_docdir}
 
-Name:	 trinity-kdebindings
-Summary: TDE bindings to non-C++ languages
-Version: 3.5.13
-Release: 4%{?dist}%{_variant}
+Name:		trinity-tdebindings
+Summary:	TDE bindings to non-C++ languages
+Version:	3.5.13
+Release:	5%{?dist}%{_variant}
 
-License: GPLv2
-Group:   User Interface/Desktops
+License:	GPLv2
+Group:		User Interface/Desktops
 
-Vendor:  Trinity Project
+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: kdebindings-%{version}.tar.gz
+Source0:	kdebindings-%{version}.tar.gz
 
 # RedHat Legacy patches (from Fedora)
-Patch1: kdebindings-3.5.6-libgcj.patch
+Patch1:		kdebindings-3.5.6-libgcj.patch
 
 # [kdebindings] Removes 'hpi' support in openjdk (obsolete in openjdk 1.7.0) [Bug #978]
-Patch2: kdebindings-3.5.13-openjdk_remove_hpi_support.patch
+Patch2:		kdebindings-3.5.13-openjdk_remove_hpi_support.patch
 # [kdebindings] Allow compilation with Ruby >= 1.9 [Bug #597]
-Patch3: kdebindings-3.5.13-ruby_1.9.patch
+Patch3:		kdebindings-3.5.13-ruby_1.9.patch
 # [kdebindings] Fix various build issues [Bug #597]
-Patch4:	kdebindings-3.5.13-fixes.patch
+Patch4:		kdebindings-3.5.13-fixes.patch
+# [kdebindings] Fix smoke compilation on MGA2 (missing LDFLAGS)
+Patch5:		kdebindings-3.5.13-missing_ldflags.patch
+
 
 BuildRequires: autoconf automake libtool m4
 BuildRequires: tqtinterface-devel
@@ -50,41 +57,39 @@ BuildRequires: desktop-file-utils
 BuildRequires: zlib-devel
 BuildRequires: perl(ExtUtils::MakeMaker)
 BuildRequires: gtk2-devel
-%if 0%{?fedora} >= 17
-BuildRequires: gdk-pixbuf2-devel
-%else
-BuildRequires: gdk-pixbuf-devel
-%endif
 BuildRequires: java-openjdk
+BuildRequires: xulrunner-devel
 
 %if 0%{?fedora}
 BuildRequires: glib-devel
 BuildRequires: gtk+-devel
 %endif
+%if 0%{?mgaversion}
+BuildRequires: %{_lib}glib1.2-devel
+BuildRequires: %{_lib}gtk+-devel
+%endif
 
-%define perl_ver        %{expand:%%(eval `perl -V:version`; echo $version)}
-%define perl_vendorarch %{expand:%%(eval `perl -V:installvendorarch`; echo $installvendorarch)}
-%define perl_vendorlib  %{expand:%%(eval `perl -V:installvendorlib`; echo $installvendorlib)}
-%define perl_man3dir    %{expand:%%(eval `perl -V:installman3dir`; echo $installman3dir)}
-
-Requires: trinity-kdelibs
-Requires: trinity-kdebase
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
+%if 0%{?mgaversion}
+BuildRequires:	%{_lib}gdk_pixbuf2.0-devel
+%else
+%if 0%{?fedora} >= 17
+BuildRequires: gdk-pixbuf2-devel
+%else
+BuildRequires: gdk-pixbuf-devel
+%endif
+%endif
 
-%define python_ver %{expand:%%(%{__python} -c "import sys ; print sys.version[:3]")}
-%define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 
-## dcoppython
+## Python
 BuildRequires: python-devel
-Provides: %{name}-dcoppython = %{version}-%{release}
+%define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 
 ## ruby
 BuildRequires: ruby-devel >= 1.8, ruby
-Provides: %{name}-ruby = %{version}-%{release}
 %{!?ruby_arch: %define ruby_arch %(ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]')}
-%{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')}
-%{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
+%{!?ruby_rubylibdir: %define ruby_rubylibdir %(ruby -rrbconfig -e 'puts Config::CONFIG["rubylibdir"]')}
+# 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/')
 
 ## java
 %if 0%{?rhel} > 0 && 0%{?rhel} < 6
@@ -99,26 +104,763 @@ BuildRequires: java-1.6.0-openjdk-devel
 %endif
 %define java_home %{_usr}/lib/jvm/java
 %define _with_java --with-java=%{java_home}
-Provides: %{name}-java = %{version}-%{release}
+
+## Perl
+BuildRequires:	perl-devel
+%define perl_vendorarch %{expand:%%(eval `perl -V:installvendorarch`; echo $installvendorarch)}
+
+
+Obsoletes:	trinity-kdebindings < %{version}-%{release}
+Provides:	trinity-kdebindings = %{version}-%{release}
+
+# Metapackage requires
+Requires: trinity-tdebindings-java = %{version}-%{release}
+Requires: trinity-libsmokeqt1 = %{version}-%{release}
+Requires: trinity-libsmokekde1 = %{version}-%{release}
+Requires: trinity-perl-dcop = %{version}-%{release}
+Requires: trinity-python-dcop = %{version}-%{release}
+Requires: trinity-libkjsembed1 = %{version}-%{release}
+Requires: trinity-kjscmd = %{version}-%{release}
+Requires: trinity-juic = %{version}-%{release}
+Requires: trinity-libkorundum0-ruby = %{version}-%{release}
+Requires: trinity-libqt0-ruby = %{version}-%{release}
+
 
 %description
 TDE/DCOP bindings to non-C++ languages
 
+%files
+
+##########
+
+%package java
+Summary:	TDE Java bindings metapackage [Trinity]
+Group:		Environment/Libraries
+Requires:	trinity-libdcop3-java = %{version}-%{release}
+Requires:	trinity-libdcop3-jni = %{version}-%{release}
+Requires:	trinity-libqt3-java = %{version}-%{release}
+Requires:	trinity-libqt3-jni = %{version}-%{release}
+Requires:	trinity-libtrinity-java = %{version}-%{release}
+Requires:	trinity-libtrinity-jni = %{version}-%{release}
+
+%description java
+A metapackage depending on all TDE, Qt and DCOP bindings libraries
+related to the Java language.
+
+This package is part of the official TDE bindings module.
+
+%files java
+%defattr(-,root,root,-)
+
+##########
+
+%package -n trinity-libdcop3-java
+Summary:	DCOP bindings for Java [Trinity]
+Group:		Environment/Libraries
+
+Requires:	trinity-libdcop3-jni = %{version}-%{release}
+
+%description -n trinity-libdcop3-java
+This package contains the Java classes necessary to run Java programs
+using the Java DCOP bindings. DCOP is the TDE Desktop COmmunications
+Protocol, used for communicating with running TDE applications.
+
+This package is part of the official TDE bindings module.
+
+%files -n trinity-libdcop3-java
+%defattr(-,root,root,-)
+#%{tde_datadir}/java/dcopjava*.jar
+%{tde_libdir}/java/org/kde/DCOP/*.class
+
+##########
+
+%package -n trinity-libdcop3-java-devel
+Summary:	DCOP bindings for Java (dcopidl2java program) [Trinity]
+Group:		Development/Libraries
+Requires:	trinity-libdcop3-java = %{version}-%{release}
+
+%description -n trinity-libdcop3-java-devel
+This package contains the dcopidl2java program which generates Java 
+stubs from DCOP IDL files, necessary to do development with the DCOP Java
+bindings. DCOP is the TDE Desktop COmmunications Protocol, used for
+communicating with running TDE applications.
+
+This package is part of the official TDE bindings module.
+
+%files -n trinity-libdcop3-java-devel
+%defattr(-,root,root,-)
+%{tde_bindir}/dcopidl2java
+
+##########
+
+%package -n trinity-libdcop3-jni
+Summary:	DCOP bindings for Java ( Native libraries ) [Trinity]
+Group:		Environment/Libraries
+
+%description -n trinity-libdcop3-jni
+This package contains the shared libraries and scripts necessary to
+run programs using the Java DCOP bindings. DCOP is the TDE Desktop
+COmmunications Protocol, used for communicating with running TDE
+applications.
+
+This package is part of the official TDE bindings module.
+
+%files -n trinity-libdcop3-jni
+%defattr(-,root,root,-)
+%{tde_libdir}/libjavadcop.la
+%{tde_libdir}/libjavadcop.so
+
+%post -n trinity-libdcop3-jni
+/sbin/ldconfig || :
+
+%postun -n trinity-libdcop3-jni
+/sbin/ldconfig || :
+
+##########
+
+%package -n trinity-libqt3-java
+Summary:	Java bindings for Qt [Trinity]
+Group:		Environment/Libraries
+Requires:	trinity-libdcop3-jni = %{version}-%{release}
+Requires:	trinity-libqt3-jni = %{version}-%{release}
+Requires:	trinity-juic = %{version}-%{release}
+
+%description -n trinity-libqt3-java
+This package contains the Java classes necessary to run Java programs
+using the Java Qt bindings. Qt is a very popular GUI toolkit, used by
+the TDE desktop environment.
+
+It also includes many example programs that make use of these bindings,
+plus many of the Qt Tutorial examples translated into Java.
+
+This package is part of the official TDE bindings module.
+
+%files -n trinity-libqt3-java
+%defattr(-,root,root,-)
+%{tde_libdir}/java/qtjava*.jar
+%{tde_tdedocdir}/HTML/en/javalib/
+
+##########
+
+%package -n trinity-libqt3-jni
+Summary:	Java bindings for Qt ( Native libraries ) [Trinity]
+Group:		Environment/Libraries
+
+%description -n trinity-libqt3-jni
+This package contains the shared libraries necessary to run Java
+programs using the Java Qt bindings. Qt is a very popular GUI
+toolkit, used by the TDE desktop environment.
+
+This package is part of the official TDE bindings module.
+
+%files -n trinity-libqt3-jni
+%defattr(-,root,root,-)
+%{tde_libdir}/libqtjavasupport.la
+%{tde_libdir}/libqtjavasupport.so
+%{tde_libdir}/libqtjavasupport.so.*
+%{tde_libdir}/jni/libqtjava.la
+%{tde_libdir}/jni/libqtjava.so
+%{tde_libdir}/jni/libqtjava.so.*
+%doc qtjava/ChangeLog
+
+%post -n trinity-libqt3-jni
+/sbin/ldconfig || :
+
+%postun -n trinity-libqt3-jni
+/sbin/ldconfig || :
+
+##########
+
+%package -n trinity-libtrinity-java
+Summary:	tdelibs bindings for Java [Trinity]
+Group:		Environment/Libraries
+
+Requires:	trinity-libtrinity-jni = %{version}-%{release}
+
+%description -n trinity-libtrinity-java
+This package contains the Java classes necessary to run Java programs
+using the Java tdelibs bindings. TDE is the Trinity Desktop Environment, a
+very popular UNIX Desktop Environment.
+
+It also includes some example applications that use these Java
+classes, and multiple usage samples of the most common TDE classes.
+
+This package is part of the official TDE bindings module.
+
+%files -n trinity-libtrinity-java
+%defattr(-,root,root,-)
+%{tde_libdir}/java/koala*.jar
+
+##########
+
+%package -n trinity-libtrinity-jni
+Summary:	tdelibs bindings for java ( Native libraries ) [Trinity]
+Group:		Environment/Libraries
+
+%description -n trinity-libtrinity-jni
+This package contains the shared libraries necessary to run Java
+programs using the Java tdelibs bindings. TDE is the Trinity Desktop
+Environment, a very popular UNIX Desktop Environment.
+
+This package is part of the official TDE bindings module.
+
+%files -n trinity-libtrinity-jni
+%defattr(-,root,root,-)
+%{tde_libdir}/jni/libkdejava.la
+%{tde_libdir}/jni/libkdejava.so
+%{tde_libdir}/jni/libkdejava.so.*
+%doc kdejava/ChangeLog
+
+##########
+
+%package -n trinity-libsmokeqt1
+Summary:	SMOKE Binding Library to Qt
+Group:		Environment/Libraries
+
+%description -n trinity-libsmokeqt1
+The "Scripting Meta Object Kompiler Engine" library is used by
+various TDE language bindings packages to provide interfaces to the
+Qt library.
+
+This package is part of the official TDE bindings module.
+
+%files -n trinity-libsmokeqt1
+%defattr(-,root,root,-)
+%{tde_libdir}/libsmokeqt.so.*
+
+%post -n trinity-libsmokeqt1
+/sbin/ldconfig || :
+
+%postun -n trinity-libsmokeqt1
+/sbin/ldconfig || :
+
+##########
+
+%package -n trinity-libsmokeqt-devel
+Summary:	SMOKE Binding Library to Qt - Development Files
+Group:		Development/Libraries
+Requires:	trinity-libsmokeqt1 = %{version}-%{release}
+
+%description -n trinity-libsmokeqt-devel
+The "Scripting Meta Object Kompiler Engine" library is used by
+various TDE language bindings packages to provide interfaces to the
+Qt library. This package contains the development files for the
+library.
+
+If you are a normal user, you probably don't need this
+package.
+
+This package is part of the official TDE bindings module.
+
+%files -n trinity-libsmokeqt-devel
+%defattr(-,root,root,-)
+%{tde_includedir}/smoke.h
+%{tde_libdir}/libsmokeqt.so
+%{tde_libdir}/libsmokeqt.la
+
+%post -n trinity-libsmokeqt-devel
+/sbin/ldconfig || :
+
+%postun -n trinity-libsmokeqt-devel
+/sbin/ldconfig || :
+
+##########
+
+%package -n trinity-libsmokekde1
+Summary:	SMOKE Binding Library to TDE
+Group:		Environment/Libraries
+
+%description -n trinity-libsmokekde1
+The "Scripting Meta Object Kompiler Engine" library is used by
+various TDE language bindings packages to provide interfaces to the
+TDE libraries.
+
+This package is part of the official TDE bindings module.
+
+%files -n trinity-libsmokekde1
+%defattr(-,root,root,-)
+%{tde_libdir}/libsmokekde.so.*
+
+%post -n trinity-libsmokekde1
+/sbin/ldconfig || :
+
+%postun -n trinity-libsmokekde1
+/sbin/ldconfig || :
+
+##########
+
+%package -n trinity-libsmokekde-devel
+Summary:	SMOKE Binding Library to TDE - Development Files
+Group:		Development/Libraries
+Requires:	trinity-libsmokekde1 = %{version}-%{release}
+
+%description -n trinity-libsmokekde-devel
+The "Scripting Meta Object Kompiler Engine" library is used by
+various TDE language bindings packages to provide interfaces to the
+Qt and TDE libraries. This package contains the development files for
+the library.
+
+If you are a normal user, you probably don't need this
+package.
+
+This package is part of the official TDE bindings module.
+
+%files -n trinity-libsmokekde-devel
+%defattr(-,root,root,-)
+%{tde_libdir}/libsmokekde.so
+%{tde_libdir}/libsmokekde.la
+
+%post -n trinity-libsmokekde-devel
+/sbin/ldconfig || :
+
+%postun -n trinity-libsmokekde-devel
+/sbin/ldconfig || :
+
+##########
+
+%package -n trinity-perl-dcop
+Summary:	DCOP Bindings for Perl 
+Group:		Development/Libraries
+
+Obsoletes:	trinity-kdebindings-dcopperl < %{version}-%{release}
+Provides:	trinity-kdebindings-dcopperl = %{version}-%{release}
+
+%description -n trinity-perl-dcop
+Perl bindings to the DCOP interprocess communication protocol used by TDE
+
+%files -n trinity-perl-dcop
+%defattr(-,root,root,-)
+%{perl_vendorarch}/auto/DCOP/*
+%{perl_vendorarch}/DCOP.pm
+%{perl_vendorarch}/DCOP/*
+%doc dcopperl/AUTHORS dcopperl/Changes dcopperl/README dcopperl/TODO
+%{tde_mandir}/man3/DCOP.3pm*
+
+##########
+
+%package -n trinity-python-dcop
+Summary:	DCOP bindings for Python
+Group:		Environment/Libraries
+Requires:	python
+#Provides:	%{name}-dcoppython = %{version}-%{release}
+
+%description -n trinity-python-dcop
+This package contains the shared libraries necessary to run and
+develop Python programs using the Python DCOP bindings
+libraries. DCOP is the TDE Desktop COmmunications Protocol, used for
+communicating with running TDE applications.
+
+This package is part of the official TDE bindings module.
+
+%files -n trinity-python-dcop
+%defattr(-,root,root,-)
+%{python_sitearch}/pcop.la
+%{python_sitearch}/pcop.so
+%{python_sitearch}/pydcop.py*
+
+##########
+
+%package -n trinity-libkjsembed1
+Summary:	Embedded JavaScript library
+Group:		Environment/Libraries
+
+%description -n trinity-libkjsembed1
+This package contains the shared libraries necessary to run programs
+linked with the KJSEmbed library. This library provides JavaScript
+embedded scripting facilities to TDE applications.
+
+This package is part of the official TDE bindings module.
+
+%files -n trinity-libkjsembed1
+%defattr(-,root,root,-)
+%{tde_libdir}/libkjsembed.so.*
+%{tde_tdelibdir}/libimagefxplugin.la
+%{tde_tdelibdir}/libimagefxplugin.so
+%{tde_datadir}/services/imagefx_plugin.desktop
+%{tde_tdelibdir}/libqprocessplugin.so
+%{tde_tdelibdir}/libqprocessplugin.la
+%{tde_datadir}/services/qprocess_plugin.desktop
+%{tde_tdelibdir}/libfileitemplugin.la
+%{tde_tdelibdir}/libfileitemplugin.so
+%{tde_datadir}/services/kfileitem_plugin.desktop
+%{tde_datadir}/apps/kjsembed/cmdline.js
+%{tde_datadir}/servicetypes/binding_type.desktop
+%{tde_bindir}/embedjs
+%{tde_datadir}/apps/embedjs/embedjsui.rc
+%{tde_datadir}/applnk/Utilities/embedjs.desktop
+%{tde_datadir}/icons/hicolor/16x16/apps/embedjs.png
+%{tde_datadir}/icons/hicolor/32x32/apps/embedjs.png
+%{tde_tdelibdir}/libjavascript.la
+%{tde_tdelibdir}/libjavascript.so
+%{tde_datadir}/apps/kate/scripts/swaptabs.js
+%{tde_datadir}/apps/kate/scripts/swaptabs.ui
+%{tde_datadir}/apps/kate/scripts/swaptabs.desktop
+%{tde_datadir}/services/javascript.desktop
+%doc kjsembed/docs/ChangeLog
+
+%post -n trinity-libkjsembed1
+/sbin/ldconfig ||:
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
+
+%postun -n trinity-libkjsembed1
+/sbin/ldconfig ||:
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
+
+##########
+
+%package -n trinity-libkjsembed-devel
+Summary:	Embedded JavaScript library (Development files)
+Group:		Development/Libraries
+Requires:	trinity-libkjsembed1 = %{version}-%{release}
+
+%description -n trinity-libkjsembed-devel
+This package contains the header files and symbolic links necessary
+to develop and compile programs using the KJSEmbed library. This
+library provides JavaScript embedded scripting facilities to TDE
+applications.
+
+It also includes lots of example programs that make use of these
+bindings, plus comprehensive documentation of the bindings.
+
+This package is part of the official TDE bindings module.
+
+%files -n trinity-libkjsembed-devel
+%defattr(-,root,root,-)
+%{tde_includedir}/kjsembed/
+%{tde_libdir}/libkjsembed.so
+%{tde_libdir}/libkjsembed.la
+%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
+
+%post -n trinity-libkjsembed-devel
+/sbin/ldconfig || :
+
+%postun -n trinity-libkjsembed-devel
+/sbin/ldconfig || :
+
+##########
+
+%package -n trinity-kjscmd
+Summary:	A script interpreter using the TDE JavaScript library
+Group:		Environment/Libraries
+
+%description -n trinity-kjscmd
+This package contains the kjscmd program, which is a standalone
+JavaScript interpreter using the KJSEmbed library.
+
+This package is part of the official TDE bindings module.
+
+%files -n trinity-kjscmd
+%defattr(-,root,root,-)
+%{tde_bindir}/kjscmd
+%{tde_tdeappdir}/kjscmd.desktop
+%{tde_mandir}/man1/kjscmd.*
+%{tde_tdelibdir}/libjsconsoleplugin.la
+%{tde_tdelibdir}/libjsconsoleplugin.so
+
+%post -n trinity-kjscmd
+update-desktop-database >& /dev/null ||:
+
+%postun -n trinity-kjscmd
+update-desktop-database >& /dev/null ||:
+
+##########
+
+%package -n trinity-juic
+Summary:	The Qt Java UI Compiler
+Group:		Environment/Libraries
+Requires:	trinity-libqt3-java = %{version}-%{release}
+
+%description -n trinity-juic
+This package contains the juic program, which is used to convert
+a UI description file generated by the Qt Designer, and converts
+it into a Qt Java class. It is necessary for compiling and 
+developing programs using the Qt Java bindings together with Qt
+Designer.
+
+This package is part of the official TDE bindings module.
+
+%files -n trinity-juic
+%defattr(-,root,root,-)
+%{tde_bindir}/juic
+%{tde_datadir}/juic/
+
+##########
+
+%package -n trinity-libkorundum0-ruby
+Summary:	TDE bindings for Ruby [Trinity]
+Group:		Environment/Libraries
+Requires:	trinity-libqt0-ruby = %{version}-%{release}
+
+%description -n trinity-libkorundum0-ruby
+This package contains the files necessary for running and developing
+Ruby code using the Korundum TDE Ruby bindings.
+
+It also includes some example programs and templates that make use of
+these bindings.
+
+This package is part of the official TDE bindings module.
+
+%files -n trinity-libkorundum0-ruby
+%defattr(-,root,root,-)
+%{tde_bindir}/rbkdesh
+%{tde_bindir}/rbkdeapi
+%{tde_bindir}/krubyinit
+%{tde_bindir}/rbkconfig_compiler
+%{ruby_rubylibdir}/Korundum.rb
+%{ruby_rubylibdir}/KDE/korundum.rb
+%if 0%{?fedora} == 17
+%{_usr}/%{_lib}/korundum.la
+%{_usr}/%{_lib}/korundum.so*
+%else
+%{ruby_arch}/korundum.la
+%{ruby_arch}/korundum.so*
+%endif
+%doc korundum/ChangeLog
+
+%post -n trinity-libkorundum0-ruby
+/sbin/ldconfig || :
+
+%postun -n trinity-libkorundum0-ruby
+/sbin/ldconfig || :
+
+##########
+
+%package -n trinity-libqt0-ruby
+Summary:	Qt bindings for Ruby [Trinity]
+Group:		Environment/Libraries
+Requires:	ruby
+
+%description -n trinity-libqt0-ruby
+This package contains the files necessary for running and developing
+Ruby code using the Qt Ruby bindings.
+
+It also includes some example programs that make use of these bindings,
+plus many of the Qt Tutorial examples translated into Ruby.
+
+This package is part of the official TDE bindings module.
+
+%files -n trinity-libqt0-ruby
+%defattr(-,root,root,-)
+%{tde_bindir}/rbqtsh
+%{tde_bindir}/rbqtapi
+%{tde_bindir}/rbuic
+%{tde_bindir}/qtrubyinit
+%{ruby_rubylibdir}/Qt/qtruby.rb
+%{ruby_rubylibdir}/Qt.rb
+%{ruby_arch}/qtruby.so*
+%{ruby_arch}/qtruby.la
+%if 0%{?fedora} >= 17
+%{_usr}/%{_lib}/qui.so*
+%{_usr}/%{_lib}/qui.la
+%else
+%{ruby_arch}/qui.so*
+%{ruby_arch}/qui.la
+%endif
+%doc qtruby/ChangeLog
+
+%post -n trinity-libqt0-ruby
+/sbin/ldconfig || :
+
+%postun -n trinity-libqt0-ruby
+/sbin/ldconfig || :
+
+##########
+
+%if 0
+%package -n trinity-kmozilla
+Summary:	Kmozilla for TDE
+Group:		Environment/Libraries
+
+%description -n trinity-kmozilla
+%{summary}
+
+%files -n trinity-kmozilla
+%defattr(-,root,root,-)
+%{tde_bindir}/kmozilla
+%{tde_libdir}/libkmozillapart.so.*
+%{tde_libdir}/libkmozillapart.so
+%{tde_libdir}/libkmozillapart.la
+%{tde_datadir}/services/kmozilla.desktop
+%endif
+
+##########
+
+%package -n trinity-xpart-notepad
+Summary:	A small XPart editor
+Group:		Applications/Utilities
+
+%description -n trinity-xpart-notepad
+xpart_notepad is a small XPart editor. Use it to understand how to use XPart.
+
+%files -n trinity-xpart-notepad
+%defattr(-,root,root,-)
+%{tde_bindir}/shell_xparthost
+%{tde_bindir}/xp_notepad
+%{tde_libdir}/libxp_notepadpart.la
+%{tde_libdir}/libxp_notepadpart.so
+%{tde_libdir}/libxp_notepadpart.so.*
+%{tde_datadir}/services/xp_notepad.desktop
+%doc xparts/xpart_notepad/README
+
+%post -n trinity-xpart-notepad
+/sbin/ldconfig || :
+
+%postun -n trinity-xpart-notepad
+/sbin/ldconfig || :
+
+##########
+
+%package -n trinity-libgtkxparts1
+Summary:	Xparts library for GTK
+Group:		Environment/Libraries
+
+%description -n trinity-libgtkxparts1
+%{summary}
+
+%files -n trinity-libgtkxparts1
+%defattr(-,root,root,-)
+%{tde_libdir}/libgtkxparts.so.*
+%{tde_libdir}/libgtkxparts.la
+
+%post -n trinity-libgtkxparts1
+/sbin/ldconfig || :
+
+%postun -n trinity-libgtkxparts1
+/sbin/ldconfig || :
+
+##########
+
+%package -n trinity-libkdexparts1
+Summary:	Xparts library for KDE
+Group:		Environment/Libraries
+
+%description -n trinity-libkdexparts1
+%{summary}
+
+%files -n trinity-libkdexparts1
+%defattr(-,root,root,-)
+%{tde_libdir}/libkdexparts.so.*
+%{tde_libdir}/libkdexparts.la
+
+%post -n trinity-libkdexparts1
+/sbin/ldconfig || :
+
+%postun -n trinity-libkdexparts1
+/sbin/ldconfig || :
+
+##########
+
+%package -n trinity-libxparts-devel
+Summary:	Xparts development files
+Group:		Development/Libraries
+Requires:	trinity-libgtkxparts1 = %{version}-%{release}
+Requires:	trinity-libkdexparts1 = %{version}-%{release}
+
+%description -n trinity-libxparts-devel
+%{summary}
+
+%files -n trinity-libxparts-devel
+%defattr(-,root,root,-)
+%{tde_includedir}/xkparts/
+%{tde_libdir}/libgtkxparts.so
+%{tde_libdir}/libkdexparts.so
+
+%post -n trinity-libxparts-devel
+/sbin/ldconfig || :
+
+%postun -n trinity-libxparts-devel
+/sbin/ldconfig || :
+
+##########
+
+%package xparts-extras
+Summary:	Extra xparts for TDE [Trinity]
+Group:		Environment/Libraries
+
+# Metapckage requires
+Requires:	trinity-xpart-notepad = %{version}-%{release}
+Requires:	trinity-libgtkxparts1 = %{version}-%{release}
+Requires:	trinity-libkdexparts1 = %{version}-%{release}
+Requires:	trinity-libdcop-c = %{version}-%{release}
+
+%description xparts-extras
+This package contains extra xparts-based modules for Trinity
+This includes the mozilla-konqueror plugin
+
+This package is part of the official TDE bindings module.
+
+%files xparts-extras
+
+###########
+
+%package -n trinity-libdcop-c
+Summary:	DCOP bindings for C [Trinity]
+Group:		Environment/Libraries
+
+%description -n trinity-libdcop-c
+%{summary}
+
+%files -n trinity-libdcop-c
+%defattr(-,root,root,-)
+%{tde_libdir}/libdcopc.so.*
+
+%post -n trinity-libdcop-c
+/sbin/ldconfig || :
+
+%postun -n trinity-libdcop-c
+/sbin/ldconfig || :
+
+###########
+
+%package -n trinity-libdcop-c-devel
+Summary:	DCOP bindings for C, development files [Trinity]
+Group:		Development/Libraries
+Requires:	trinity-libdcop-c = %{version}-%{release}
+
+%description -n trinity-libdcop-c-devel
+%{summary}
+
+%files -n trinity-libdcop-c-devel
+%defattr(-,root,root,-)
+%{tde_libdir}/libdcopc.so
+%{tde_libdir}/libdcopc.la
+%{tde_includedir}/dcopc/
+
+%post -n trinity-libdcop-c-devel
+/sbin/ldconfig || :
+
+%postun -n trinity-libdcop-c-devel
+/sbin/ldconfig || :
+
+##########
+
 %package devel
-Summary: Development files for %{name}
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: trinity-kdelibs-devel 
+Summary:	Development files for %{name}
+Group:		Development/Libraries
+Requires:	trinity-tdelibs-devel 
+
+Obsoletes:	trinity-kdebindings-devel < %{version}-%{release}
+Provides:	trinity-kdebindings-devel = %{version}-%{release}
+
+# Metapackage
+Requires:	trinity-libsmokeqt-devel = %{version}-%{release}
+Requires:	trinity-libdcop3-java-devel = %{version}-%{release}
+Requires:	trinity-libsmokekde-devel = %{version}-%{release}
+Requires:	trinity-libkjsembed-devel = %{version}-%{release}
+Requires:	trinity-libxparts-devel = %{version}-%{release}
+Requires:	trinity-libdcop-c-devel = %{version}-%{release}
+Requires:	trinity-tdebindings-devel = %{version}-%{release}
+
 %description devel
 Development files for the TDE bindings.
 
-## dcopperl
-%package dcopperl
-Summary: DCOP Bindings for Perl 
-Group:   Development/Libraries
-%description dcopperl
-Perl bindings to the DCOP interprocess communication protocol used by TDE
+%files devel
 
+##########
 
 %prep
 %setup -q -n kdebindings
@@ -129,6 +871,7 @@ Perl bindings to the DCOP interprocess communication protocol used by TDE
 %patch3 -p1
 %endif
 %patch4 -p1
+%patch5 -p1
 
 # Adds non-standard Ruby include path in include dirs
 for d in \
@@ -141,11 +884,15 @@ for d in \
   echo -e "\nINCLUDES += -I%{_usr}/include/%{_normalized_cpu}-%{_target_os}" >> "${d}/Makefile.am"
 done
 
+# Disable kmozilla, it does not build with recent xulrunner (missing 'libmozjs.so')
+%__sed -i "xparts/Makefile.am" \
+  -e "s|SUBDIRS = .*|SUBDIRS = src xpart_notepad|"
+
 # 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"
+%__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"
@@ -154,8 +901,8 @@ done
 
 %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}"
 
 unset JAVA_HOME ||:
 %{?java_home:JAVA_HOME=%{java_home}; export JAVA_HOME}
@@ -164,24 +911,33 @@ unset JAVA_HOME ||:
 export DO_NOT_COMPILE="$DO_NOT_COMPILE python"
 
 %configure \
+  --exec-prefix=%{_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --docdir=%{tde_docdir} \
+  --includedir=%{tde_includedir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
   --disable-rpath \
   --enable-new-ldflags \
   --disable-debug --disable-warnings \
   --disable-dependency-tracking \
-  --with-extra-libs=%{_libdir} \
+  --with-extra-libs=%{tde_libdir} \
   --with-pythondir=%{_usr} \
   --enable-closure \
   --enable-final \
   %{?_with_java} %{!?_with_java:--without-java} \
   %{?_enable_qscintilla} %{!?_enable_qscintilla:--disable-qscintilla} \
-  --with-extra-includes=%{_includedir}/tqt
+  --with-extra-includes=%{tde_includedir}/tqt
 
 pushd dcopperl
 CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL INSTALLDIRS=vendor
 
 # Ugly hack to add TQT include directory in Makefile
+# Also modifies the man pages directory
 sed -i Makefile \
-  -e "s,^\(INC = .*\),\1 -I%{_includedir}/tqt,"
+  -e "s|^\(INC = .*\)|\1 -I%{tde_includedir}/tqt|" \
+  -e "s|/usr/share/man|%{tde_mandir}|g"
 
 %__make OPTIMIZE="$RPM_OPT_FLAGS" ||:
 popd
@@ -194,33 +950,16 @@ popd
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf $RPM_BUILD_ROOT
 
 %__make install DESTDIR=%{?buildroot} \
   PYTHON=%{__python}
 
-desktop-file-install \
-  --vendor="" \
-  --add-category="Qt" \
-  --add-category="KDE" \
-  --add-category="Utility" \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/*.desktop ||:
-
-## File lists
-# perl
+# Removes some perl files
 find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -name .packlist \
   -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
 
-find $RPM_BUILD_ROOT%{perl_vendorarch} -type f -print | \
-        sed "s@^$RPM_BUILD_ROOT@@g" >> %{name}-dcopperl.list
-find $RPM_BUILD_ROOT%{perl_vendorlib} -type f -print | \
-        sed "s@^$RPM_BUILD_ROOT@@g" >> %{name}-dcopperl.list
-if [ "$(cat %{name}-dcopperl.list)X" = "X" ] ; then
-    echo "ERROR: EMPTY FILE LIST"; exit 1
-fi
-
 # locale's
 %find_lang %{name} || touch %{name}.lang
 HTML_DIR=$(kde-config --expandvars --install html)
@@ -239,89 +978,38 @@ for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do
 done  
 fi  
 
-# rpmdocs
-for dir in dcopperl dcoppython kalyptus %{?_with_java:kdejava qtjava} kjsembed korundum qtruby qtsharp smoke; do
-  for file in AUTHORS ChangeLog README TODO ; do
-    test -s  "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
-  done
-done
-
-%clean
-%__rm -rf $RPM_BUILD_ROOT
-
-
-%post
-/sbin/ldconfig ||:
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database >& /dev/null ||:
-
-%postun
-/sbin/ldconfig ||:
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database >& /dev/null ||:
+# Installs juic
+%__install -D -m 755 qtjava/designer/juic/bin/juic	%{?buildroot}%{tde_bindir}/juic
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/juic/common
+%__install qtjava/designer/juic/common/*.xml %{?buildroot}%{tde_datadir}/juic/common
+%__install qtjava/designer/juic/common/*.xsl %{?buildroot}%{tde_datadir}/juic/common
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/juic/java
+%__install qtjava/designer/juic/java/*.xml %{?buildroot}%{tde_datadir}/juic/java
+%__install qtjava/designer/juic/java/*.xsl %{?buildroot}%{tde_datadir}/juic/java
+%__install qtjava/designer/juic/juic.xsl  %{?buildroot}%{tde_datadir}/juic
 
+# kjsembed sample files
+%__install -d -m 755 %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
+%__install kjsembed/plugins/customobject_plugin.cpp %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
+%__install kjsembed/plugins/customobject_plugin.h %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
+%__install kjsembed/plugins/customobject_plugin.desktop %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
+%__install kjsembed/plugins/customqobject_plugin.cpp %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
+%__install kjsembed/plugins/customqobject_plugin.h %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
+%__install kjsembed/plugins/customqobject_plugin.desktop %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
 
-%files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING README
-%doc rpmdocs/*
-%{_bindir}/*
-%{tde_libdir}/*
-%{_libdir}/*.la
-%{_libdir}/*.so.*
-%{_datadir}/appl*/*/*.desktop
-%{_datadir}/apps/embedjs/
-%{_datadir}/apps/kate/scripts/*
-%{_datadir}/apps/kjsembed/
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/service*/*.desktop
-%{_mandir}/man1/*
-%{python_sitearch}/*
-#%{_libdir}/python%{python_ver}/*.py*
-%if "%{?_with_java:1}" == "1"
-%{_libdir}/java
-%{_libdir}/jni/*.so.*
-%endif
-#%{ruby_sitearch}/*
-#%{ruby_sitelib}/K*
-#%{ruby_sitelib}/Qt*
-#%{_usr}/%{_lib}/ruby/*/*
-%{ruby_arch}/*.so.*
-
-# Excludes 'kjscmd' (conflicts with 'kdelibs' from RHEL6)
-%if "%{?_prefix}" == "/usr"
-%exclude %{_bindir}/kjscmd
-%exclude %{_mandir}/man1/kjscmd*
-%endif
-
-%{_usr}/%{_lib}/korundum.la
-%{_usr}/%{_lib}/korundum.so.*
-%{_usr}/%{_lib}/qui.la
-%{_usr}/%{_lib}/qui.so.*
-%{_usr}/share/ruby/*
 
+%clean
+%__rm -rf $RPM_BUILD_ROOT
 
-%files dcopperl -f %{name}-dcopperl.list
-%defattr(-,root,root,-)
-%doc dcopperl/AUTHORS dcopperl/Changes dcopperl/README dcopperl/TODO
-%{perl_man3dir}/DCOP.3pm.gz
 
-%files devel
-%defattr(-,root,root,-)
-%{_includedir}/*
-%{_libdir}/*.so
-%if "%{?_with_java:1}" == "1"
-%{_libdir}/jni/*.so
-%{_libdir}/jni/*.la
-%endif
-%{ruby_arch}/*.so
-%{ruby_arch}/*.la
-%{_usr}/%{_lib}/korundum.so
-%{_usr}/%{_lib}/qui.so
 
 %changelog
+* Sun Jul 29 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5
+- Split into several packages
+- Add support for Mageia 2 
+- Fix dcopperl man page location
+- Removes strange install stuff from legacy Fedora
+
 * Tue Apr 24 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
 - Add support for Fedora 17
 - Removes 'hpi' support in openjdk (obsolete in openjdk 1.7.0) [Bug #978]
diff --git a/redhat/kdeedu/kdeedu-3.5.13-fix_kbruch_build_error.patch b/redhat/kdeedu/kdeedu-3.5.13-fix_kbruch_build_error.patch
new file mode 100644
index 000000000..a60105256
--- /dev/null
+++ b/redhat/kdeedu/kdeedu-3.5.13-fix_kbruch_build_error.patch
@@ -0,0 +1,18 @@
+commit 9d1871a43cd11869f9a1eac7f6e1c6ae23b84072
+Author: Darrell Anderson <humanreadable@yahoo.com>
+Date:   1330147966 -0600
+
+    Fix kbruch/Makefile.am to eliminate build error.
+    This resolves bug report 786.
+
+diff --git a/kbruch/Makefile.am b/kbruch/Makefile.am
+index b2c27d1..7b159ff 100644
+--- a/kbruch/Makefile.am
++++ b/kbruch/Makefile.am
+@@ -2,5 +2,5 @@ SUBDIRS = src testcases
+ 
+ EXTRA_DIST = AUTHORS ChangeLog README TODO kbruch.lsm VERSION
+ 
+-VERSION:=`cat ${PWD}/VERSION`
++VERSION=`cat ${PWD}/VERSION`
+ include ../admin/Doxyfile.am
diff --git a/redhat/kdeedu/kdeedu-3.5.13-fix_linear_alphabet.patch b/redhat/kdeedu/kdeedu-3.5.13-fix_linear_alphabet.patch
new file mode 100644
index 000000000..9ae2d7aa4
--- /dev/null
+++ b/redhat/kdeedu/kdeedu-3.5.13-fix_linear_alphabet.patch
@@ -0,0 +1,51 @@
+commit 0cd3b7cec9eed70d39e1ae884d76db585790c9a3
+Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Date:   1327530864 -0600
+
+    Fix linear alphabet string errors
+
+diff --git a/kstars/kstars/indi/base64.c b/kstars/kstars/indi/base64.c
+index e83db54..2842451 100644
+--- a/kstars/kstars/indi/base64.c
++++ b/kstars/kstars/indi/base64.c
+@@ -30,7 +30,7 @@
+ #include "base64.h"
+ 
+ static const char base64digits[] =
+-   "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
++   "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+ 
+ #define BAD     (-1)
+ static const char base64val[] = {
+diff --git a/ktouch/extras/training-gen/perl/dk.config b/ktouch/extras/training-gen/perl/dk.config
+index 46d7edd..409a07c 100644
+--- a/ktouch/extras/training-gen/perl/dk.config
++++ b/ktouch/extras/training-gen/perl/dk.config
+@@ -16,4 +16,4 @@ wn
+ cæ
+ x
+ ,.
+-ABCDEFGHIJKLMNOPTQRSTUVWYZÆØÅ
+\ No newline at end of file
++ABCDEFGHIJKLMNOPQRSTUVWYZÆØÅ
+\ No newline at end of file
+diff --git a/ktouch/extras/training-gen/perl/en.config b/ktouch/extras/training-gen/perl/en.config
+index cca1346..bb5df1a 100644
+--- a/ktouch/extras/training-gen/perl/en.config
++++ b/ktouch/extras/training-gen/perl/en.config
+@@ -12,4 +12,4 @@ qu
+ wn
+ cx
+ yz
+-ABCDEFGHIJKLMNOPTQRSTUVWXYZ
++ABCDEFGHIJKLMNOPQRSTUVWXYZ
+diff --git a/ktouch/extras/training-gen/perl/es.config b/ktouch/extras/training-gen/perl/es.config
+index 1efd7b7..49b8b32 100644
+--- a/ktouch/extras/training-gen/perl/es.config
++++ b/ktouch/extras/training-gen/perl/es.config
+@@ -14,4 +14,4 @@ qu
+ wnñ
+ cx
+ yz
+-ABCDEFGHIJKLMNOPTQRSTUVWXYZ
++ABCDEFGHIJKLMNOPQRSTUVWXYZ
diff --git a/redhat/kdeedu/kdeedu-3.5.13-fix_makefile_glitch.patch b/redhat/kdeedu/kdeedu-3.5.13-fix_makefile_glitch.patch
new file mode 100644
index 000000000..c3ebdb746
--- /dev/null
+++ b/redhat/kdeedu/kdeedu-3.5.13-fix_makefile_glitch.patch
@@ -0,0 +1,17 @@
+commit b83d045598947bb355ed6a2996b24225da6a9ffa
+Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Date:   1326310679 -0600
+
+    Fix kdeedu makefile glitch
+    This closes Bug 785
+
+diff --git a/kalzium/src/solver/Makefile b/kalzium/src/solver/Makefile
+index 4b96fdb..6012982 100644
+--- a/kalzium/src/solver/Makefile
++++ b/kalzium/src/solver/Makefile
+@@ -89,4 +89,4 @@ install :
+ .depend: parser.ml lexer.ml
+ 	$(OCAMLDEP) $(INCLUDES) *.mli *.ml > $@
+ 
+-include .depend
++-include .depend
diff --git a/redhat/kdeedu/kdeedu-3.5.13-missing_ldflags.patch b/redhat/kdeedu/kdeedu-3.5.13-missing_ldflags.patch
new file mode 100644
index 000000000..171202674
--- /dev/null
+++ b/redhat/kdeedu/kdeedu-3.5.13-missing_ldflags.patch
@@ -0,0 +1,55 @@
+--- kdeedu/libkdeedu/kdeeducore/Makefile.am.ORI	2012-08-01 16:03:57.158018060 +0200
++++ kdeedu/libkdeedu/kdeeducore/Makefile.am	2012-08-01 16:04:06.206657197 +0200
+@@ -11,7 +11,7 @@
+ libkdeeducode_includedir = $(includedir)/libkdeedu
+ libkdeeducode_include_HEADERS = keduvocdata.h
+ 
+-libkdeeducore_la_LIBADD = $(LIB_KDECORE)
++libkdeeducore_la_LIBADD = $(LIB_KDECORE) $(LIB_QT)
+ 
+ METASOURCES = AUTO
+ 
+--- kdeedu/libkdeedu/kdeeduui/Makefile.am.ORI	2012-08-01 16:08:47.875060426 +0200
++++ kdeedu/libkdeedu/kdeeduui/Makefile.am	2012-08-01 16:08:53.275867176 +0200
+@@ -10,7 +10,7 @@
+ libkdeeduuiinclude_HEADERS = kdeeduglossary.h
+ 
+ libkdeeduui_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:5:0
+-libkdeeduui_la_LIBADD = $(LIB_KDECORE) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KHTML)
++libkdeeduui_la_LIBADD = $(LIB_KDECORE) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KHTML) $(LIB_QT)
+ 
+ METASOURCES = AUTO
+ 
+--- kdeedu/libkdeedu/extdate/Makefile.am.ORI	2012-08-01 16:10:28.272515295 +0200
++++ kdeedu/libkdeedu/extdate/Makefile.am	2012-08-01 16:10:37.999176797 +0200
+@@ -7,7 +7,7 @@
+ libextdate_la_SOURCES = extdatetime.cpp extcalendarsystem.cpp extcalendarsystemgregorian.cpp extdatetbl.cpp extdatepicker.cpp extdatetimeedit.cpp extdatewidget.cpp
+ 
+ libextdate_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
+-libextdate_la_LIBADD = $(LIB_KDEUI)
++libextdate_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
+ 
+ test_extdate_SOURCES = test_extdate.cc
+ test_extdate_LDADD = libextdate.la
+--- kdeedu/kiten/Makefile.am.ORI	2012-08-01 16:15:45.679552203 +0200
++++ kdeedu/kiten/Makefile.am	2012-08-01 16:15:53.606341454 +0200
+@@ -13,7 +13,7 @@
+ lib_LTLIBRARIES = libkiten.la
+ 
+ libkiten_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -version-info 1:0:0
+-libkiten_la_LIBADD = $(LIB_KDEUI) $(LIB_KDEPRINT)
++libkiten_la_LIBADD = $(LIB_KDEUI) $(LIB_KDEPRINT) $(LIB_QT) $(LIB_KDECORE)
+ 
+ libkiten_la_SOURCES = asyndeta.cpp dict.cpp widgets.cpp kromajiedit.cpp rad.cpp \
+ 	deinf.cpp kitenconfig.kcfgc
+--- kdeedu/kvoctrain/kvoctrain/kvt-core/Makefile.am.ORI	2012-08-01 16:24:48.865399440 +0200
++++ kdeedu/kvoctrain/kvoctrain/kvt-core/Makefile.am	2012-08-01 16:24:54.832227336 +0200
+@@ -12,6 +12,7 @@
+ 
+ SUBDIRS = kvt-xml
+ 
+-libkvoctraincore_la_LIBADD= kvt-xml/libkvtxml.la
++libkvoctraincore_la_LIBADD= kvt-xml/libkvtxml.la ../common-dialogs/libcommondlg.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KIO) $(LIB_KDEUI) -lDCOP
++libkvoctraincore_la_LDFLAGS = $(QT_LDFLAGS)
+ 
+ noinst_HEADERS = grammarmanager.h
diff --git a/redhat/kdeedu/trinity-kdeedu-3.5.13.spec b/redhat/kdeedu/trinity-kdeedu-3.5.13.spec
index b505e076b..b6facf9e9 100644
--- a/redhat/kdeedu/trinity-kdeedu-3.5.13.spec
+++ b/redhat/kdeedu/trinity-kdeedu-3.5.13.spec
@@ -1,19 +1,29 @@
 # 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.12 specific building variables
-%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 %{_prefix}/bin
+%define tde_datadir %{_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{_prefix}/include
+%define tde_libdir %{_prefix}/%{_lib}
 
+%define tde_tdeappdir %{tde_datadir}/applications/kde
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
 
-Name:    trinity-kdeedu
+%define _docdir %{tde_docdir}
+
+# Required for Mageia 2: removes the ldflag '--no-undefined'
+%define _disable_ld_no_undefined 1
+
+Name:    trinity-tdeedu
 Summary: Educational/Edutainment applications
 Version: 3.5.13
-Release: 3%{?dist}%{?_variant}
+Release: 4%{?dist}%{?_variant}
 
 License: GPLv2
 Group:   Amusements/Games
@@ -29,13 +39,22 @@ Source0: kdeedu-%{version}.tar.gz
 
 # [kdeedu] Fix compilation with GCC 4.7 [Bug #958]
 Patch1:		kdeedu-3.5.13-fix_gcc47_compilation.patch
+# [tdeedu] Fix kdeedu makefile glitch [Bug #785] [Commit #b83d0455]
+Patch2:		kdeedu-3.5.13-fix_makefile_glitch.patch
+# [tdeedu] Fix kbruch/Makefile.am to eliminate build error. [Bug #786] [Commit #9d1871a4]
+Patch3:		kdeedu-3.5.13-fix_kbruch_build_error.patch
+# [tdeedu] Fix linear alphabet string errors [Commit #0cd3b7ce]
+Patch4:		kdeedu-3.5.13-fix_linear_alphabet.patch
+
+
 
-Provides: kdeedu3 = %{version}-%{release}
+# [kdeedu] Missing LDFLAGS causes FTBFS on Mageia 2
+Patch5:		kdeedu-3.5.13-missing_ldflags.patch
 
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
 
-Requires: %{name}-libs = %{version}-%{release}
+#Requires(post): /sbin/ldconfig
+#Requires(postun): /sbin/ldconfig
+
 
 BuildRequires: autoconf automake libtool m4
 BuildRequires: desktop-file-utils
@@ -48,6 +67,40 @@ BuildRequires: ocaml(compiler)
 BuildRequires: ocaml
 %endif
 
+Obsoletes:		trinity-kdeedu < %{version}-%{release}
+Provides:		trinity-kdeedu = %{version}-%{release}
+Obsoletes:		trinity-kdeedu-libs < %{version}-%{release}
+Provides:		trinity-kdeedu-libs = %{version}-%{release}
+
+# Meta-package
+Requires: %{name}-data = %{version}-%{release}
+Requires: trinity-blinken = %{version}-%{release}
+Requires: trinity-kalzium = %{version}-%{release}
+Requires: trinity-kalzium-data = %{version}-%{release}
+Requires: trinity-kanagram = %{version}-%{release}
+Requires: trinity-kbruch = %{version}-%{release}
+Requires: trinity-keduca = %{version}-%{release}
+Requires: trinity-kgeography = %{version}-%{release}
+Requires: trinity-kgeography-data = %{version}-%{release}
+Requires: trinity-khangman = %{version}-%{release}
+Requires: trinity-kig = %{version}-%{release}
+Requires: trinity-kiten = %{version}-%{release}
+Requires: trinity-klatin = %{version}-%{release}
+Requires: trinity-klettres = %{version}-%{release}
+Requires: trinity-klettres-data = %{version}-%{release}
+Requires: trinity-kmplot = %{version}-%{release}
+Requires: trinity-kpercentage = %{version}-%{release}
+Requires: trinity-kstars = %{version}-%{release}
+Requires: trinity-kstars-data = %{version}-%{release}
+Requires: trinity-ktouch = %{version}-%{release}
+Requires: trinity-kturtle = %{version}-%{release}
+Requires: trinity-kverbos = %{version}-%{release}
+Requires: trinity-kvoctrain = %{version}-%{release}
+Requires: trinity-kwordquiz = %{version}-%{release}
+Requires: trinity-libtdeedu3 = %{version}-%{release}
+Requires: trinity-libkiten1 = %{version}-%{release}
+Requires: trinity-indi = %{version}-%{release}
+
 
 %description
 Educational/Edutainment applications, including:
@@ -71,33 +124,1219 @@ Educational/Edutainment applications, including:
 * kvoctrain: Vocabulary Trainer
 * kwordquiz: Vocabulary Trainer
 
+%files
+%defattr(-,root,root,-)
+%doc COPYING README
+
+##########
+
+%package data
+Summary:	shared data for Trinity educational applications
+Group:		Amusements/Games
+
+%description data
+This package contains shared data necessary for running the
+educational applications provided with KDE (the K Desktop
+Environment).
+
+This package is part of Trinity, as a component of the KDE education module.
+
+%files data
+%defattr(-,root,root,-)
+%{tde_datadir}/applnk/Edutainment/Languages/.directory
+%{tde_datadir}/applnk/Edutainment/Miscellaneous/.directory
+%{tde_datadir}/applnk/Edutainment/Mathematics/.directory
+%{tde_datadir}/applnk/Edutainment/Science/.directory
+%{tde_datadir}/applnk/Edutainment/Tools/.directory
+
+##########
+
+%package -n trinity-blinken
+Summary:	Trinity version of the Simon Says electronic memory game
+Group:		Amusements/Games
+#Requires:	sj-delphine-fonts
+Requires:	trinity-tdeedu-data = %{version}-%{release}
+
+%description -n trinity-blinken
+Blinken is based on an electronic game released in 1978, which
+challenges players to remember sequences of increasing length.  On
+the face of the device, there are 4 different color buttons, each
+with its own distinctive sound.  These buttons light up randomly,
+creating the sequence that the player must then recall.  If the
+player is successful in remembering the sequence of lights in the
+correct order, they advance to the next stage, where an identical
+sequence with one extra step is presented.
+
+This package is part of Trinity, as a component of the KDE education module.
+
+%files -n trinity-blinken
+%defattr(-,root,root,-)
+%{tde_bindir}/blinken
+%{tde_tdeappdir}/blinken.desktop
+%{tde_datadir}/apps/blinken/
+%{tde_datadir}/config.kcfg/blinken.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/blinken.png
+%{tde_datadir}/icons/hicolor/scalable/apps/blinken.svgz
+%{tde_tdedocdir}/HTML/en/blinken/
+
+%post -n trinity-blinken
+for i in hicolor ; do
+ touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-blinken
+for i in hicolor ; do
+ touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kalzium
+Summary:	chemistry teaching tool for Trinity
+Group:		Amusements/Games
+Requires:	trinity-kalzium-data = %{version}-%{release}
+Requires:	trinity-tdeedu-data = %{version}-%{release}
+
+%description -n trinity-kalzium
+Kalzium is a program which shows you the Periodic System of Elements
+(PSE).  You can use Kalzium to search for information about the
+elements or to learn facts about the PSE.
+
+Kalzium provides you with all kinds of information about the PSE.
+You can look up lots of information about the elements and also use
+visualisations to show them.
+
+You can visualise the Periodic Table of the Elements by blocks,
+groups, acidic behavior or different states of matter.  You can also
+plot data for a range of elements (weight, mean weight, density, IE1,
+IE2, electronegativity), and you can go back in time to see what
+elements were known at a given date.  In addition, on platforms where
+OCaml supports native code generation, Kalzium includes a chemical
+equation solver.
+
+This package is part of Trinity, as a component of the KDE education module.
+
+%files -n trinity-kalzium
+%defattr(-,root,root,-)
+%{tde_bindir}/kalzium
+%{tde_tdeappdir}/kalzium.desktop
+%{tde_datadir}/config.kcfg/kalzium.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/kalzium.png
+%{tde_datadir}/icons/hicolor/scalable/apps/kalzium.svgz
+%{tde_tdedocdir}/HTML/en/kalzium/
+
+%post -n trinity-kalzium
+for i in hicolor ; do
+ touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kalzium
+for i in hicolor ; do
+ touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kalzium-data
+Summary:	data files for Kalzium
+Group:		Amusements/Games
+
+%description -n trinity-kalzium-data
+This package contains architecture-independent data files for
+Kalzium, the KDE periodic table application.  This includes pictures
+of various chemical equipment and of samples of several elements, in
+addition to the actual chemical data.
+
+See the kalzium package for further information.
+
+This package is part of Trinity, as a component of the KDE education module.
+
+%files -n trinity-kalzium-data
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/kalzium/
+
+##########
+
+%package -n trinity-kanagram
+Summary:	letter order game for Trinity
+Group:		Amusements/Games
+Requires:	trinity-tdeedu-data = %{version}-%{release}
+
+%description -n trinity-kanagram
+KAnagram is a game that is based on the word/letter puzzles that the
+author played as a child.  A word is picked at random and displayed
+with its letters in a messed order, with difficulty dependent on the
+chosen level.  You have an unlimited number of attempts, and scores
+are kept.
+
+It is a very simply constructed game, with 3 difficulty levels of
+play.  It is fully customizable, allowing you to write in your own
+words and set your own 'look and feel' of the game.  It is aimed for
+children aged 10+ because of the difficulty, but of course everyone
+is welcome to try.
+
+This package is part of Trinity, as a component of the KDE education module.
+
+%files -n trinity-kanagram
+%defattr(-,root,root,-)
+%{tde_bindir}/kanagram
+%{tde_tdeappdir}/kanagram.desktop
+%{tde_datadir}/apps/kanagram/
+%{tde_datadir}/config.kcfg/kanagram.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/kanagram.png
+%{tde_datadir}/icons/hicolor/scalable/apps/kanagram.svgz
+%{tde_tdedocdir}/HTML/en/kanagram/
+
+%post -n trinity-kanagram
+for i in hicolor ; do
+ touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kanagram
+for i in hicolor ; do
+ touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kbruch
+Summary:	fraction calculation teaching tool for Trinity
+Group:		Amusements/Games
+Requires:	trinity-tdeedu-data = %{version}-%{release}
+
+%description -n trinity-kbruch
+KBruch is a small program to practice calculating with fractions.
+Different exercises are provided for this purpose.  The program
+checks the user's input and gives feedback.
+
+This package is part of Trinity, as a component of the KDE education module.
+
+%files -n trinity-kbruch
+%defattr(-,root,root,-)
+%{tde_bindir}/kbruch
+%{tde_datadir}/apps/kbruch/kbruchui.rc
+%{tde_tdeappdir}/kbruch.desktop
+%{tde_datadir}/config.kcfg/kbruch.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/kbruch.png
+%{tde_datadir}/icons/hicolor/scalable/apps/kbruch.svgz
+%{tde_datadir}/icons/crystalsvg/*/actions/kbruch_*.png
+%{tde_tdedocdir}/HTML/en/kbruch/
+
+%post -n trinity-kbruch
+for i in hicolor ; do
+ touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kbruch
+for i in hicolor ; do
+ touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-keduca
+Summary:	interactive form-based tests for Trinity
+Group:		Amusements/Games
+Requires:	trinity-tdeedu-data = %{version}-%{release}
+
+%description -n trinity-keduca
+KEduca is a flash-card application which allows you to make
+interactive form-based tests.
+
+This package is part of Trinity, as a component of the KDE education module.
+
+%files -n trinity-keduca
+%defattr(-,root,root,-)
+%{tde_bindir}/keduca
+%{tde_bindir}/keducabuilder
+%{tde_tdelibdir}/libkeducapart.la
+%{tde_tdelibdir}/libkeducapart.so
+%{tde_tdeappdir}/keduca.desktop
+%{tde_tdeappdir}/keducabuilder.desktop
+%{tde_datadir}/apps/keduca/
+%{tde_datadir}/config.kcfg/keduca.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/keduca.png
+%{tde_datadir}/mimelnk/application/x-edu.desktop
+%{tde_datadir}/mimelnk/application/x-edugallery.desktop
+%{tde_datadir}/services/keduca_part.desktop
+%{tde_tdedocdir}/HTML/en/keduca/
+
+%post -n trinity-keduca
+for i in hicolor ; do
+ touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-keduca
+for i in hicolor ; do
+ touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kgeography
+Summary:	Geography learning tool for Trinity
+Group:		Amusements/Games
+Requires:	trinity-kgeography-data = %{version}-%{release}
+Requires:	trinity-tdeedu-data = %{version}-%{release}
+
+%description -n trinity-kgeography
+KGeography contains maps allowing you to learn various countries or
+the political divisions of several countries.  It has several modes,
+including a map browser and games involving the names, capitals, or
+flags of the map divisions.
+
+This package is part of Trinity, as a component of the KDE education module.
+
+%files -n trinity-kgeography
+%defattr(-,root,root,-)
+%{tde_bindir}/kgeography
+%{tde_tdeappdir}/kgeography.desktop
+%{tde_datadir}/config.kcfg/kgeography.kcfg
+%{tde_datadir}/icons/crystalsvg/*/apps/kgeography.png
+%{tde_datadir}/icons/crystalsvg/scalable/apps/kgeography.svgz
+%{tde_datadir}/icons/hicolor/*/apps/kgeography.png
+%{tde_tdedocdir}/HTML/en/kgeography
+
+%post -n trinity-kgeography
+for i in hicolor ; do
+ touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kgeography
+for i in hicolor ; do
+ touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kgeography-data
+Summary:	data files for KGeography
+Group:		Amusements/Games
+
+%description -n trinity-kgeography-data
+This package contains architecture-independent data files for
+KGeography, the geography learning tool for KDE. This includes map
+and flag images.
+
+See the kgeography package for further information.
+
+This package is part of Trinity, as a component of the KDE education module.
+
+%files -n trinity-kgeography-data
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/kgeography/
+
+##########
+
+%package -n trinity-khangman
+Summary:	the classical hangman game for Trinity
+Group:		Amusements/Games
+#Requires:	dustin-dustismo-sans-fonts
+Requires:	trinity-tdeedu-data = %{version}-%{release}
+
+%description -n trinity-khangman
+KHangMan is a game based on the well known hangman game.  It is aimed
+for children aged 6 and above.  It has four levels of difficulty:
+Animals (animals words), Easy, Medium and Hard.
+
+A word is picked at random and the letters are hidden.  You must
+guess the word by trying one letter after another.  Each time you
+guess a wrong letter, a picture of a hangman is drawn.  You must
+guess the word before getting hanged!  You have 10 tries.
+
+This package is part of Trinity, as a component of the KDE education module.
+
+%files -n trinity-khangman
+%defattr(-,root,root,-)
+%{tde_datadir}/config/khangmanrc
+%{tde_bindir}/khangman
+%{tde_tdeappdir}/khangman.desktop
+%{tde_datadir}/apps/khangman/
+%{tde_datadir}/config.kcfg/khangman.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/khangman.png
+%{tde_datadir}/icons/hicolor/scalable/apps/khangman.svgz
+%{tde_tdedocdir}/HTML/en/khangman/
+
+%post -n trinity-khangman
+for i in hicolor ; do
+ touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-khangman
+for i in hicolor ; do
+ touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kig
+Summary:	interactive geometry program for KDE
+Group:		Amusements/Games
+Requires:	trinity-tdeedu-data = %{version}-%{release}
+
+%description -n trinity-kig
+Kig is an application for interactive geometry.  It is intended to
+serve two purposes:
+
+- to allow students to interactively explore mathematical figures and
+  concepts using the computer;
+- to serve as a WYSIWYG tool for drawing mathematical figures and
+  including them in other documents.
+
+With this program you can do geometry on a computer just like you
+would on a blackboard in a classroom.  However, the program allows
+you to move and change parts of a geometrical drawing so that you can
+see how the other parts change as a result.
+
+Kig supports loci and user-defined macros.  It also supports imports
+and exports to/from foreign file formats including Cabri, Dr. Geo,
+KGeo, KSeg and XFig.
+
+This package is part of Trinity, as a component of the KDE education module.
+
+%files -n trinity-kig
+%defattr(-,root,root,-)
+%{tde_datadir}/config/magic/cabri.magic
+%{tde_datadir}/config/magic/drgeo.magic
+%{tde_bindir}/kig
+%{tde_bindir}/pykig.py*
+%{tde_tdelibdir}/kfile_drgeo.la
+%{tde_tdelibdir}/kfile_drgeo.so
+%{tde_tdelibdir}/kfile_kig.la
+%{tde_tdelibdir}/kfile_kig.so
+%{tde_tdelibdir}/libkigpart.la
+%{tde_tdelibdir}/libkigpart.so
+%{tde_tdeappdir}/kig.desktop
+%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mgaversion}
+%{tde_datadir}/apps/katepart/syntax/python-kig.xml
+%endif
+%{tde_datadir}/apps/kig/
+%{tde_datadir}/icons/crystalsvg/*/mimetypes/kig_doc.png
+%{tde_datadir}/icons/crystalsvg/scalable/mimetypes/kig_doc.svgz
+%{tde_datadir}/icons/hicolor/*/apps/kig.png
+%{tde_datadir}/icons/hicolor/scalable/apps/kig.svgz
+%{tde_datadir}/mimelnk/application/x-cabri.desktop
+%{tde_datadir}/mimelnk/application/x-drgeo.desktop
+%{tde_datadir}/mimelnk/application/x-kig.desktop
+%{tde_datadir}/mimelnk/application/x-kgeo.desktop
+%{tde_datadir}/mimelnk/application/x-kseg.desktop
+%{tde_datadir}/services/kfile_drgeo.desktop
+%{tde_datadir}/services/kfile_kig.desktop
+%{tde_datadir}/services/kig_part.desktop
+%{tde_tdedocdir}/HTML/en/kig/
+
+%post -n trinity-kig
+for i in crystalsvg hicolor ; do
+ touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kig
+for i in crystalsvg hicolor ; do
+ touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kiten
+Summary:	Japanese reference/study tool for Trinity
+Group:		Amusements/Games
+Requires:	trinity-tdeedu-data = %{version}-%{release}
+#Requires:	ttf-kochi-gothic | ttf-kochi-mincho
+
+%description -n trinity-kiten
+Kiten is a Japanese reference and study tool for KDE.  It is an
+application with multiple functions.  Firstly, it is a convenient
+English to Japanese and Japanese to English dictionary.  Secondly, it
+is a Kanji dictionary, with multiple ways to look up specific
+characters.  Thirdly, it is a tool to help you learn Kanji.
+
+This package is part of Trinity, as a component of the KDE education module.
+
+%files -n trinity-kiten
+%defattr(-,root,root,-)
+%{tde_bindir}/kiten
+%{tde_bindir}/kitengen
+%{tde_tdeappdir}/kiten.desktop
+%{tde_tdedocdir}/HTML/en/kiten/
+%{tde_datadir}/icons/hicolor/*/apps/kiten.png
+%{tde_datadir}/icons/hicolor/scalable/apps/kiten.svgz
+
+%post -n trinity-kiten
+for i in hicolor ; do
+ touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kiten
+for i in hicolor ; do
+ touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-klatin
+Summary:	application to help revise/teach Latin
+Group:		Amusements/Games
+Requires:	trinity-tdeedu-data = %{version}-%{release}
+
+%description -n trinity-klatin
+KLatin is a program to help revise Latin.  There are three "sections"
+in which different aspects of the language can be revised.  These are
+the vocabulary, grammar and verb testing sections.  In addition there
+is a set of revision notes that can be used for self-guided revision.
+
+In the vocabulary section an XML file is loaded containing various
+words and their local language translations.  KLatin asks you what
+each of these words translate into.  The questions take place in a
+multiple-choice environment.
+
+In the grammar and verb sections KLatin asks for a particular part of
+a noun or a verb, such as the "ablative singular", or the "1st person
+indicative passive plural", and is not multiple choice.
+
+This package is part of Trinity, as a component of the KDE education module.
+
+%files -n trinity-klatin
+%defattr(-,root,root,-)
+%{tde_bindir}/klatin
+%{tde_tdeappdir}/klatin.desktop
+%{tde_datadir}/apps/klatin/
+%{tde_datadir}/config.kcfg/klatin.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/klatin.png
+%{tde_datadir}/icons/hicolor/scalable/apps/klatin.svgz
+%{tde_tdedocdir}/HTML/en/klatin/
+
+%post -n trinity-klatin
+for i in hicolor ; do
+ touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-klatin
+for i in hicolor ; do
+ touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-klettres
+Summary:	foreign alphabet tutor for Trinity
+Group:		Amusements/Games
+Requires:	trinity-klettres-data = %{version}-%{release}
+Requires:	trinity-tdeedu-data = %{version}-%{release}
+
+%description -n trinity-klettres
+KLettres is an application specially designed to help the user to
+learn the alphabet in a new language and then to learn to read simple
+syllables.  The user can be a young child aged from two and a half or
+an adult that wants to learn the basics of a foreign language.
+
+Seven languages are currently available: Czech, Danish, Dutch,
+English, French, Italian and Slovak.
+
+This package is part of Trinity, as a component of the KDE education module.
+
+%files -n trinity-klettres
+%defattr(-,root,root,-)
+%{tde_datadir}/config/klettresrc
+%{tde_bindir}/klettres
+%{tde_tdeappdir}/klettres.desktop
+%{tde_datadir}/config.kcfg/klettres.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/klettres.png
+%{tde_datadir}/icons/hicolor/scalable/apps/klettres.svgz
+%{tde_tdedocdir}/HTML/en/klettres/
+
+%post -n trinity-klettres
+for i in hicolor ; do
+ touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-klettres
+for i in hicolor ; do
+ touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-klettres-data
+Summary:	data files for KLettres foreign alphabet tutor
+Group:		Amusements/Games
+
+%description -n trinity-klettres-data
+This package contains architecture-independent data files for
+KLettres, the foreign alphabet tutor for KDE.  This includes sound
+files and graphics.
+
+See the klettres package for further information.
+
+This package is part of Trinity, as a component of the KDE education module.
+
+%files -n trinity-klettres-data
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/klettres/
+
+##########
+
+%package -n trinity-kmplot
+Summary:	mathematical function plotter for Trinity
+Group:		Amusements/Games
+Requires:	trinity-tdeedu-data = %{version}-%{release}
+
+%description -n trinity-kmplot
+KmPlot is a mathematical function plotter for KDE.  It has a powerful
+built-in parser.  You can plot different functions simultaneously and
+combine them to build new functions.
+
+KmPlot supports parametric functions and functions in polar
+coordinates.  Several grid modes are supported.  Plots may be printed
+with high precision in the correct scale.
+
+KmPlot also provides some numerical and visual features, like filling
+and calculating the area between the plot and the first axis, finding
+maximum and minimum values, changing function parameters dynamically
+and plotting derivatives and integral functions.
+
+This package is part of Trinity, as a component of the KDE education module.
+
+%files -n trinity-kmplot
+%defattr(-,root,root,-)
+%{tde_bindir}/kmplot
+%{tde_tdelibdir}/libkmplotpart.la
+%{tde_tdelibdir}/libkmplotpart.so
+%{tde_tdeappdir}/kmplot.desktop
+%{tde_datadir}/apps/kmplot/
+%{tde_datadir}/config.kcfg/kmplot.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/kmplot.png
+%{tde_datadir}/icons/hicolor/scalable/apps/kmplot.svgz
+%{tde_datadir}/mimelnk/application/x-kmplot.desktop
+%{tde_datadir}/services/kmplot_part.desktop
+%{tde_tdedocdir}/HTML/en/kmplot/
+
+%post -n trinity-kmplot
+for i in hicolor ; do
+ touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kmplot
+for i in hicolor ; do
+ touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kpercentage
+Summary:	percentage calculation teaching tool for Trinity
+Group:		Amusements/Games
+Requires:	trinity-tdeedu-data = %{version}-%{release}
+
+%description -n trinity-kpercentage
+KPercentage is a small math application that will help pupils to
+improve their skills in calculating percentages.
+
+There is a special training section for the three basic tasks.
+Finally the pupil can select a random mode, in which all three tasks
+are mixed randomly.
+
+This package is part of Trinity, as a component of the KDE education module.
+
+%files -n trinity-kpercentage
+%defattr(-,root,root,-)
+%{tde_bindir}/kpercentage
+%{tde_tdeappdir}/kpercentage.desktop
+%{tde_datadir}/apps/kpercentage/
+%{tde_datadir}/icons/hicolor/*/apps/kpercentage.png
+%{tde_datadir}/icons/hicolor/scalable/apps/kpercentage.svgz
+%{tde_tdedocdir}/HTML/en/kpercentage/
+
+%post -n trinity-kpercentage
+for i in hicolor ; do
+ touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kpercentage
+for i in hicolor ; do
+ touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kstars
+Summary:	desktop planetarium for Trinity
+Group:		Amusements/Games
+Requires:	trinity-tdeedu-data = %{version}-%{release}
+Requires:	trinity-kstars-data = %{version}-%{release}
+Requires:	trinity-indi = %{version}-%{release}
+
+%description -n trinity-kstars
+KStars is a graphical desktop planetarium for KDE.  It depicts an
+accurate simulation of the night sky, including stars,
+constellations, star clusters, nebulae, galaxies, all planets, the
+Sun, the Moon, comets and asteroids.  You can see the sky as it
+appears from any location on Earth, on any date.
+
+The user interface is highly intuitive and flexible.  The display can
+be panned and zoomed with the mouse, and you can easily identify
+objects and track their motion across the sky.  KStars includes many
+powerful features, yet the interface is clean and simple and fun to
+use.
+
+This package is part of Trinity, as a component of the KDE education module.
+
+%files -n trinity-kstars
+%defattr(-,root,root,-)
+%{tde_datadir}/config/kstarsrc
+%{tde_bindir}/kstars
+%{tde_tdeappdir}/kstars.desktop
+%{tde_datadir}/config.kcfg/kstars.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/kstars.png
+%{tde_datadir}/icons/hicolor/scalable/apps/kstars.svgz
+%{tde_tdedocdir}/HTML/en/kstars/
+
+%post -n trinity-kstars
+for i in hicolor ; do
+ touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kstars
+for i in hicolor ; do
+ touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kstars-data
+Summary:	data files for KStars desktop planetarium
+Group:		Amusements/Games
+
+%description -n trinity-kstars-data
+This package contains architecture-independent data files for KStars,
+the graphical desktop planetarium for KDE.  This includes star
+catalogues and astronomical images.
+
+See the kstars package for further information.
+
+This package is part of Trinity, as a component of the KDE education module.
+
+%files -n trinity-kstars-data
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/kstars/
+
+##########
+
+%package -n trinity-ktouch
+Summary:	touch typing tutor for Trinity
+Group:		Amusements/Games
+Requires:	trinity-tdeedu-data = %{version}-%{release}
+
+%description -n trinity-ktouch
+KTouch is a program for learning touch typing - it helps you learn to
+type on a keyboard quickly and correctly.  Every finger has its place
+on the keyboard with associated keys to press.
+
+KTouch helps you learn to touch type by providing you with text to
+train on, and adjusts to different levels depending on how good you
+are.  It can display which key to press next, and the correct finger
+to use.
+
+This package is part of Trinity, as a component of the KDE education module.
+
+%files -n trinity-ktouch
+%defattr(-,root,root,-)
+%{tde_bindir}/ktouch
+%{tde_tdeappdir}/ktouch.desktop
+%{tde_datadir}/apps/ktouch/
+%{tde_datadir}/config.kcfg/ktouch.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/ktouch.png
+%{tde_datadir}/icons/hicolor/scalable/apps/ktouch.svgz
+%{tde_tdedocdir}/HTML/en/ktouch/
+
+%post -n trinity-ktouch
+for i in hicolor ; do
+ touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-ktouch
+for i in hicolor ; do
+ touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kturtle
+Summary:	educational Logo programming environment
+Group:		Amusements/Games
+Requires:	trinity-tdeedu-data = %{version}-%{release}
+
+%description -n trinity-kturtle
+KTurtle is an educational programming environment using the Logo
+programming language.  It tries to make programming as easy and
+accessible as possible.  This makes KTurtle suitable for teaching
+kids the basics of mathematics, geometry and programming.
+
+The commands used to program are in the style of the Logo programming
+language.  The unique feature of Logo is that the commands are often
+translated into the speaking language of the programmer.
+
+KTurtle is named after "the turtle" that plays a central role in the
+programming environment.  The user programs the turtle, using the
+Logo commands, to draw a picture on the canvas.
+
+Note that this version of Logo is only focused on the educational
+qualities of the programming language and will not try to suit
+professional programmers' needs.
+
+This package is part of Trinity, as a component of the KDE education module.
+
+%files -n trinity-kturtle
+%defattr(-,root,root,-)
+%{tde_bindir}/kturtle
+%{tde_tdeappdir}/kturtle.desktop
+%{tde_datadir}/apps/katepart/syntax/logohighlightstyle*
+%{tde_datadir}/apps/kturtle/
+%{tde_datadir}/config.kcfg/kturtle.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/kturtle.png
+%{tde_tdedocdir}/HTML/en/kturtle/
+
+%post -n trinity-kturtle
+for i in hicolor ; do
+ touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kturtle
+for i in hicolor ; do
+ touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kverbos
+Summary:	Spanish verb form study application for Trinity
+Group:		Amusements/Games
+Requires:	trinity-tdeedu-data = %{version}-%{release}
+
+%description -n trinity-kverbos
+Kverbos allows the user to learn the forms of Spanish verbs.  The
+program suggests a verb and a time and the user enters the different
+verb forms.  The program corrects the user input and gives feedback.
+
+The user can edit the list of the verbs that can be studied.  The
+program can build regular verb forms by itself.  Irregular verb forms
+have to be entered by the user.
+
+This package is part of Trinity, as a component of the KDE education module.
+
+%files -n trinity-kverbos
+%defattr(-,root,root,-)
+%{tde_bindir}/kverbos
+%{tde_tdeappdir}/kverbos.desktop
+%{tde_datadir}/apps/kverbos/
+%{tde_datadir}/config.kcfg/kverbos.kcfg
+%{tde_datadir}/icons/crystalsvg/16x16/actions/kverbosuser.png
+%{tde_datadir}/icons/hicolor/*/apps/kverbos.png
+%{tde_datadir}/icons/hicolor/scalable/apps/kverbos.svgz
+%{tde_tdedocdir}/HTML/en/kverbos/
+
+%post -n trinity-kverbos
+for i in hicolor ; do
+ touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kverbos
+for i in hicolor ; do
+ touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kvoctrain
+Summary:	vocabulary trainer for Trinity
+Group:		Amusements/Games
+Requires:	perl
+Requires:	perl-libwww-perl
+Requires:	trinity-tdeedu-data = %{version}-%{release}
+
+%description -n trinity-kvoctrain
+KVocTrain is a little utility to help you train your vocabulary when
+you are trying to learn a foreign language.  You can create your own
+database with the words you need.  It is intended as a replacement
+for index (flash) cards.
+
+You probably remember flashcards from school.  The teacher would
+write the original expression on the front side of the card and the
+translation on the back.  Then look at the cards one after another.
+If you knew the translation, you could put it away.  If you failed,
+you put it back to try again.
+
+KVocTrain is not intended to teach you grammar or other sophisticated
+things.  This is and probably will stay beyond the scope of this
+application.
+
+This package is part of Trinity, as a component of the KDE education module.
+
+%files -n trinity-kvoctrain
+%defattr(-,root,root,-)
+%{tde_datadir}/config/kvoctrainrc
+%{tde_bindir}/kvoctrain
+%{tde_bindir}/spotlight2kvtml
+%{tde_libdir}/libkvoctraincore.so.*
+%{tde_tdeappdir}/kvoctrain.desktop
+%{tde_datadir}/apps/kvoctrain/
+%{tde_datadir}/mimelnk/text/x-kvtml.desktop
+%{tde_datadir}/config.kcfg/kvoctrain.kcfg
+%{tde_datadir}/config.kcfg/languagesettings.kcfg
+%{tde_datadir}/config.kcfg/presettings.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/kvoctrain.png
+%{tde_tdedocdir}/HTML/en/kvoctrain/
+
+%post -n trinity-kvoctrain
+/sbin/ldconfig || :
+for i in hicolor ; do
+ touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kvoctrain
+/sbin/ldconfig || :
+for i in hicolor ; do
+ touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kwordquiz
+Summary:	flashcard and vocabulary learning program for Trinity
+Group:		Amusements/Games
+Requires:	trinity-tdeedu-data = %{version}-%{release}
+
+%description -n trinity-kwordquiz
+KWordQuiz is a flashcard-based tool that helps you to master new
+vocabularies. It may be a language or any other kind of terminology.
+
+KWordQuiz can open several types of vocabulary data.  Supported are
+kvtml files used by other KDE programs such as KVocTrain, wql files
+used by WordQuiz for Windows, csv files with comma-separated text,
+and xml.gz files created by Pauker (http://pauker.sourceforge.net).
+
+This package is part of Trinity, as a component of the KDE education module.
+
+%files -n trinity-kwordquiz
+%defattr(-,root,root,-)
+%{tde_datadir}/config/kwordquizrc
+%{tde_bindir}/kwordquiz
+%{tde_tdeappdir}/kwordquiz.desktop
+%{tde_datadir}/apps/kwordquiz/
+%{tde_datadir}/config.kcfg/kwordquiz.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/kwordquiz.png
+%{tde_datadir}/icons/hicolor/scalable/apps/kwordquiz.svg
+%{tde_datadir}/icons/crystalsvg/*/mimetypes/kwordquiz_doc.png
+%{tde_datadir}/icons/crystalsvg/scalable/mimetypes/kwordquiz_doc.svg
+%{tde_datadir}/mimelnk/application/x-kwordquiz.desktop
+%{tde_tdedocdir}/HTML/en/kwordquiz/
+
+%post -n trinity-kwordquiz
+for i in hicolor ; do
+ touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kwordquiz
+for i in hicolor ; do
+ touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-libtdeedu3
+Summary:	library for use with Trinity educational apps
+Group:		Environment/Libraries
+
+%description -n trinity-libtdeedu3
+The KDE-based library libtdeedu is used with educational
+applications.  It currently provides support for data plotting and
+vocabulary items (including a parser for kvtml vocabulary files).
+
+This package is part of Trinity, as a component of the KDE education module.
+
+%files -n trinity-libtdeedu3
+%defattr(-,root,root,-)
+%{tde_libdir}/libextdate.so.*
+%{tde_libdir}/lib[kt]deeducore.so.*
+%{tde_libdir}/lib[kt]deeduplot.so.*
+%{tde_libdir}/lib[kt]deeduui.so.*
+
+%post -n trinity-libtdeedu3
+/sbin/ldconfig || :
+
+%postun -n trinity-libtdeedu3
+/sbin/ldconfig || :
+
+##########
+
+%package -n trinity-libtdeedu-devel
+Summary:	development files for Trinity educational library
+Group:		Development/Libraries
+Requires:	trinity-libtdeedu3 = %{version}-%{release}
+
+%description -n trinity-libtdeedu-devel
+The KDE-based library libtdeedu is used with educational
+applications.  It currently provides support for data plotting and
+vocabulary items (including a parser for kvtml vocabulary files).
+
+Development files for libtdeedu are included in this package.
+
+This package is part of Trinity, as a component of the KDE education module.
+
+%files -n trinity-libtdeedu-devel
+%defattr(-,root,root,-)
+%{tde_tdeincludedir}/lib[kt]deedu/
+%{tde_libdir}/libextdate.la
+%{tde_libdir}/libextdate.so
+%{tde_libdir}/lib[kt]deeducore.la
+%{tde_libdir}/lib[kt]deeducore.so
+%{tde_libdir}/lib[kt]deeduui.la
+%{tde_libdir}/lib[kt]deeduui.so
+%{tde_libdir}/lib[kt]deeduplot.la
+%{tde_libdir}/lib[kt]deeduplot.so
+
+%post -n trinity-libtdeedu-devel
+/sbin/ldconfig || :
+
+%postun -n trinity-libtdeedu-devel
+/sbin/ldconfig || :
+
+
+##########
+
+%package -n trinity-libkiten1
+Summary:	library for Kiten Japanese reference/study tool
+Group:		Environment/Libraries
+#Requires:	kanjidic
+
+%description -n trinity-libkiten1
+Kiten is a Japanese reference/study tool for KDE.  The library
+libkiten contains portions of Kiten that may be useful for other
+applications.  These portions include dictionary, character lookup
+and widget classes.
+
+This package contains the libkiten library along with supporting
+data, such as Japanese language data files and GUI resource files.
+For further information, see the kiten package.
+
+This package is part of Trinity, as a component of the KDE education module.
+
+%files -n trinity-libkiten1
+%defattr(-,root,root,-)
+%{tde_libdir}/libkiten.so.*
+%{tde_datadir}/apps/kiten/
+%{tde_datadir}/config.kcfg/kiten.kcfg
+%{tde_datadir}/icons/crystalsvg/16x16/actions/kanjidic.png
+%{tde_datadir}/icons/crystalsvg/22x22/actions/edit_add.png
+%{tde_datadir}/icons/crystalsvg/22x22/actions/edit_remove.png
+%{tde_datadir}/icons/crystalsvg/22x22/actions/kanjidic.png
+%{tde_datadir}/icons/locolor/16x16/actions/edit_add.png
+%{tde_datadir}/icons/locolor/16x16/actions/edit_remove.png
+
+%post -n trinity-libkiten1
+for i in crystalsvg locolor locolor ; do
+ touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
+done
+/sbin/ldconfig || :
+
+%postun -n trinity-libkiten1
+for i in crystalsvg locolor locolor ; do
+ touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
+done
+/sbin/ldconfig || :
+
+##########
+
+%package -n trinity-libkiten-devel
+Summary:	development files for Kiten library
+Group:		Development/Libraries
+Requires:	trinity-libkiten1 = %{version}-%{release}
+Requires:	trinity-tdelibs-devel >= 3.5.13
+
+%description -n trinity-libkiten-devel
+Kiten is a Japanese reference/study tool for KDE.  The library
+libkiten contains portions of Kiten that may be useful for other
+applications.  These portions include dictionary, character lookup
+and widget classes.
+
+Development files for libkiten are included in this package.  For
+further information, see the kiten package.
+
+This package is part of Trinity, as a component of the KDE education module.
+
+%files -n trinity-libkiten-devel
+%defattr(-,root,root,-)
+%{tde_tdeincludedir}/libkiten/
+%{tde_libdir}/libkiten.la
+%{tde_libdir}/libkiten.so
+
+%post -n trinity-libkiten-devel
+/sbin/ldconfig || :
+
+%postun -n trinity-libkiten-devel
+/sbin/ldconfig || :
+
+##########
+
+%package -n trinity-indi
+Summary:	Instrument Neutral Distributed Interface for astronomical devices
+Group:		Amusements/Games
+
+%description -n trinity-indi
+INDI is an Instrument Neutral Distributed Interface control protocol for
+astronomical devices, which provides a framework that decouples low level
+hardware drivers from high level front end clients. Clients that use the
+device drivers are completely unaware of the device capabilities and
+communicate with the device drivers and build a completely dynamic GUI
+based on the services provided by the device.
+
+This package is part of Trinity, as a component of the KDE education module.
+
+%files -n trinity-indi
+%defattr(-,root,root,-)
+%{tde_bindir}/apmount
+%{tde_bindir}/apogee_ppi
+%{tde_bindir}/celestrongps
+%{tde_bindir}/fliccd
+%{tde_bindir}/fliwheel
+%{tde_bindir}/indiserver
+%{tde_bindir}/lx200_16
+%{tde_bindir}/lx200autostar
+%{tde_bindir}/lx200basic
+%{tde_bindir}/lx200classic
+%{tde_bindir}/lx200generic
+%{tde_bindir}/lx200gps
+%{tde_bindir}/meade_lpi
+%{tde_bindir}/sbigccd
+%{tde_bindir}/skycommander
+%{tde_bindir}/temma
+%{tde_bindir}/v4ldriver
+%{tde_bindir}/v4lphilips
+
+##########
+
 %package devel
-Summary: Development files for %{name}
-Group: Development/Libraries
-Provides: kdeedu3-devel = %{version}-%{release}
-Requires: %{name}-libs = %{version}-%{release}
+Summary:	Development files for %{name}
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+Requires:	trinity-libtdeedu-devel = %{version}-%{release}
+Requires:	trinity-libkiten-devel = %{version}-%{release}
+
+Obsoletes:	trinity-kdeedu-devel < %{version}-%{release}
+Provides:	trinity-kdeedu-devel = %{version}-%{release}
+
 %description devel
 %{summary}.
 
-%package libs
-Summary: %{name} runtime libraries
-Group:   System Environment/Libraries
-Requires: trinity-kdelibs
-# include to be paranoid, installing libs-only is still mostly untested -- Rex
-Requires: %{name} = %{version}-%{release}
-%description libs
-%{summary}.
+%files devel
+%defattr(-,root,root,-)
+%doc libkdeedu/AUTHORS libkdeedu/README
+# kstars
+%{tde_tdeincludedir}/kstarsinterface.h
+%{tde_tdeincludedir}/simclockinterface.h
+# kvoctrain
+%{tde_libdir}/libkvoctraincore.la
+%{tde_libdir}/libkvoctraincore.so
+
+%post devel
+/sbin/ldconfig || :
+
+%postun devel
+/sbin/ldconfig || :
+
+##########
 
 
 %prep
 %setup -q -n kdeedu
 %patch1 -p1 -b .gcc47
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1 -b .ftbfs
 
 # Ugly hack to modify TQT include directory inside autoconf files.
 # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+%__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"
@@ -106,17 +1345,19 @@ Requires: %{name} = %{version}-%{release}
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
-
-# Fix link with kparts
-export CXXFLAGS="${CXXFLAGS} -lkparts"
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
+   --exec-prefix=%{_prefix} \
+   --bindir=%{tde_bindir} \
+   --libdir=%{tde_libdir} \
+   --datadir=%{tde_datadir} \
+   --includedir=%{tde_tdeincludedir} \
    --enable-new-ldflags \
    --disable-dependency-tracking \
    --disable-rpath \
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion}
    --enable-kig-python-scripting \
 %else
    --disable-kig-python-scripting \
@@ -125,17 +1366,17 @@ export CXXFLAGS="${CXXFLAGS} -lkparts"
    --disable-warnings \
    --enable-final \
    --enable-closure \
-   --includedir=%{_includedir}/kde \
    --disable-ocamlsolver \
-   --with-extra-includes=%{_includedir}/tqt
+   --with-extra-includes=%{tde_includedir}/tqt
 
 
-%__make \
-  OCAMLLIB=$(ocamlc -where) FACILELIB=$(ocamlc -where)
+%__make %{_smp_mflags} \
+  OCAMLLIB=$(ocamlc -where) \
+  FACILELIB=$(ocamlc -where)
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
@@ -157,67 +1398,23 @@ for lang_dir in %{buildroot}$HTML_DIR/* ; do
 done
 fi
 
-# rpmdocs
-for dir in blinken k* ; do
-  for file in AUTHORS ChangeLog README TODO ; do
-    test -s  "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
-  done
-done
-
 
 %clean
 %__rm -rf %{buildroot}
 
 
-%post
-for i in crystalsvg hicolor locolor ; do
- touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database >& /dev/null ||:
 
-%postun
-for i in crystalsvg hicolor locolor ; do
- touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database >& /dev/null ||:
-
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
-
-
-%files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc README COPYING
-%doc rpmdocs/*
-%{_bindir}/*
-%{_datadir}/applications/kde/*
-# FIXME
-%{_datadir}/applnk/Edutainment/
-%{_datadir}/apps/*
-%config %{_datadir}/config*/*
-%{_datadir}/mimelnk/*/*
-%{_datadir}/icons/crystalsvg/*/*/*
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/icons/locolor/*/*/*
-%{_datadir}/services/*
-%{tde_libdir}/*
-
-%files libs
-%defattr(-,root,root,-)
-%{_libdir}/lib*.so.*
-%{_libdir}/lib*.la
-
-%files devel
-%defattr(-,root,root,-)
-%doc libkdeedu/AUTHORS libkdeedu/README
-%{tde_includedir}/*
-%{_libdir}/lib*.so
 
 
 %changelog
+* Wed Aug 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
+- Split into several packages
+- Renames to 'trinity-tdeedu'
+- Add support for Mageia 2
+- Fix kdeedu makefile glitch [Bug #785] [Commit #b83d0455]
+- Fix kbruch/Makefile.am to eliminate build error. [Bug #786] [Commit #9d1871a4]
+- Fix linear alphabet string errors [Commit #0cd3b7ce]
+
 * Wed Apr 25 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
 - Fix compilation with GCC 4.7 [Bug #958]
 - Enable 'kgeography' on RHEL
diff --git a/redhat/kdegames/kdegames-3.5.13-missing_ldflags.patch b/redhat/kdegames/kdegames-3.5.13-missing_ldflags.patch
new file mode 100644
index 000000000..44f740f53
--- /dev/null
+++ b/redhat/kdegames/kdegames-3.5.13-missing_ldflags.patch
@@ -0,0 +1,44 @@
+--- kdegames/libkdegames/Makefile.am.ORI	2012-07-31 20:25:24.961859509 +0200
++++ kdegames/libkdegames/Makefile.am	2012-07-31 20:25:32.306619391 +0200
+@@ -2,7 +2,7 @@
+ lib_LTLIBRARIES = libkdegames.la
+ libkdegames_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -version-info 3:0:2
+ libkdegames_la_LIBADD  = highscore/libkhighscore.la kgame/libkgame.la kgame/dialogs/libkgamedialogs.la \
+-		$(LIB_KSYCOCA) $(LIB_KDNSSD)
++		$(LIB_KSYCOCA) $(LIB_KDNSSD) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+ 
+ libkdegames_la_SOURCES = kcarddialog.cpp kstdgameaction.cpp \
+ 		kgamemisc.cpp kchatbase.cpp kchat.cpp \
+--- kdegames/atlantik/libatlantikclient/Makefile.am.ORI	2012-07-31 20:26:55.089913155 +0200
++++ kdegames/atlantik/libatlantikclient/Makefile.am	2012-07-31 20:27:00.414739083 +0200
+@@ -1,7 +1,7 @@
+ INCLUDES = -I$(top_srcdir)/atlantik/libatlantic $(all_includes)
+ lib_LTLIBRARIES = libatlantikclient.la
+ libatlantikclient_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -version-info 3:0:2
+-libatlantikclient_la_LIBADD = ../libatlantic/libatlantic.la $(LIB_KIO)
++libatlantikclient_la_LIBADD = ../libatlantic/libatlantic.la $(LIB_KIO) $(LIB_KDECORE)
+ 
+ libatlantikclient_la_SOURCES = atlantik_network.cpp monopdprotocol.cpp
+ 
+--- kdegames/atlantik/libatlantikui/Makefile.am.ORI	2012-07-31 20:29:44.177385572 +0200
++++ kdegames/atlantik/libatlantikui/Makefile.am	2012-07-31 20:30:27.821958801 +0200
+@@ -1,7 +1,7 @@
+ INCLUDES = -I$(top_srcdir)/atlantik/libatlantic $(all_includes)
+ lib_LTLIBRARIES = libatlantikui.la
+ libatlantikui_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -version-info 3:0:2
+-libatlantikui_la_LIBADD = ../libatlantic/libatlantic.la $(LIB_KIO)
++libatlantikui_la_LIBADD = ../libatlantic/libatlantic.la $(LIB_KIO) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx
+ 
+ libatlantikui_la_SOURCES = auction_widget.cpp board.cpp estatedetails.cpp \
+ 	estateview.cpp kwrappedlistviewitem.cpp portfolioestate.cpp \
+--- kdegames/kolf/Makefile.am.ORI	2012-07-31 20:38:20.125518870 +0200
++++ kdegames/kolf/Makefile.am	2012-07-31 20:38:30.672174091 +0200
+@@ -12,7 +12,7 @@
+ 	floater.cpp slope.cpp
+ 
+ libkolf_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
+-libkolf_la_LIBADD = $(LIB_KDEGAMES) $(LIB_KDEPRINT) $(LIB_KIO) -lartskde
++libkolf_la_LIBADD = $(LIB_KDEGAMES) $(LIB_KDEPRINT) $(LIB_KIO) -lartskde -lkdefx -lsoundserver_idl -lartsmodules
+ libkolf_la_DEPENDENCIES = $(LIB_KDEGAMES_DEP)
+ 
+ 
diff --git a/redhat/kdegames/trinity-kdegames-3.5.13.spec b/redhat/kdegames/trinity-kdegames-3.5.13.spec
index 1471461a8..ea34048ac 100644
--- a/redhat/kdegames/trinity-kdegames-3.5.13.spec
+++ b/redhat/kdegames/trinity-kdegames-3.5.13.spec
@@ -1,41 +1,94 @@
 # 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
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%define tde_bindir %{_prefix}/bin
+%define tde_datadir %{_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{_prefix}/include
+%define tde_libdir %{_prefix}/%{_lib}
 
+%define tde_tdeappdir %{tde_datadir}/applications/kde
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
 
-Name:    trinity-kdegames
-Summary: Trinity Desktop Environment - Games
-Version: 3.5.13
-Release: 3%{?dist}%{?_variant}
+%define _docdir %{tde_docdir}
 
-License: GPLv2
-Group:   Amusements/Games
+
+Name:		trinity-tdegames
+Summary:	Trinity Desktop Environment - Games
+Version:	3.5.13
+Release:	4%{?dist}%{?_variant}
+
+License:	GPLv2
+Group:		Amusements/Games
 
 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)
+Prefix:		%{_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source: 	kdegames-%{version}.tar.gz
 
 # [kdegames/ktuberling] Fix ktuberling pictures loading
 Patch0:		kdegames-3.5.13-ktuberling_fail_load_picture.patch
+# [kdegames] Missing LDFLAGS cause FTBFS on Mageia 2
+Patch1:		kdegames-3.5.13-missing_ldflags.patch
+
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	trinity-tdelibs-devel
+BuildRequires:	libtool
 
-Provides: kdegames3 = %{version}-%{release}
+BuildRequires:	tqtinterface-devel >= 3.5.13
+BuildRequires:	trinity-arts-devel >= 3.5.13
+BuildRequires:	qt3-devel >= 3.3.8.d
 
-BuildRequires: autoconf automake libtool m4
-BuildRequires: trinity-kdelibs-devel
+Obsoletes:		trinity-kdegames < %{version}-%{release}
+Provides:		trinity-kdegames = %{version}-%{release}
+Obsoletes:		trinity-kdegames-libs < %{version}-%{release}
+Provides:		trinity-kdegames-libs = %{version}-%{release}
+
+Requires: trinity-libtdegames1 = %{version}-%{release}
+Requires: trinity-tdegames-card-data = %{version}-%{release}
+Requires: trinity-atlantik = %{version}-%{release}
+Requires: trinity-kasteroids = %{version}-%{release}
+Requires: trinity-katomic = %{version}-%{release}
+Requires: trinity-kbackgammon = %{version}-%{release}
+Requires: trinity-kbattleship = %{version}-%{release}
+Requires: trinity-kblackbox = %{version}-%{release}
+Requires: trinity-kbounce = %{version}-%{release}
+Requires: trinity-kenolaba = %{version}-%{release}
+Requires: trinity-kfouleggs = %{version}-%{release}
+Requires: trinity-kgoldrunner = %{version}-%{release}
+Requires: trinity-kjumpingcube = %{version}-%{release}
+Requires: trinity-klickety = %{version}-%{release}
+Requires: trinity-klines = %{version}-%{release}
+Requires: trinity-kmahjongg = %{version}-%{release}
+Requires: trinity-kmines = %{version}-%{release}
+Requires: trinity-knetwalk = %{version}-%{release}
+Requires: trinity-kolf = %{version}-%{release}
+Requires: trinity-kolf-devel = %{version}-%{release}
+Requires: trinity-konquest = %{version}-%{release}
+Requires: trinity-kpat = %{version}-%{release}
+Requires: trinity-kpoker = %{version}-%{release}
+Requires: trinity-kreversi = %{version}-%{release}
+Requires: trinity-ksame = %{version}-%{release}
+Requires: trinity-kshisen = %{version}-%{release}
+Requires: trinity-ksirtet = %{version}-%{release}
+Requires: trinity-ksmiletris = %{version}-%{release}
+Requires: trinity-ksnake = %{version}-%{release}
+Requires: trinity-ksokoban = %{version}-%{release}
+Requires: trinity-kspaceduel = %{version}-%{release}
+Requires: trinity-ktron = %{version}-%{release}
+Requires: trinity-ktuberling = %{version}-%{release}
+Requires: trinity-twin4 = %{version}-%{release}
+Requires: trinity-lskat = %{version}-%{release}
 
-Requires: %{name}-libs = %{version}-%{release}
 
 %description
 Games and gaming libraries for the Trinity Desktop Environment.
@@ -43,39 +96,1436 @@ Included with this package are: kenolaba, kasteroids, kblackbox, kmahjongg,
 kmines, konquest, kpat, kpoker, kreversi, ksame, kshisen, ksmiletris,
 ksnake, ksirtet, katomic, kjumpingcube, ktuberling.
 
+%files
+
+##########
+
 %package devel
-Summary: Development files for %{name} 
-Group: Development/Libraries
-License: LGPLv2
-Provides: kdegames3-devel = %{version}-%{release}
-Requires: %{name}-libs = %{version}-%{release}
-Requires: trinity-kdelibs-devel
+Summary:	Development files for %{name} 
+Group:		Development/Libraries
+License:	LGPLv2
+
+Requires:	%{name} = %{version}-%{release}
+Requires:	trinity-tdelibs-devel >= 3.5.13
+Requires:	trinity-libtdegames-devel = %{version}-%{release}
+Requires:	trinity-atlantik-devel = %{version}-%{release}
+
+Obsoletes:		trinity-kdegames-devel < %{version}-%{release}
+Provides:		trinity-kdegames-devel = %{version}-%{release}
+
 %description devel
 %{summary}.
+
 Install %{name}-devel if you wish to develop or compile games for the
 TDE desktop.
 
-%package libs
-Summary: %{name} runtime libraries
-Group:   System Environment/Libraries
-Requires: trinity-kdelibs
-License: LGPLv2
-# include to paranoid, installing libs-only is still mostly untested -- Rex
-#Requires: %{name} = %{version}-%{release}
-%description libs
-%{summary}.
+%files devel
+%defattr(-,root,root,-)
+
+##########
+
+%package -n trinity-libtdegames1
+Summary:	Trinity games library and common files
+Group:		Amusements/Games
+
+%description -n trinity-libtdegames1
+This library provides a common infrastructure for several of the
+games in the TDE distribution. Features include standardized menu
+items, high score handling, card display, and network connections
+including chat capabilities.
+
+This package is part of TDE, and a component of the TDE games module.
+
+%files -n trinity-libtdegames1
+%defattr(-,root,root,-)
+%{tde_libdir}/lib[kt]degames.so.*
+%{tde_datadir}/apps/[kt]degames/pics/star.png
+%{tde_datadir}/icons/crystalsvg/*/actions/roll.png
+%{tde_datadir}/icons/crystalsvg/*/actions/highscore.png
+%{tde_libdir}/lib[kt]degames.so
+%{tde_libdir}/lib[kt]degames.la
+%{tde_tdedocdir}/HTML/en/[kt]degames-apidocs/
+
+%post -n trinity-libtdegames1
+for f in crystalsvg ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+/sbin/ldconfig || :
+
+%postun -n trinity-libtdegames1
+for f in crystalsvg ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+/sbin/ldconfig || :
+
+##########
+
+%package -n trinity-libtdegames-devel
+Summary:	Trinity games library headers
+Group:		Development/Libraries
+Requires:	trinity-libtdegames1 = %{version}-%{release}
+
+%description -n trinity-libtdegames-devel
+This package is necessary if you want to develop your own games using
+the TDE games library.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-libtdegames-devel
+%defattr(-,root,root,-)
+%{tde_tdeincludedir}/*.h
+%{tde_tdeincludedir}/kgame
+
+##########
+
+%package card-data
+Summary:	Card decks for Trinity games
+Group:		Amusements/Games
+
+%description card-data
+Several different collections of card images for use by TDE games.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files card-data
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/carddecks/*
+
+##########
+
+%package -n trinity-atlantik
+Summary:	TDE client for Monopoly-like network games
+Group:		Amusements/Games
+
+%description -n trinity-atlantik
+This is a TDE client for playing Monopoly-like boardgames on the
+monopd network.  It can play any board supported by the network
+server, including the classic Monopoly game, as well as the Atlantik
+game in which the property includes several major cities in North
+America and Europe.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-atlantik
+%defattr(-,root,root,-)
+%{tde_bindir}/atlantik
+%{tde_libdir}/libatlantic.so.*
+%{tde_libdir}/libatlantikclient.so.*
+%{tde_libdir}/libatlantikui.so.*
+%{tde_tdelibdir}/kio_atlantik.la
+%{tde_tdelibdir}/kio_atlantik.so
+%{tde_datadir}/services/atlantik.protocol
+%{tde_tdeappdir}/atlantik.desktop
+%{tde_datadir}/icons/hicolor/*/apps/atlantik.png
+%{tde_datadir}/apps/atlantik/
+%{tde_tdedocdir}/HTML/en/atlantik/
+
+%post -n trinity-atlantik
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+/sbin/ldconfig || :
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-atlantik
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+/sbin/ldconfig || :
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-atlantik-devel
+Summary:	Development files for Atlantik
+Group:		Development/Libraries
+Requires:	trinity-atlantik = %{version}-%{release}
+
+%description -n trinity-atlantik-devel
+This package contains header files for compiling programs against the
+libraries which come with Atlantik.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-atlantik-devel
+%defattr(-,root,root,-)
+%{tde_tdeincludedir}/atlantik
+%{tde_tdeincludedir}/atlantic
+%{tde_libdir}/libatlantic.so
+%{tde_libdir}/libatlantic.la
+%{tde_libdir}/libatlantikclient.so
+%{tde_libdir}/libatlantikclient.la
+%{tde_libdir}/libatlantikui.so
+%{tde_libdir}/libatlantikui.la
+
+%post -n trinity-atlantik-devel
+/sbin/ldconfig || :
+
+%postun -n trinity-atlantik-devel
+/sbin/ldconfig || :
+
+##########
+
+%package -n trinity-kasteroids
+Summary:	Asteroids for Trinity
+Group:		Amusements/Games
+
+%description -n trinity-kasteroids
+You know this game.  It is based on Warwick Allison's QwSpriteField
+widget.
+
+The objective of kasteroids is to destroy all the asteroids on the
+screen to advance to the next level. Your ship is destroyed if it
+makes contact with an asteroid.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-kasteroids
+%defattr(-,root,root,-)
+%{tde_bindir}/kasteroids
+%{tde_datadir}/icons/hicolor/*/apps/kasteroids.png
+%{tde_tdeappdir}/kasteroids.desktop
+%{tde_datadir}/apps/kasteroids/
+%{tde_datadir}/config.kcfg/kasteroids.kcfg
+%{tde_tdedocdir}/HTML/en/kasteroids/
+
+%post -n trinity-kasteroids
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kasteroids
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-katomic
+Summary:	Atomic Entertainment game for Trinity
+Group:		Amusements/Games
+
+%description -n trinity-katomic
+This is a puzzle game, in which the object is to assemble a molecule
+from its atoms on a Sokoban-like board.  On each move, an atom goes
+as far as it can in a specified direction before being stopped by a
+wall or another atom.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-katomic
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/katomic/
+%{tde_datadir}/icons/hicolor/*/apps/katomic.png
+%{tde_tdeappdir}/katomic.desktop
+%{tde_bindir}/katomic
+%{tde_tdedocdir}/HTML/en/katomic/
+
+%post -n trinity-katomic
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-katomic
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kbackgammon
+Summary:	A Backgammon game for Trinity
+Group:		Amusements/Games
+
+%description -n trinity-kbackgammon
+KBackgammon is a backgammon program for Trinity. It is based on the
+code, ideas and concepts of KFibs (which is a FIBS client for
+TDE1). For a short time, KBackgammon was called bacKgammon (if you
+know somebody who is still using bacKgammon, please force them to
+upgrade :-)).
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-kbackgammon
+%defattr(-,root,root,-)
+%{tde_bindir}/kbackgammon
+%{tde_tdeappdir}/kbackgammon.desktop
+%{tde_datadir}/apps/kbackgammon/
+%{tde_datadir}/icons/hicolor/*/apps/kbackgammon.png
+%{tde_datadir}/icons/hicolor/*/apps/kbackgammon_engine.png
+%{tde_tdedocdir}/HTML/en/kbackgammon/
+
+%post -n trinity-kbackgammon
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kbackgammon
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kbattleship
+Summary:	Battleship game for Trinity
+Group:		Amusements/Games
+
+%description -n trinity-kbattleship
+This is an implementation of the Battleship game.  Each player tries
+to be the first to sink all the opponent's ships by firing "blindly"
+at them.  The game has options to play over a network connection or
+against the computer.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-kbattleship
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/kbattleship/
+%{tde_datadir}/apps/zeroconf/_kbattleship._tcp
+%{tde_datadir}/icons/hicolor/*/apps/kbattleship.png
+%{tde_tdeappdir}/kbattleship.desktop
+%{tde_bindir}/kbattleship
+%{tde_tdedocdir}/HTML/en/kbattleship/
+
+%post -n trinity-kbattleship
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kbattleship
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kblackbox
+Summary:	A simple logical game for the Trinity project
+Group:		Amusements/Games
+
+%description -n trinity-kblackbox
+KBlackBox is a game of hide and seek played on an grid of boxes. Your
+opponent (Random number generator, in this case) has hidden several
+balls within this box. By shooting rays into the box and observing
+where they emerge it is possible to deduce the positions of the
+hidden balls. The fewer rays you use to find the balls, the lower
+your score.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-kblackbox
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/kblackbox/
+%{tde_datadir}/icons/hicolor/*/apps/kblackbox.png
+%{tde_tdeappdir}/kblackbox.desktop
+%{tde_bindir}/kblackbox
+%{tde_tdedocdir}/HTML/en/kblackbox/
+
+%post -n trinity-kblackbox
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kblackbox
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kbounce
+Summary:	Jezzball clone for the K Desktop Environment
+Group:		Amusements/Games
+
+%description -n trinity-kbounce
+This is a clone of the popular Jezzball game originally created by
+Microsoft. Jezzball is one of the rare and simple games requiring
+skill, timing, and patience in order to be successful.  A ball begins
+to bounce off of an area enclosed by four borders (like a
+square). You must move your pointer to certain areas within the
+square. Upon clicking, a new border is constructed at a relatively
+quick pace. You can change the direction of the borders by 90 degrees
+as well. Ultimately, you must force the ball to bounce around in a
+smaller, and smaller area as time goes by without the ball ever
+touching the borders as they are being constructed. If a ball touches
+a certain part of the border as it is being built, the game is over.
+After 75% of the original space has been blocked off from the moving
+ball, you advance one level, and one more ball is added to the mix in
+the following level.
+
+This game was previously known as kjezz.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-kbounce
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/kbounce/
+%{tde_tdeappdir}/kbounce.desktop
+%{tde_datadir}/icons/hicolor/*/apps/kbounce.png
+%{tde_bindir}/kbounce
+%{tde_tdedocdir}/HTML/en/kbounce/
+
+%post -n trinity-kbounce
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kbounce
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kenolaba
+Summary:	Enolaba board game for Trinity
+Group:		Amusements/Games
+
+%description -n trinity-kenolaba
+kenolaba is a simple board strategy game that is played by two
+players. There are red and yellow pieces for each player. Beginning
+from a start position where each player has 14 pieces, moves are
+drawn until one player has pushed 6 pieces of his opponent out of the
+board.
+
+This game was previously known as kabalone, and was inspired by the
+board game Abalone by Abalone SA, France.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-kenolaba
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/kenolaba/
+%{tde_datadir}/icons/hicolor/*/apps/kenolaba.png
+%{tde_tdeappdir}/kenolaba.desktop
+%{tde_bindir}/kenolaba
+%{tde_tdedocdir}/HTML/en/kenolaba/
+
+%post -n trinity-kenolaba
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kenolaba
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kfouleggs
+Summary:	A TDE clone of the Japanese PuyoPuyo game
+Group:		Amusements/Games
+
+%description -n trinity-kfouleggs
+KFouleggs is a clone of the Japanese PuyoPuyo game, with advanced
+features such as multiplayer games against human or AI, and network
+play.  If you have played Tetris or one of its many clones, you will
+find KFouleggs easy to learn.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-kfouleggs
+%defattr(-,root,root,-)
+%{tde_tdeappdir}/kfouleggs.desktop
+%{tde_datadir}/apps/kfouleggs/
+%{tde_datadir}/config.kcfg/kfouleggs.kcfg
+%{tde_bindir}/kfouleggs
+%{tde_datadir}/icons/hicolor/*/apps/kfouleggs.png
+%{tde_tdedocdir}/HTML/en/kfouleggs/
+
+%post -n trinity-kfouleggs
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kfouleggs
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kgoldrunner
+Summary:	A Trinity clone of the Loderunner arcade game
+Group:		Amusements/Games
+
+%description -n trinity-kgoldrunner
+KGoldrunner, a game of action and puzzle solving.  Run through the
+maze, dodge your enemies, collect all the gold and climb up to the
+next level.
+
+You must guide the hero with the mouse or keyboard and collect all
+the gold nuggets, then you can climb up into the next level.  Your
+enemies are also after the gold and they will kill you if they catch
+you!
+
+The problem is you have no weapon to kill them.  All you can do is
+run away, dig holes in the floor to trap them or lure them into some
+area where they cannot hurt you.  After a short time a trapped enemy
+climbs out of his hole, but if it closes before that, he will die and
+reappear somewhere else.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-kgoldrunner
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/kgoldrunner/
+%{tde_datadir}/icons/hicolor/*/apps/kgoldrunner.png
+%{tde_tdeappdir}/KGoldrunner.desktop
+%{tde_bindir}/kgoldrunner
+%{tde_tdedocdir}/HTML/en/kgoldrunner/
+
+%post -n trinity-kgoldrunner
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kgoldrunner
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kjumpingcube
+Summary:	Tactical one or two player game
+Group:		Amusements/Games
+
+%description -n trinity-kjumpingcube
+KJumpingCube is a simple tactical game. You can play it against the
+computer or against a friend. The playing field consists of squares
+that contains points.  By clicking on the squares you can increase
+the points and if the points reach a maximum the points will jump to
+the squares neighbours and take them over. Winner is the one, who
+owns all squares.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-kjumpingcube
+%defattr(-,root,root,-)
+%{tde_bindir}/kjumpingcube
+%{tde_datadir}/icons/hicolor/*/apps/kjumpingcube.png
+%{tde_datadir}/apps/kjumpingcube/
+%{tde_tdeappdir}/kjumpingcube.desktop
+%{tde_datadir}/config.kcfg/kjumpingcube.kcfg
+%{tde_tdedocdir}/HTML/en/kjumpingcube/
+
+%post -n trinity-kjumpingcube
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kjumpingcube
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-klickety
+Summary:	A Clickomania-like game for Trinity
+Group:		Amusements/Games
+
+%description -n trinity-klickety
+Klickety is an adaptation of the (perhaps) well-known Clickomania
+game; it is very similar to the "same" game.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-klickety
+%defattr(-,root,root,-)
+%{tde_bindir}/klickety
+%{tde_tdeappdir}/klickety.desktop
+%{tde_datadir}/icons/hicolor/*/apps/klickety.png
+%{tde_datadir}/icons/crystalsvg/*/actions/endturn.png
+%{tde_datadir}/apps/klickety/klicketyui.rc
+%{tde_datadir}/apps/klickety/eventsrc
+%{tde_tdedocdir}/HTML/en/klickety/
+
+%post -n trinity-klickety
+for f in crystalsvg hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-klickety
+for f in crystalsvg hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-klines
+Summary:	Color lines for Trinity
+Group:		Amusements/Games
+
+%description -n trinity-klines
+KLines is a simple game. It is played by one player, so there is only
+one winner :-). You play for fun and against the high score. It was
+inspired by a well known game - "Color lines", written for DOS by
+Olga Demina, Igor Demina, Igor Ivkin and Gennady Denisov back in
+1992.
+
+The main rules of the game are as simple as possible: you move (using
+the mouse) marbles from cell to cell and build lines (horizontal,
+vertical or diagonal). When a line contains 5 or more marbles, they
+are removed and your score grows. After each turn the computer drops
+three more marbles.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-klines
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/klines/
+%{tde_tdeappdir}/klines.desktop
+%{tde_bindir}/klines
+%{tde_datadir}/config.kcfg/klines.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/klines.png
+%{tde_tdedocdir}/HTML/en/klines/
+
+%post -n trinity-klines
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-klines
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kmahjongg
+Summary:	the classic mahjongg game for Trinity project
+Group:		Amusements/Games
+
+%description -n trinity-kmahjongg
+Your mission in this game is to remove all tiles from the game board. A
+matching pair of tiles can be removed, if they are 'free', which means that
+no other tiles block them on the left or right side.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-kmahjongg
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/kmahjongg/
+%{tde_datadir}/icons/hicolor/*/apps/kmahjongg.png
+%{tde_tdeappdir}/kmahjongg.desktop
+%{tde_bindir}/kmahjongg
+%{tde_datadir}/config.kcfg/kmahjongg.kcfg
+%{tde_tdedocdir}/HTML/en/kmahjongg/
+
+%post -n trinity-kmahjongg
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kmahjongg
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kmines
+Summary:	Minesweeper for Trinity
+Group:		Amusements/Games
+
+%description -n trinity-kmines
+KMines is the classic Minesweeper game. You must uncover all the
+empty cases without blowing on a mine.
+
+When you uncover a case, a number appears : it indicates how many
+mines surround this case. If there is no number the neighbour cases
+are automatically uncovered. In your process of uncovering secure
+cases, it is very useful to put a flag on the cases which contain a
+mine.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-kmines
+%defattr(-,root,root,-)
+%{tde_datadir}/icons/hicolor/*/apps/kmines.png
+%{tde_tdeappdir}/kmines.desktop
+%{tde_datadir}/apps/kmines/
+%{tde_bindir}/kmines
+%{tde_tdedocdir}/HTML/en/kmines/
+
+%post -n trinity-kmines
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kmines
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-knetwalk
+Summary:	A game for system administrators
+Group:		Amusements/Games
+
+%description -n trinity-knetwalk
+This game presents the player with a rectangular field consisting of
+a server, several clients, and pieces of wire.  The object is to
+rotate these elements until every client is connected to the server,
+and no wires are left unconnected.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-knetwalk
+%defattr(-,root,root,-)
+%{tde_bindir}/knetwalk
+%{tde_datadir}/apps/knetwalk
+%{tde_datadir}/icons/hicolor/*/apps/knetwalk.png
+%{tde_tdeappdir}/knetwalk.desktop
+
+%post -n trinity-knetwalk
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-knetwalk
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kolf
+Summary:	Minigolf game for TDE
+Group:		Amusements/Games
+
+%description -n trinity-kolf
+This is a minigolf game for TDE that allows you to go through different
+golf courses and waste an exorbitant amount of time.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-kolf
+%defattr(-,root,root,-)
+%{tde_datadir}/config/magic/kolf.magic
+%{tde_datadir}/apps/kolf/
+%{tde_bindir}/kolf
+%{tde_tdeappdir}/kolf.desktop
+%{tde_datadir}/icons/hicolor/*/apps/kolf.png
+%{tde_datadir}/mimelnk/application/x-kolf.desktop
+%{tde_datadir}/mimelnk/application/x-kourse.desktop
+%{tde_libdir}/lib[kt]deinit_kolf.so
+%{tde_libdir}/lib[kt]deinit_kolf.la
+%{tde_tdelibdir}/kolf.la
+%{tde_tdelibdir}/kolf.so
+%{tde_libdir}/libkolf.so.1
+%{tde_libdir}/libkolf.so.1.2.0
+%{tde_tdedocdir}/HTML/en/kolf/
+
+%post -n trinity-kolf
+/sbin/ldconfig || :
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kolf
+/sbin/ldconfig || :
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kolf-devel
+Summary:	Development files for Kolf
+Group:		Development/Libraries
+Requires:	trinity-kolf = %{version}-%{release}
+
+%description -n trinity-kolf-devel
+This package contains headers and development libraries for compiling
+Kolf plugins.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-kolf-devel
+%defattr(-,root,root,-)
+%{tde_tdeincludedir}/kolf
+%{tde_libdir}/libkolf.la
+%{tde_libdir}/libkolf.so
+
+%post -n trinity-kolf-devel
+/sbin/ldconfig || :
+
+%postun -n trinity-kolf-devel
+/sbin/ldconfig || :
+
+##########
+
+%package -n trinity-konquest
+Summary:	TDE based GNU-Lactic Konquest game
+Group:		Amusements/Games
+
+%description -n trinity-konquest
+This the TDE version of Gnu-Lactic Konquest, a multi-player strategy
+game. The goal of the game is to expand your interstellar empire
+across the galaxy and, of course, crush your rivals in the process.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-konquest
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/konquest/
+%{tde_datadir}/icons/hicolor/*/apps/konquest.png
+%{tde_tdeappdir}/konquest.desktop
+%{tde_bindir}/konquest
+%{tde_tdedocdir}/HTML/en/konquest/
+
+%post -n trinity-konquest
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-konquest
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kpat
+Summary:	Trinity solitaire patience game
+Group:		Amusements/Games
+
+%description -n trinity-kpat
+KPatience is a collection of 14 card games. All the games are single
+player games.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-kpat
+%defattr(-,root,root,-)
+%{tde_datadir}/icons/hicolor/*/apps/kpat.png
+%{tde_datadir}/apps/kpat/
+%{tde_tdeappdir}/kpat.desktop
+%{tde_bindir}/kpat
+%{tde_tdedocdir}/HTML/en/kpat/
+
+%post -n trinity-kpat
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kpat
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kpoker
+Summary:	Trinity based Poker clone
+Group:		Amusements/Games
+
+%description -n trinity-kpoker
+KPoker is a TDE compliant clone of those highly addictive pocket
+video poker games which are sometimes called "Videopoker" as well.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-kpoker
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/kpoker/
+%{tde_datadir}/icons/hicolor/*/apps/kpoker.png
+%{tde_tdeappdir}/kpoker.desktop
+%{tde_bindir}/kpoker
+%{tde_tdedocdir}/HTML/en/kpoker/
+
+%post -n trinity-kpoker
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kpoker
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kreversi
+Summary:	Reversi for Trinity
+Group:		Amusements/Games
+
+%description -n trinity-kreversi
+Reversi is a simple strategy game that is played by two
+players. There is only one type of piece - one side of it is black,
+the other white. If a player captures a piece on the board, that
+piece is turned and belongs to that player. The winner is the person
+that has more pieces of his own color on the board and if there are
+no more moves possible.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-kreversi
+%defattr(-,root,root,-)
+%{tde_bindir}/kreversi
+%{tde_tdeappdir}/kreversi.desktop
+%{tde_datadir}/apps/kreversi/
+%{tde_datadir}/config.kcfg/kreversi.kcfg
+%{tde_datadir}/icons/crystalsvg/*/actions/lastmoves.png
+%{tde_datadir}/icons/crystalsvg/*/actions/legalmoves.png
+%{tde_datadir}/icons/crystalsvg/scalable/actions/lastmoves.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/actions/legalmoves.svgz
+%{tde_datadir}/icons/hicolor/*/apps/kreversi.png
+%{tde_tdedocdir}/HTML/en/kreversi/
+
+%post -n trinity-kreversi
+for f in crystalsvg hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kreversi
+for f in crystalsvg hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-ksame
+Summary:	SameGame for Trinity
+Group:		Amusements/Games
+
+%description -n trinity-ksame
+KSame is a simple game. It's played by one player, so there is only
+one winner :-) You play for fun and against the high score. It has
+been inspired by SameGame, that is only famous on the Macintosh
+platform.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-ksame
+%defattr(-,root,root,-)
+%{tde_bindir}/ksame
+%{tde_datadir}/icons/hicolor/*/apps/ksame.png
+%{tde_datadir}/apps/ksame/*
+%{tde_tdeappdir}/ksame.desktop
+%{tde_tdedocdir}/HTML/en/ksame/
+
+%post -n trinity-ksame
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-ksame
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kshisen
+Summary:	Shisen-Sho for Trinity
+Group:		Amusements/Games
+
+%description -n trinity-kshisen
+KShisen-Sho is a single-player-game similar to Mahjongg and uses the
+same set of tiles as Mahjongg.
+
+The object of the game is to remove all tiles from the field.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-kshisen
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/kshisen/
+%{tde_datadir}/config.kcfg/kshisen.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/kshisen.png
+%{tde_tdeappdir}/kshisen.desktop
+%{tde_bindir}/kshisen
+%{tde_tdedocdir}/HTML/en/kshisen/
+
+%post -n trinity-kshisen
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kshisen
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-ksirtet
+Summary:	Tetris and Puyo-Puyo games for Trinity
+Group:		Amusements/Games
+
+%description -n trinity-ksirtet
+This program is a clone of the well known game Tetris. You must fit
+the falling pieces to form full lines. You can rotate and translate
+the falling piece. The game ends when no more piece can fall ie when
+your incomplete lines reach the top of the board.
+
+Every time you have destroyed 10 lines, you gain a level and the
+pieces fall quicker (exactly the piece falls from a line each
+1/(1+level) second).
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-ksirtet
+%defattr(-,root,root,-)
+%{tde_tdeappdir}/ksirtet.desktop
+%{tde_datadir}/icons/hicolor/*/apps/ksirtet.png
+%{tde_datadir}/apps/ksirtet/
+%{tde_bindir}/ksirtet
+%{tde_datadir}/config.kcfg/ksirtet.kcfg
+%{tde_tdedocdir}/HTML/en/ksirtet/
+
+%post -n trinity-ksirtet
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-ksirtet
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-ksmiletris
+Summary:	Tetris like game for Trinity
+Group:		Amusements/Games
+
+%description -n trinity-ksmiletris
+This is a game with falling blocks composed of different types of
+smilies. The object of the game is to "crack a smile" by guiding
+blocks so there are two or more of the same symbol vertically.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-ksmiletris
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/ksmiletris/
+%{tde_datadir}/icons/hicolor/*/apps/ksmiletris.png
+%{tde_tdeappdir}/ksmiletris.desktop
+%{tde_bindir}/ksmiletris
+%{tde_tdedocdir}/HTML/en/ksmiletris/
+
+%post -n trinity-ksmiletris
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-ksmiletris
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-ksnake
+Summary:	Snake Race for Trinity
+Group:		Amusements/Games
+
+%description -n trinity-ksnake
+Snake Race is a game of speed and agility. You are a hungry snake and
+are trying to eat all the apples in the room before getting out!
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-ksnake
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/ksnake/
+%{tde_datadir}/config.kcfg/ksnake.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/ksnake.png
+%{tde_tdeappdir}/ksnake.desktop
+%{tde_bindir}/ksnake
+%{tde_tdedocdir}/HTML/en/ksnake/
+
+%post -n trinity-ksnake
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-ksnake
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-ksokoban
+Summary:	Sokoban game for Trinity
+Group:		Amusements/Games
+
+%description -n trinity-ksokoban
+The first sokoban game was created in 1982 by Hiroyuki Imabayashi at
+the Japanese company Thinking Rabbit, Inc. "Sokoban" is japanese for
+"warehouse keeper". The idea is that you are a warehouse keeper
+trying to push crates to their proper locations in a warehouse.
+
+The problem is that you cannot pull the crates or step over them. If
+you are not careful, some of the crates can get stuck in wrong places
+and/or block your way.
+
+It can be rather difficult just to solve a level. But if you want to
+make it even harder, you can try to minimise the number of moves
+and/or pushes you use to solve the level.
+
+To make the game more fun for small kids (below 10 years or so), some
+collections with easier levels are also included in KSokoban. These
+are marked (easy) in the level collection menu. Of course, these
+levels can be fun for adults too, for example if you don't want to
+expose yourself to too much mental strain.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-ksokoban
+%defattr(-,root,root,-)
+%{tde_tdeappdir}/ksokoban.desktop
+%{tde_datadir}/icons/hicolor/*/apps/ksokoban.png
+%{tde_bindir}/ksokoban
+%{tde_tdedocdir}/HTML/en/ksokoban/
+
+%post -n trinity-ksokoban
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-ksokoban
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kspaceduel
+Summary:	Arcade two-player space game for Trinity
+Group:		Amusements/Games
+
+%description -n trinity-kspaceduel
+KSpaceduel is an space arcade game for two players.
+
+Each player controls a ship that flies around the sun and tries to
+shoot at the other ship. You can play KSpaceduel with another person,
+against the computer, or you can have the computer control both ships
+and play each other.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-kspaceduel
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/kspaceduel/
+%{tde_datadir}/icons/hicolor/*/apps/kspaceduel.png
+%{tde_tdeappdir}/kspaceduel.desktop
+%{tde_bindir}/kspaceduel
+%{tde_datadir}/config.kcfg/kspaceduel.kcfg
+%{tde_tdedocdir}/HTML/en/kspaceduel/
+
+%post -n trinity-kspaceduel
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kspaceduel
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-ktron
+Summary:	Tron clone for the K Desktop Environment
+Group:		Amusements/Games
+
+%description -n trinity-ktron
+The object of the game is to avoid running into walls, your own tail,
+and that of your opponent.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-ktron
+%defattr(-,root,root,-)
+%{tde_bindir}/ktron
+%{tde_datadir}/icons/hicolor/*/apps/ktron.png
+%{tde_tdeappdir}/ktron.desktop
+%{tde_datadir}/apps/ktron/
+%{tde_datadir}/config.kcfg/ktron.kcfg
+%{tde_tdedocdir}/HTML/en/ktron/
+
+%post -n trinity-ktron
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-ktron
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
+##########
+
+%package -n trinity-ktuberling
+Summary:	Potato Guy for Trinity
+Group:		Amusements/Games
+
+%description -n trinity-ktuberling
+KTuberling is a game intended for small children. Of course, it may
+be suitable for adults who have remained young at heart.
+
+It is a potato editor. That means that you can drag and drop eyes,
+mouths, moustache, and other parts of face and goodies onto a
+potato-like guy.  Similarly, you have a penguin on which you can drop
+other stuff.
+
+There is no winner for the game. The only purpose is to make the
+funniest faces you can.
+
+There is a museum (like a "Madame Tusseau" gallery) where you can
+find many funny examples of decorated potatoes. Of course, you can
+send your own creations to the programmer, Eric Bischoff, who will
+include them in the museum if he gets some spare time.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-ktuberling
+%defattr(-,root,root,-)
+%{tde_bindir}/ktuberling
+%{tde_datadir}/icons/hicolor/*/apps/ktuberling.png
+%{tde_tdeappdir}/ktuberling.desktop
+%{tde_datadir}/apps/ktuberling/
+%{tde_datadir}/mimelnk/application/x-tuberling.desktop
+%{tde_tdedocdir}/HTML/en/ktuberling/
+
+%post -n trinity-ktuberling
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-ktuberling
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-twin4
+Summary:	Connect Four clone for Trinity
+Group:		Amusements/Games
+
+%description -n trinity-twin4
+Four wins is a game for two players. Each player is represented by a
+colour (yellow and red). The goal of the game is to get four
+connected pieces of your colour into a row, column or any
+diagonal. This is done by placing one of your pieces into any of the
+seven columns. A piece will begin to fill a column from the bottom,
+i.e. it will fall down until it reaches the ground level or another
+stone. After a move is done it is the turn of the other player. This
+is repeated until the game is over, i.e. one of the players has four
+pieces in a row, column or diagonal or no more moves are possible
+because the board is filled.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-twin4
+%defattr(-,root,root,-)
+%{tde_bindir}/[kt]win4
+%{tde_bindir}/[kt]win4proc
+%{tde_datadir}/apps/[kt]win4/
+%{tde_datadir}/config.kcfg/[kt]win4.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/[kt]win4.png
+%{tde_tdeappdir}/[kt]win4.desktop
+%{tde_tdedocdir}/HTML/en/[kt]win4/
+
+%post -n trinity-twin4
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-twin4
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-lskat
+Summary:	Lieutnant Skat card game for Trinity
+Group:		Amusements/Games
+
+%description -n trinity-lskat
+Lieutnant Skat (from German Offiziersskat) is a card game for two
+players. It is roughly played according to the rules of Skat but with
+only two players and simplified rules.
+
+Every player has a set of cards in front of him/her, half of them
+covered and half of them open. Both players try to win more than 60
+of the 120 possible points. After 16 moves all cards are played and
+the game ends.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-lskat
+%defattr(-,root,root,-)
+%{tde_bindir}/lskat
+%{tde_bindir}/lskatproc
+%{tde_datadir}/apps/lskat/
+%{tde_datadir}/icons/hicolor/*/apps/lskat.png
+%{tde_tdeappdir}/lskat.desktop
+%{tde_tdedocdir}/HTML/en/lskat/
+
+%post -n trinity-lskat
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-lskat
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
 
 
 %prep
 %setup -q -n kdegames
 %patch0 -p1
+%patch1 -p1 -b .ftbfs
 
 # Ugly hack to modify TQT include directory inside autoconf files.
 # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
 %__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{_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"
@@ -84,10 +1534,15 @@ License: LGPLv2
 
 %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 \
+   --exec-prefix=%{_prefix} \
+   --bindir=%{tde_bindir} \
+   --libdir=%{tde_libdir} \
+   --datadir=%{tde_datadir} \
+   --includedir=%{tde_tdeincludedir} \
    --enable-new-ldflags \
    --disable-dependency-tracking \
    --disable-rpath \
@@ -95,20 +1550,18 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
    --disable-debug \
    --disable-warnings \
    --enable-closure \
-   --includedir=%{_includedir}/kde \
    --disable-setgid \
-   --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}
 
 # locale's
-%find_lang %{name} || touch %{name}.lang
 HTML_DIR=$(kde-config --expandvars --install html)
 if [ -d %{buildroot}$HTML_DIR ]; then
 for lang_dir in %{buildroot}$HTML_DIR/* ; do
@@ -125,67 +1578,18 @@ for lang_dir in %{buildroot}$HTML_DIR/* ; do
 done
 fi
 
-# rpmdocs
-for dir in k* lskat ; do
-  for file in AUTHORS ChangeLog README TODO ; do
-    test -s  "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
-  done
-done
-
 
 %clean
 %__rm -rf %{buildroot}
 
 
-%post
-for f in crystalsvg hicolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-
-%postun
-for f in crystalsvg hicolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
-
-
-%files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS README COPYING
-%doc rpmdocs/*
-%{_bindir}/*
-%{_datadir}/applications/kde/*.desktop
-%{_datadir}/apps/*
-%{_datadir}/config*/*
-%{_datadir}/icons/crystalsvg/*/*/*
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/mimelnk/*/*
-%{_datadir}/service*/*
-%{tde_libdir}/*
-%{_libdir}/libkdeinit_*.so
-
-%files libs
-%defattr(-,root,root,-)
-%{_libdir}/lib*.so.*
-%{_libdir}/lib*.la
-
-%files devel
-%defattr(-,root,root,-)
-%doc COPYING.LIB
-%doc libkdegames/README libkdegames/TODO
-%{tde_includedir}/*
-%{_libdir}/lib*.so
-%exclude %{_libdir}/libkdeinit_*.so
 
 
 %changelog
+* Tue Jul 31 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
+- Split into several packages
+- Add support for Mageia 2
+
 * Sun Dec 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
 - Fix ktuberling picture loading [TDE Bug #638]
 
diff --git a/redhat/kdegraphics/kdegraphics-3.5.13-add_poppler_tqt_pc.patch b/redhat/kdegraphics/kdegraphics-3.5.13-add_poppler_tqt_pc.patch
new file mode 100644
index 000000000..210b425e6
--- /dev/null
+++ b/redhat/kdegraphics/kdegraphics-3.5.13-add_poppler_tqt_pc.patch
@@ -0,0 +1,41 @@
+commit b2d01d000c11d7c0dd183e1af059f81ac5249c25
+Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Date:   1339541595 -0500
+
+    Add poppler-tqt.pc file
+
+diff --git a/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt b/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt
+index d07e813..42d50a8 100644
+--- a/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt
++++ b/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt
+@@ -28,6 +28,12 @@ link_directories(
+   ${TQT_LIBRARY_DIRS}
+ )
+ 
++##### pc files ##################################
++
++configure_file( poppler-tqt.pc.cmake poppler-tqt.pc @ONLY )
++
++install( FILES ${CMAKE_CURRENT_BINARY_DIR}/poppler-tqt.pc DESTINATION ${PKGCONFIG_INSTALL_DIR} )
++
+ ##### headers ###################################
+ 
+ install( FILES
+diff --git a/kfile-plugins/dependencies/poppler-tqt/poppler-tqt.pc.cmake b/kfile-plugins/dependencies/poppler-tqt/poppler-tqt.pc.cmake
+new file mode 100644
+index 0000000..ce2b40d
+--- /dev/null
++++ b/kfile-plugins/dependencies/poppler-tqt/poppler-tqt.pc.cmake
+@@ -0,0 +1,12 @@
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=${prefix}
++libdir=${exec_prefix}/lib
++includedir=${prefix}/include
++
++Name: poppler-tqt
++Description: TQt bindings for poppler
++Version: @POPPLER_VERSION@
++Requires: poppler = @POPPLER_VERSION@
++
++Libs: -L${libdir} -lpoppler-tqt
++Cflags: -I${includedir}
diff --git a/redhat/kdegraphics/kdegraphics-3.5.13-fix_poppler_include_dir.patch b/redhat/kdegraphics/kdegraphics-3.5.13-fix_poppler_include_dir.patch
new file mode 100644
index 000000000..1aac35f78
--- /dev/null
+++ b/redhat/kdegraphics/kdegraphics-3.5.13-fix_poppler_include_dir.patch
@@ -0,0 +1,11 @@
+--- kdegraphics/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt.ORI	2012-08-01 19:42:18.057554419 +0200
++++ kdegraphics/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt	2012-08-01 19:42:28.320371892 +0200
+@@ -38,7 +38,7 @@
+ 
+ install( FILES
+     poppler-qt.h poppler-page-transition.h poppler-link-qt3.h
+-  DESTINATION ${INCLUDE_INSTALL_DIR}/kde )
++  DESTINATION ${INCLUDE_INSTALL_DIR} )
+ 
+ ##### poppler-tqt (shared) ############################
+ 
diff --git a/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec b/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec
index d1e2fc01d..ce0c07157 100644
--- a/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec
+++ b/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec
@@ -1,19 +1,26 @@
 # 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
-%define tde_appdir %{_datadir}/applications/kde
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%define tde_bindir %{_prefix}/bin
+%define tde_datadir %{_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{_prefix}/include
+%define tde_libdir %{_prefix}/%{_lib}
+
+%define tde_tdeappdir %{tde_datadir}/applications/kde
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_docdir}
 
 
 Name:		trinity-tdegraphics
 Version:	3.5.13
-Release:	5%{?dist}%{_variant}
+Release:	6%{?dist}%{_variant}
 License:	GPL
 Summary:    Trinity Desktop Environment - Graphics Applications
 
@@ -46,6 +53,10 @@ Patch5:		kdegraphics-3.5.13-fix_gcc47_compilation.patch
 Patch6:		kdegraphics-3.5.13-fix_poppler_support.patch
 # [tdegraphics] Fix corrupt image file. [Commit #d655a9f8]
 Patch7:		kdegraphics-3.5.13-fix_corrupt_image_file.patch
+# [tdegraphics] Add poppler-tqt.pc file [Commit #b2d01d00]
+Patch8:		kdegraphics-3.5.13-add_poppler_tqt_pc.patch
+# [tdegraphics] Fix poppler include directory location
+Patch9:		kdegraphics-3.5.13-fix_poppler_include_dir.patch
 
 BuildRequires: cmake >= 2.8
 BuildRequires: tqtinterface-devel
@@ -58,43 +69,65 @@ BuildRequires: libtiff-devel
 BuildRequires: libungif-devel
 BuildRequires: automake libtool
 BuildRequires: gphoto2-devel
-BuildRequires: sane-backends-devel
 BuildRequires: libusb-devel
-BuildRequires: t1lib-devel
 BuildRequires: libdrm-devel
+BuildRequires: pcre-devel
 
+%if 0%{?mgaversion}
+BuildRequires:	%{_lib}sane1-devel
+BuildRequires:	%{_lib}t1lib-devel
+BuildRequires:	%{_lib}paper-devel
+# kuickshow
+BuildRequires:	%{_lib}imlib-devel
+# kpovmodeler
+BuildRequires:	%{_lib}xi-devel
+# kgamma
+BuildRequires:	%{_lib}xxf86vm-devel
+# ksvg
+BuildRequires:	%{_lib}xmu6-devel
+# kpovmodeler
+BuildRequires:	%{_lib}mesagl1-devel
+BuildRequires:	%{_lib}mesaglu1-devel
+%else
+BuildRequires:	sane-backends-devel
+BuildRequires:	t1lib-devel
+BuildRequires:	libpaper-devel
+# kuickshow
+BuildRequires:	imlib-devel
+# kpovmodeler
+BuildRequires:	libXi-devel
 # kgamma
-BuildRequires: libXxf86vm-devel
+BuildRequires:	libXxf86vm-devel
+# ksvg
+BuildRequires:	libXmu-devel
+# kpovmodeler
+BuildRequires:	libGL-devel
+BuildRequires:	libGLU-devel
+%endif
+
 #kfile-plugin
-BuildRequires: OpenEXR-devel
+BuildRequires:	OpenEXR-devel
+
 # kpdf
 BuildRequires: freetype-devel
-%if 0%{?rhel} >=6 || 0%{?fedora} >= 15
+%if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?mgaversion}
 BuildRequires: poppler-devel >= 0.12
-BuildRequires: poppler-qt-devel >= 0.12
+#BuildRequires:	poppler-qt-devel >= 0.12
 %else
-BuildRequires: trinity-poppler-devel
-BuildRequires: trinity-poppler-qt3-devel >= 0.12
+# On RHEL 5, the distro-provided poppler is too old. We built a newer one.
+BuildRequires:	trinity-poppler-devel
+BuildRequires:	trinity-poppler-qt3-devel >= 0.12
 %endif
 
-BuildRequires: libpaper-devel
 # ksvg
 BuildRequires: fontconfig-devel
 BuildRequires: lcms-devel
 BuildRequires: libart_lgpl-devel
-BuildRequires: libXmu-devel
 
-# kpovmodeler
-BuildRequires: libGL-devel libGLU-devel libXi-devel
 
 # kuickshow
-BuildRequires: imlib-devel
 BuildRequires: fribidi-devel
 
-#Requires: tqtinterface
-#Requires: trinity-arts
-#Requires: trinity-kdelibs
-
 
 Obsoletes:	trinity-kdegraphics < %{version}-%{release}
 Provides:	trinity-kdegraphics = %{version}-%{release}
@@ -156,31 +189,31 @@ to allow access to your camera's pictures with the URL camera:/
 
 %post -n trinity-kamera
 for f in crystalsvg hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %postun -n trinity-kamera
 for f in crystalsvg hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %files -n trinity-kamera
 %defattr(-,root,root,-)
-%{tde_libdir}/kcm_kamera.la
-%{tde_libdir}/kcm_kamera.so
-%{tde_libdir}/kio_kamera.la
-%{tde_libdir}/kio_kamera.so
-%{tde_appdir}/kamera.desktop
-%{_datadir}/icons/crystalsvg/*/actions/camera_test.png
-%{_datadir}/icons/crystalsvg/*/apps/camera.png
-%{_datadir}/icons/crystalsvg/*/devices/camera.png
-%{_datadir}/icons/crystalsvg/*/filesystems/camera.png
-%{_datadir}/services/camera.protocol
-%{tde_docdir}/HTML/en/kamera/
+%{tde_tdelibdir}/kcm_kamera.la
+%{tde_tdelibdir}/kcm_kamera.so
+%{tde_tdelibdir}/kio_kamera.la
+%{tde_tdelibdir}/kio_kamera.so
+%{tde_tdeappdir}/kamera.desktop
+%{tde_datadir}/icons/crystalsvg/*/actions/camera_test.png
+%{tde_datadir}/icons/crystalsvg/*/apps/camera.png
+%{tde_datadir}/icons/crystalsvg/*/devices/camera.png
+%{tde_datadir}/icons/crystalsvg/*/filesystems/camera.png
+%{tde_datadir}/services/camera.protocol
+%{tde_tdedocdir}/HTML/en/kamera/
 
 ##########
 
@@ -194,14 +227,14 @@ picker.
 
 %files -n trinity-kcoloredit
 %defattr(-,root,root,-)
-%{_bindir}/kcolorchooser
-%{_bindir}/kcoloredit
-%{tde_appdir}/kcolorchooser.desktop
-%{tde_appdir}/kcoloredit.desktop
-%{_datadir}/apps/kcoloredit/kcoloreditui.rc
-%{_datadir}/icons/hicolor/*/apps/kcolorchooser.png
-%{_datadir}/icons/hicolor/*/apps/kcoloredit.png
-%{tde_docdir}/HTML/en/kcoloredit/
+%{tde_bindir}/kcolorchooser
+%{tde_bindir}/kcoloredit
+%{tde_tdeappdir}/kcolorchooser.desktop
+%{tde_tdeappdir}/kcoloredit.desktop
+%{tde_datadir}/apps/kcoloredit/kcoloreditui.rc
+%{tde_datadir}/icons/hicolor/*/apps/kcolorchooser.png
+%{tde_datadir}/icons/hicolor/*/apps/kcoloredit.png
+%{tde_tdedocdir}/HTML/en/kcoloredit/
 
 ##########
 
@@ -215,63 +248,63 @@ tags, etc. all from within the file manager).
 
 %files kfile-plugins
 %defattr(-,root,root,-)
-%{tde_libdir}/gsthumbnail.la
-%{tde_libdir}/gsthumbnail.so
-%{tde_libdir}/kfile_bmp.la
-%{tde_libdir}/kfile_bmp.so
-%{tde_libdir}/kfile_dds.la
-%{tde_libdir}/kfile_dds.so
-%{tde_libdir}/kfile_dvi.la
-%{tde_libdir}/kfile_dvi.so
-%{tde_libdir}/kfile_exr.la
-%{tde_libdir}/kfile_exr.so
-%{tde_libdir}/kfile_gif.la
-%{tde_libdir}/kfile_gif.so
-%{tde_libdir}/kfile_ico.la
-%{tde_libdir}/kfile_ico.so
-%{tde_libdir}/kfile_jpeg.la
-%{tde_libdir}/kfile_jpeg.so
-%{tde_libdir}/kfile_pcx.la
-%{tde_libdir}/kfile_pcx.so
-%{tde_libdir}/kfile_pdf.la
-%{tde_libdir}/kfile_pdf.so
-%{tde_libdir}/kfile_png.la
-%{tde_libdir}/kfile_png.so
-%{tde_libdir}/kfile_pnm.la
-%{tde_libdir}/kfile_pnm.so
-%{tde_libdir}/kfile_ps.la
-%{tde_libdir}/kfile_ps.so
-%{tde_libdir}/kfile_raw.la
-%{tde_libdir}/kfile_raw.so
-%{tde_libdir}/kfile_rgb.la
-%{tde_libdir}/kfile_rgb.so
-%{tde_libdir}/kfile_tga.la
-%{tde_libdir}/kfile_tga.so
-%{tde_libdir}/kfile_tiff.la
-%{tde_libdir}/kfile_tiff.so
-%{tde_libdir}/kfile_xbm.la
-%{tde_libdir}/kfile_xbm.so
-%{tde_libdir}/kfile_xpm.la
-%{tde_libdir}/kfile_xpm.so
-%{_datadir}/services/gsthumbnail.desktop
-%{_datadir}/services/kfile_bmp.desktop
-%{_datadir}/services/kfile_dds.desktop
-%{_datadir}/services/kfile_dvi.desktop
-%{_datadir}/services/kfile_exr.desktop
-%{_datadir}/services/kfile_gif.desktop
-%{_datadir}/services/kfile_ico.desktop
-%{_datadir}/services/kfile_jpeg.desktop
-%{_datadir}/services/kfile_pcx.desktop
-%{_datadir}/services/kfile_pdf.desktop
-%{_datadir}/services/kfile_png.desktop
-%{_datadir}/services/kfile_pnm.desktop
-%{_datadir}/services/kfile_ps.desktop
-%{_datadir}/services/kfile_raw.desktop
-%{_datadir}/services/kfile_rgb.desktop
-%{_datadir}/services/kfile_tga.desktop
-%{_datadir}/services/kfile_tiff.desktop
-%{_datadir}/services/kfile_xbm.desktop
-%{_datadir}/services/kfile_xpm.desktop
+%{tde_tdelibdir}/gsthumbnail.la
+%{tde_tdelibdir}/gsthumbnail.so
+%{tde_tdelibdir}/kfile_bmp.la
+%{tde_tdelibdir}/kfile_bmp.so
+%{tde_tdelibdir}/kfile_dds.la
+%{tde_tdelibdir}/kfile_dds.so
+%{tde_tdelibdir}/kfile_dvi.la
+%{tde_tdelibdir}/kfile_dvi.so
+%{tde_tdelibdir}/kfile_exr.la
+%{tde_tdelibdir}/kfile_exr.so
+%{tde_tdelibdir}/kfile_gif.la
+%{tde_tdelibdir}/kfile_gif.so
+%{tde_tdelibdir}/kfile_ico.la
+%{tde_tdelibdir}/kfile_ico.so
+%{tde_tdelibdir}/kfile_jpeg.la
+%{tde_tdelibdir}/kfile_jpeg.so
+%{tde_tdelibdir}/kfile_pcx.la
+%{tde_tdelibdir}/kfile_pcx.so
+%{tde_tdelibdir}/kfile_pdf.la
+%{tde_tdelibdir}/kfile_pdf.so
+%{tde_tdelibdir}/kfile_png.la
+%{tde_tdelibdir}/kfile_png.so
+%{tde_tdelibdir}/kfile_pnm.la
+%{tde_tdelibdir}/kfile_pnm.so
+%{tde_tdelibdir}/kfile_ps.la
+%{tde_tdelibdir}/kfile_ps.so
+%{tde_tdelibdir}/kfile_raw.la
+%{tde_tdelibdir}/kfile_raw.so
+%{tde_tdelibdir}/kfile_rgb.la
+%{tde_tdelibdir}/kfile_rgb.so
+%{tde_tdelibdir}/kfile_tga.la
+%{tde_tdelibdir}/kfile_tga.so
+%{tde_tdelibdir}/kfile_tiff.la
+%{tde_tdelibdir}/kfile_tiff.so
+%{tde_tdelibdir}/kfile_xbm.la
+%{tde_tdelibdir}/kfile_xbm.so
+%{tde_tdelibdir}/kfile_xpm.la
+%{tde_tdelibdir}/kfile_xpm.so
+%{tde_datadir}/services/gsthumbnail.desktop
+%{tde_datadir}/services/kfile_bmp.desktop
+%{tde_datadir}/services/kfile_dds.desktop
+%{tde_datadir}/services/kfile_dvi.desktop
+%{tde_datadir}/services/kfile_exr.desktop
+%{tde_datadir}/services/kfile_gif.desktop
+%{tde_datadir}/services/kfile_ico.desktop
+%{tde_datadir}/services/kfile_jpeg.desktop
+%{tde_datadir}/services/kfile_pcx.desktop
+%{tde_datadir}/services/kfile_pdf.desktop
+%{tde_datadir}/services/kfile_png.desktop
+%{tde_datadir}/services/kfile_pnm.desktop
+%{tde_datadir}/services/kfile_ps.desktop
+%{tde_datadir}/services/kfile_raw.desktop
+%{tde_datadir}/services/kfile_rgb.desktop
+%{tde_datadir}/services/kfile_tga.desktop
+%{tde_datadir}/services/kfile_tiff.desktop
+%{tde_datadir}/services/kfile_xbm.desktop
+%{tde_datadir}/services/kfile_xpm.desktop
 
 ##########
 
@@ -284,16 +317,16 @@ This program and KPart allow the user to display *.DVI files from TeX.
 
 %files -n trinity-kdvi
 %defattr(-,root,root,-)
-%{_bindir}/kdvi
-%{tde_libdir}/kdvipart.la
-%{tde_libdir}/kdvipart.so
-%{tde_appdir}/kdvi.desktop
-%{_datadir}/apps/kdvi/
-%{_datadir}/config.kcfg/kdvi.kcfg
-%{_datadir}/icons/hicolor/*/apps/kdvi.png
-%{_datadir}/icons/hicolor/scalable/apps/kdvi.svgz
-%{_datadir}/services/kdvimultipage.desktop
-%{tde_docdir}/HTML/en/kdvi/
+%{tde_bindir}/kdvi
+%{tde_tdelibdir}/kdvipart.la
+%{tde_tdelibdir}/kdvipart.so
+%{tde_tdeappdir}/kdvi.desktop
+%{tde_datadir}/apps/kdvi/
+%{tde_datadir}/config.kcfg/kdvi.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/kdvi.png
+%{tde_datadir}/icons/hicolor/scalable/apps/kdvi.svgz
+%{tde_datadir}/services/kdvimultipage.desktop
+%{tde_tdedocdir}/HTML/en/kdvi/
 
 ##########
 
@@ -309,11 +342,11 @@ A fax viewer for Trinity, supporting the display of raw and tiffed fax images
 %files -n trinity-kfax
 %defattr(-,root,root,-)
 %doc rpmdocs/kfax/
-%{_bindir}/kfax
-%{tde_appdir}/kfax.desktop
-%{_datadir}/apps/kfax/
-%{_datadir}/icons/hicolor/??x??/apps/kfax.png
-%{_datadir}/icons/hicolor/scalable/apps/kfax.svgz
+%{tde_bindir}/kfax
+%{tde_tdeappdir}/kfax.desktop
+%{tde_datadir}/apps/kfax/
+%{tde_datadir}/icons/hicolor/??x??/apps/kfax.png
+%{tde_datadir}/icons/hicolor/scalable/apps/kfax.svgz
 
 ##########
 
@@ -330,17 +363,17 @@ kfax application once it reproduces all of kfax's features.
 
 %files -n trinity-kfaxview
 %defattr(-,root,root,-)
-%{_bindir}/kfaxview
-%{_libdir}/libkfaximage.so.*
-%{_libdir}/libkfaximage.so
-%{_libdir}/libkfaximage.la
-%{tde_libdir}/kfaxviewpart.*
-%{tde_appdir}/kfaxview.desktop
-%{_datadir}/apps/kfaxview/
-%{_datadir}/icons/hicolor/??x??/apps/kfaxview.png
-%{_datadir}/icons/hicolor/scalable/apps/kfaxview.svgz
-%{_datadir}/services/kfaxmultipage.desktop
-%{_datadir}/services/kfaxmultipage_tiff.desktop
+%{tde_bindir}/kfaxview
+%{tde_libdir}/libkfaximage.so.*
+%{tde_libdir}/libkfaximage.so
+%{tde_libdir}/libkfaximage.la
+%{tde_tdelibdir}/kfaxviewpart.*
+%{tde_tdeappdir}/kfaxview.desktop
+%{tde_datadir}/apps/kfaxview/
+%{tde_datadir}/icons/hicolor/??x??/apps/kfaxview.png
+%{tde_datadir}/icons/hicolor/scalable/apps/kfaxview.svgz
+%{tde_datadir}/services/kfaxmultipage.desktop
+%{tde_datadir}/services/kfaxmultipage_tiff.desktop
 
 ##########
 
@@ -357,13 +390,13 @@ Homepage: http://kgamma.berlios.de/index2.php
 
 %files -n trinity-kgamma
 %defattr(-,root,root,-)
-%{_bindir}/xf86gammacfg
-%{tde_libdir}/kcm_kgamma.la
-%{tde_libdir}/kcm_kgamma.so
-%{tde_appdir}/kgamma.desktop
-%{_datadir}/apps/kgamma/
-%{_datadir}/icons/hicolor/*/apps/kgamma.png
-%{tde_docdir}/HTML/en/kgamma/
+%{tde_bindir}/xf86gammacfg
+%{tde_tdelibdir}/kcm_kgamma.la
+%{tde_tdelibdir}/kcm_kgamma.so
+%{tde_tdeappdir}/kgamma.desktop
+%{tde_datadir}/apps/kgamma/
+%{tde_datadir}/icons/hicolor/*/apps/kgamma.png
+%{tde_tdedocdir}/HTML/en/kgamma/
 
 ##########
 
@@ -382,18 +415,18 @@ online.
 
 %files -n trinity-kghostview
 %defattr(-,root,root,-)
-%{_bindir}/kghostview
-%{tde_libdir}/libkghostviewpart.la
-%{tde_libdir}/libkghostviewpart.so
-%{_libdir}/libkghostviewlib.so.*
-%{tde_appdir}/kghostview.desktop
-%{_datadir}/apps/kconf_update/kghostview.upd
-%{_datadir}/apps/kconf_update/update-to-xt-names.pl
-%{_datadir}/apps/kghostview/
-%{_datadir}/config.kcfg/kghostview.kcfg
-%{_datadir}/icons/hicolor/*/apps/kghostview.png
-%{_datadir}/services/kghostview_part.desktop
-%{tde_docdir}/HTML/en/kghostview/
+%{tde_bindir}/kghostview
+%{tde_tdelibdir}/libkghostviewpart.la
+%{tde_tdelibdir}/libkghostviewpart.so
+%{tde_libdir}/libkghostviewlib.so.*
+%{tde_tdeappdir}/kghostview.desktop
+%{tde_datadir}/apps/kconf_update/kghostview.upd
+%{tde_datadir}/apps/kconf_update/update-to-xt-names.pl
+%{tde_datadir}/apps/kghostview/
+%{tde_datadir}/config.kcfg/kghostview.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/kghostview.png
+%{tde_datadir}/services/kghostview_part.desktop
+%{tde_tdedocdir}/HTML/en/kghostview/
 
 ##########
 
@@ -406,11 +439,11 @@ KIconedit allows you easily to create and edit icons.
 
 %files -n trinity-kiconedit
 %defattr(-,root,root,-)
-%{_bindir}/kiconedit
-%{tde_appdir}/kiconedit.desktop
-%{_datadir}/apps/kiconedit/
-%{_datadir}/icons/hicolor/*/apps/kiconedit.png
-%{tde_docdir}/HTML/en/kiconedit/
+%{tde_bindir}/kiconedit
+%{tde_tdeappdir}/kiconedit.desktop
+%{tde_datadir}/apps/kiconedit/
+%{tde_datadir}/icons/hicolor/*/apps/kiconedit.png
+%{tde_tdedocdir}/HTML/en/kiconedit/
 
 ##########
 
@@ -426,24 +459,24 @@ MRML server.
 
 %files -n trinity-kmrml
 %defattr(-,root,root,-)
-%{_bindir}/mrmlsearch
-%{tde_libdir}/kcm_kmrml.la
-%{tde_libdir}/kcm_kmrml.so
-%{tde_libdir}/kded_daemonwatcher.la
-%{tde_libdir}/kded_daemonwatcher.so
-%{tde_libdir}/kio_mrml.la
-%{tde_libdir}/kio_mrml.so
-%{tde_libdir}/libkmrmlpart.la
-%{tde_libdir}/libkmrmlpart.so
-%{tde_libdir}/mrmlsearch.la
-%{tde_libdir}/mrmlsearch.so
-%{_libdir}/lib[kt]deinit_mrmlsearch.so
-%{tde_appdir}/kcmkmrml.desktop
-%{_datadir}/apps/konqueror/servicemenus/mrml-servicemenu.desktop
-%{_datadir}/mimelnk/text/mrml.desktop
-%{_datadir}/services/kded/daemonwatcher.desktop
-%{_datadir}/services/mrml.protocol
-%{_datadir}/services/mrml_part.desktop
+%{tde_bindir}/mrmlsearch
+%{tde_tdelibdir}/kcm_kmrml.la
+%{tde_tdelibdir}/kcm_kmrml.so
+%{tde_tdelibdir}/kded_daemonwatcher.la
+%{tde_tdelibdir}/kded_daemonwatcher.so
+%{tde_tdelibdir}/kio_mrml.la
+%{tde_tdelibdir}/kio_mrml.so
+%{tde_tdelibdir}/libkmrmlpart.la
+%{tde_tdelibdir}/libkmrmlpart.so
+%{tde_tdelibdir}/mrmlsearch.la
+%{tde_tdelibdir}/mrmlsearch.so
+%{tde_libdir}/lib[kt]deinit_mrmlsearch.so
+%{tde_tdeappdir}/kcmkmrml.desktop
+%{tde_datadir}/apps/konqueror/servicemenus/mrml-servicemenu.desktop
+%{tde_datadir}/mimelnk/text/mrml.desktop
+%{tde_datadir}/services/kded/daemonwatcher.desktop
+%{tde_datadir}/services/mrml.protocol
+%{tde_datadir}/services/mrml_part.desktop
 
 ##########
 
@@ -468,12 +501,12 @@ Homepage: http://kolourpaint.sourceforge.net
 
 %files -n trinity-kolourpaint
 %defattr(-,root,root,-)
-%{_bindir}/kolourpaint
-%{tde_appdir}/kolourpaint.desktop
-%{_datadir}/apps/kolourpaint/
-%{_datadir}/icons/hicolor/*/apps/kolourpaint.png
-%{_datadir}/icons/hicolor/scalable/apps/kolourpaint.svgz
-%{tde_docdir}/HTML/en/kolourpaint/
+%{tde_bindir}/kolourpaint
+%{tde_tdeappdir}/kolourpaint.desktop
+%{tde_datadir}/apps/kolourpaint/
+%{tde_datadir}/icons/hicolor/*/apps/kolourpaint.png
+%{tde_datadir}/icons/hicolor/scalable/apps/kolourpaint.svgz
+%{tde_tdedocdir}/HTML/en/kolourpaint/
 
 ##########
 
@@ -498,11 +531,11 @@ Homepage: http://kooka.kde.org/
 
 %files -n trinity-kooka
 %defattr(-,root,root,-)
-%{_datadir}/config/kookarc
-%{_bindir}/kooka
-%{tde_appdir}/kooka.desktop
-%{_datadir}/apps/kooka/
-%{tde_docdir}/HTML/en/kooka/
+%{tde_datadir}/config/kookarc
+%{tde_bindir}/kooka
+%{tde_tdeappdir}/kooka.desktop
+%{tde_datadir}/apps/kooka/
+%{tde_tdedocdir}/HTML/en/kooka/
 
 ##########
 
@@ -518,17 +551,17 @@ application.
 
 %files -n trinity-kpdf
 %defattr(-,root,root,-)
-%{_bindir}/kpdf
-%{tde_libdir}/libkpdfpart.la
-%{tde_libdir}/libkpdfpart.so
-%{tde_appdir}/kpdf.desktop
-%{_datadir}/apps/kpdf/shell.rc
-%{_datadir}/apps/kpdfpart/part.rc
-%{_datadir}/config.kcfg/kpdf.kcfg
-%{tde_docdir}/HTML/en/kpdf/
-%{_datadir}/icons/hicolor/*/apps/kpdf.png
-%{_datadir}/icons/hicolor/scalable/apps/kpdf.svgz
-%{_datadir}/services/kpdf_part.desktop
+%{tde_bindir}/kpdf
+%{tde_tdelibdir}/libkpdfpart.la
+%{tde_tdelibdir}/libkpdfpart.so
+%{tde_tdeappdir}/kpdf.desktop
+%{tde_datadir}/apps/kpdf/shell.rc
+%{tde_datadir}/apps/kpdfpart/part.rc
+%{tde_datadir}/config.kcfg/kpdf.kcfg
+%{tde_tdedocdir}/HTML/en/kpdf/
+%{tde_datadir}/icons/hicolor/*/apps/kpdf.png
+%{tde_datadir}/icons/hicolor/scalable/apps/kpdf.svgz
+%{tde_datadir}/services/kpdf_part.desktop
 
 ##########
 
@@ -555,15 +588,15 @@ Homepage: http://www.kpovmodeler.org
 %files -n trinity-kpovmodeler
 %defattr(-,root,root,-)
 %doc rpmdocs/kpovmodeler/
-%{_bindir}/kpovmodeler
-%{_libdir}/libkpovmodeler.so.*
-%{_libdir}/libkpovmodeler.la
-%{tde_libdir}/libkpovmodelerpart.*
-%{tde_appdir}/kpovmodeler.desktop
-%{_datadir}/apps/kpovmodeler/
-%{_datadir}/icons/crystalsvg/*/mimetypes/kpovmodeler_doc.*
-%{_datadir}/icons/hicolor/*/apps/kpovmodeler.*
-%doc %{tde_docdir}/HTML/en/kpovmodeler/
+%{tde_bindir}/kpovmodeler
+%{tde_libdir}/libkpovmodeler.so.*
+%{tde_libdir}/libkpovmodeler.la
+%{tde_tdelibdir}/libkpovmodelerpart.*
+%{tde_tdeappdir}/kpovmodeler.desktop
+%{tde_datadir}/apps/kpovmodeler/
+%{tde_datadir}/icons/crystalsvg/*/mimetypes/kpovmodeler_doc.*
+%{tde_datadir}/icons/hicolor/*/apps/kpovmodeler.*
+%doc %{tde_tdedocdir}/HTML/en/kpovmodeler/
 
 ##########
 
@@ -576,12 +609,12 @@ Kruler is a screen ruler (using pixels) and color measurement tool for KDE.
 
 %files -n trinity-kruler
 %defattr(-,root,root,-)
-%{_bindir}/kruler
-%{tde_appdir}/kruler.desktop
-%{_datadir}/applnk/Graphics/kruler.desktop
-%{_datadir}/apps/kruler/
-%{_datadir}/icons/hicolor/*/apps/kruler.png
-%{tde_docdir}/HTML/en/kruler/
+%{tde_bindir}/kruler
+%{tde_tdeappdir}/kruler.desktop
+%{tde_datadir}/applnk/Graphics/kruler.desktop
+%{tde_datadir}/apps/kruler/
+%{tde_datadir}/icons/hicolor/*/apps/kruler.png
+%{tde_tdedocdir}/HTML/en/kruler/
 
 ##########
 
@@ -596,11 +629,11 @@ The images can then be saved in a variety of formats.
 
 %files -n trinity-ksnapshot
 %defattr(-,root,root,-)
-%{_bindir}/ksnapshot
-%{tde_appdir}/ksnapshot.desktop
-%{tde_docdir}/HTML/en/ksnapshot/
-%{_datadir}/icons/hicolor/*/apps/ksnapshot.png
-%{_datadir}/icons/hicolor/scalable/apps/ksnapshot.svgz
+%{tde_bindir}/ksnapshot
+%{tde_tdeappdir}/ksnapshot.desktop
+%{tde_tdedocdir}/HTML/en/ksnapshot/
+%{tde_datadir}/icons/hicolor/*/apps/ksnapshot.png
+%{tde_datadir}/icons/hicolor/scalable/apps/ksnapshot.svgz
 
 ##########
 
@@ -615,23 +648,23 @@ application.
 
 %files -n trinity-ksvg
 %defattr(-,root,root,-)
-%{_bindir}/printnodetest
-%{_bindir}/svgdisplay
-%{tde_libdir}/libksvgplugin.la
-%{tde_libdir}/libksvgplugin.so
-%{tde_libdir}/libksvgrendererlibart.la
-%{tde_libdir}/libksvgrendererlibart.so
-%{tde_libdir}/svgthumbnail.la
-%{tde_libdir}/svgthumbnail.so
-%{_libdir}/libksvg.so.0
-%{_libdir}/libksvg.so.0.0.1
-%{_libdir}/libtext2path.so.0
-%{_libdir}/libtext2path.so.0.0.0
-%{_datadir}/apps/ksvg/ksvgplugin.rc
-%{_datadir}/services/ksvglibartcanvas.desktop
-%{_datadir}/services/ksvgplugin.desktop
-%{_datadir}/services/svgthumbnail.desktop
-%{_datadir}/servicetypes/ksvgrenderer.desktop
+%{tde_bindir}/printnodetest
+%{tde_bindir}/svgdisplay
+%{tde_tdelibdir}/libksvgplugin.la
+%{tde_tdelibdir}/libksvgplugin.so
+%{tde_tdelibdir}/libksvgrendererlibart.la
+%{tde_tdelibdir}/libksvgrendererlibart.so
+%{tde_tdelibdir}/svgthumbnail.la
+%{tde_tdelibdir}/svgthumbnail.so
+%{tde_libdir}/libksvg.so.0
+%{tde_libdir}/libksvg.so.0.0.1
+%{tde_libdir}/libtext2path.so.0
+%{tde_libdir}/libtext2path.so.0.0.0
+%{tde_datadir}/apps/ksvg/ksvgplugin.rc
+%{tde_datadir}/services/ksvglibartcanvas.desktop
+%{tde_datadir}/services/ksvgplugin.desktop
+%{tde_datadir}/services/svgthumbnail.desktop
+%{tde_datadir}/servicetypes/ksvgrenderer.desktop
 
 ##########
 
@@ -646,52 +679,52 @@ as well.
 
 %files -n trinity-kview
 %defattr(-,root,root,-)
-%{_bindir}/kview
-%{tde_libdir}/kcm_kviewcanvasconfig.la
-%{tde_libdir}/kcm_kviewcanvasconfig.so
-%{tde_libdir}/kcm_kviewgeneralconfig.la
-%{tde_libdir}/kcm_kviewgeneralconfig.so
-%{tde_libdir}/kcm_kviewpluginsconfig.la
-%{tde_libdir}/kcm_kviewpluginsconfig.so
-%{tde_libdir}/kcm_kviewpresenterconfig.la
-%{tde_libdir}/kcm_kviewpresenterconfig.so
-%{tde_libdir}/kcm_kviewviewerpluginsconfig.la
-%{tde_libdir}/kcm_kviewviewerpluginsconfig.so
-%{tde_libdir}/kview.la
-%{tde_libdir}/kview.so
-%{tde_libdir}/kview_browserplugin.la
-%{tde_libdir}/kview_browserplugin.so
-%{tde_libdir}/kview_effectsplugin.la
-%{tde_libdir}/kview_effectsplugin.so
-%{tde_libdir}/kview_presenterplugin.la
-%{tde_libdir}/kview_presenterplugin.so
-%{tde_libdir}/kview_scannerplugin.la
-%{tde_libdir}/kview_scannerplugin.so
-%{tde_libdir}/libkviewcanvas.la
-%{tde_libdir}/libkviewcanvas.so
-%{tde_libdir}/libkviewviewer.la
-%{tde_libdir}/libkviewviewer.so
-%{_libdir}/lib[kt]deinit_kview.so
-%{_libdir}/libkimageviewer.so.*
-%{tde_libdir}/libphotobook.la
-%{tde_libdir}/libphotobook.so
-%{tde_appdir}/kview.desktop
-%{_datadir}/apps/kview/
-%{_datadir}/apps/kviewviewer/
-%{_datadir}/apps/photobook/photobookui.rc
-%{_datadir}/icons/crystalsvg/*/apps/photobook.png
-%{_datadir}/icons/hicolor/*/apps/kview.png
-%{_datadir}/services/kconfiguredialog/kviewcanvasconfig.desktop
-%{_datadir}/services/kconfiguredialog/kviewgeneralconfig.desktop
-%{_datadir}/services/kconfiguredialog/kviewpluginsconfig.desktop
-%{_datadir}/services/kconfiguredialog/kviewpresenterconfig.desktop
-%{_datadir}/services/kconfiguredialog/kviewviewerpluginsconfig.desktop
-%{_datadir}/services/kviewcanvas.desktop
-%{_datadir}/services/kviewviewer.desktop
-%{_datadir}/services/photobook.desktop
-%{_datadir}/servicetypes/kimageviewer.desktop
-%{_datadir}/servicetypes/kimageviewercanvas.desktop
-%{tde_docdir}/HTML/en/kview/
+%{tde_bindir}/kview
+%{tde_tdelibdir}/kcm_kviewcanvasconfig.la
+%{tde_tdelibdir}/kcm_kviewcanvasconfig.so
+%{tde_tdelibdir}/kcm_kviewgeneralconfig.la
+%{tde_tdelibdir}/kcm_kviewgeneralconfig.so
+%{tde_tdelibdir}/kcm_kviewpluginsconfig.la
+%{tde_tdelibdir}/kcm_kviewpluginsconfig.so
+%{tde_tdelibdir}/kcm_kviewpresenterconfig.la
+%{tde_tdelibdir}/kcm_kviewpresenterconfig.so
+%{tde_tdelibdir}/kcm_kviewviewerpluginsconfig.la
+%{tde_tdelibdir}/kcm_kviewviewerpluginsconfig.so
+%{tde_tdelibdir}/kview.la
+%{tde_tdelibdir}/kview.so
+%{tde_tdelibdir}/kview_browserplugin.la
+%{tde_tdelibdir}/kview_browserplugin.so
+%{tde_tdelibdir}/kview_effectsplugin.la
+%{tde_tdelibdir}/kview_effectsplugin.so
+%{tde_tdelibdir}/kview_presenterplugin.la
+%{tde_tdelibdir}/kview_presenterplugin.so
+%{tde_tdelibdir}/kview_scannerplugin.la
+%{tde_tdelibdir}/kview_scannerplugin.so
+%{tde_tdelibdir}/libkviewcanvas.la
+%{tde_tdelibdir}/libkviewcanvas.so
+%{tde_tdelibdir}/libkviewviewer.la
+%{tde_tdelibdir}/libkviewviewer.so
+%{tde_libdir}/lib[kt]deinit_kview.so
+%{tde_libdir}/libkimageviewer.so.*
+%{tde_tdelibdir}/libphotobook.la
+%{tde_tdelibdir}/libphotobook.so
+%{tde_tdeappdir}/kview.desktop
+%{tde_datadir}/apps/kview/
+%{tde_datadir}/apps/kviewviewer/
+%{tde_datadir}/apps/photobook/photobookui.rc
+%{tde_datadir}/icons/crystalsvg/*/apps/photobook.png
+%{tde_datadir}/icons/hicolor/*/apps/kview.png
+%{tde_datadir}/services/kconfiguredialog/kviewcanvasconfig.desktop
+%{tde_datadir}/services/kconfiguredialog/kviewgeneralconfig.desktop
+%{tde_datadir}/services/kconfiguredialog/kviewpluginsconfig.desktop
+%{tde_datadir}/services/kconfiguredialog/kviewpresenterconfig.desktop
+%{tde_datadir}/services/kconfiguredialog/kviewviewerpluginsconfig.desktop
+%{tde_datadir}/services/kviewcanvas.desktop
+%{tde_datadir}/services/kviewviewer.desktop
+%{tde_datadir}/services/photobook.desktop
+%{tde_datadir}/servicetypes/kimageviewer.desktop
+%{tde_datadir}/servicetypes/kimageviewercanvas.desktop
+%{tde_tdedocdir}/HTML/en/kview/
 
 ##########
 
@@ -709,25 +742,25 @@ DjVu images.
 
 %files -n trinity-kviewshell
 %defattr(-,root,root,-)
-%{_bindir}/kviewshell
-%{_libdir}/libdjvu.la
-%{_libdir}/libdjvu.so
-%{tde_libdir}/djvuviewpart.so
-%{tde_libdir}/djvuviewpart.la
-%{tde_libdir}/emptymultipagepart.la
-%{tde_libdir}/emptymultipagepart.so
-%{tde_libdir}/kviewerpart.la
-%{tde_libdir}/kviewerpart.so
-%{_libdir}/libkmultipage.so.*
-%{_datadir}/apps/djvumultipage.rc
-%{_datadir}/apps/kviewerpart/
-%{_datadir}/apps/kviewshell/kviewshell.rc
-%{_datadir}/config.kcfg/djvumultipage.kcfg
-%{_datadir}/config.kcfg/kviewshell.kcfg
-%{_datadir}/icons/crystalsvg/*/apps/kviewshell.png
-%{_datadir}/services/emptymultipage.desktop
-%{_datadir}/services/djvumultipage.desktop
-%{_datadir}/servicetypes/kmultipage.desktop
+%{tde_bindir}/kviewshell
+%{tde_libdir}/libdjvu.la
+%{tde_libdir}/libdjvu.so
+%{tde_tdelibdir}/djvuviewpart.so
+%{tde_tdelibdir}/djvuviewpart.la
+%{tde_tdelibdir}/emptymultipagepart.la
+%{tde_tdelibdir}/emptymultipagepart.so
+%{tde_tdelibdir}/kviewerpart.la
+%{tde_tdelibdir}/kviewerpart.so
+%{tde_libdir}/libkmultipage.so.*
+%{tde_datadir}/apps/djvumultipage.rc
+%{tde_datadir}/apps/kviewerpart/
+%{tde_datadir}/apps/kviewshell/kviewshell.rc
+%{tde_datadir}/config.kcfg/djvumultipage.kcfg
+%{tde_datadir}/config.kcfg/kviewshell.kcfg
+%{tde_datadir}/icons/crystalsvg/*/apps/kviewshell.png
+%{tde_datadir}/services/emptymultipage.desktop
+%{tde_datadir}/services/djvumultipage.desktop
+%{tde_datadir}/servicetypes/kmultipage.desktop
 
 ##########
 
@@ -742,12 +775,12 @@ It provides an easy-to-use library, which allows you to access your scanner
 
 %files -n trinity-libkscan
 %defattr(-,root,root,-)
-%{_libdir}/libkscan.so.*
-%{_datadir}/icons/crystalsvg/16x16/actions/palette_color.png
-%{_datadir}/icons/crystalsvg/16x16/actions/palette_gray.png
-%{_datadir}/icons/crystalsvg/16x16/actions/palette_halftone.png
-%{_datadir}/icons/crystalsvg/16x16/actions/palette_lineart.png
-%{_datadir}/services/scanservice.desktop
+%{tde_libdir}/libkscan.so.*
+%{tde_datadir}/icons/crystalsvg/16x16/actions/palette_color.png
+%{tde_datadir}/icons/crystalsvg/16x16/actions/palette_gray.png
+%{tde_datadir}/icons/crystalsvg/16x16/actions/palette_halftone.png
+%{tde_datadir}/icons/crystalsvg/16x16/actions/palette_lineart.png
+%{tde_datadir}/services/scanservice.desktop
 
 ##########
 
@@ -760,8 +793,8 @@ This package contains development files for Trinity's scanner library.
 
 %files -n trinity-libkscan-devel
 %defattr(-,root,root,-)
-%{_libdir}/libkscan.la
-%{_libdir}/libkscan.so
+%{tde_libdir}/libkscan.la
+%{tde_libdir}/libkscan.so
 
 ##########
 
@@ -775,7 +808,7 @@ This library is used by the Trinity graphics file plugins for PDF support.
 
 %files libpoppler-tqt
 %defattr(-,root,root,-)
-%{_libdir}/libpoppler-tqt.so.*
+%{tde_libdir}/libpoppler-tqt.so.*
 
 ##########
 
@@ -790,12 +823,12 @@ This package contains the development files needed to compile applications again
 
 %files libpoppler-tqt-devel
 %defattr(-,root,root,-)
-%{tde_includedir}/poppler-link-qt3.h
-%{tde_includedir}/poppler-page-transition.h
-%{tde_includedir}/poppler-qt.h
-%{_libdir}/libpoppler-tqt.la
-%{_libdir}/libpoppler-tqt.so
-#%{_libdir}/pkgconfig/poppler-tqt.pc
+%{tde_tdeincludedir}/poppler-link-qt3.h
+%{tde_tdeincludedir}/poppler-page-transition.h
+%{tde_tdeincludedir}/poppler-qt.h
+%{tde_libdir}/libpoppler-tqt.la
+%{tde_libdir}/libpoppler-tqt.so
+%{tde_libdir}/pkgconfig/poppler-tqt.pc
 
 ##########
 
@@ -814,42 +847,42 @@ Requires: %{name}-libpoppler-tqt-devel = %{version}-%{release}
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/dom/
-#%{_includedir}/kfaximage.h
-%{_includedir}/kmultipageInterface.h
-%{_includedir}/ksvg/
-%{_includedir}/kviewshell/
-%{_includedir}/libtext2path-0.1/BezierPath.h
-%{_includedir}/libtext2path-0.1/Glyph.h
-%{_includedir}/libtext2path-0.1/GlyphTracer.h
-%{_libdir}/lib[kt]deinit_kview.la
-%{_libdir}/lib[kt]deinit_mrmlsearch.la
-%{_libdir}/libkghostviewlib.la
-%{_libdir}/libkghostviewlib.so
-%{_libdir}/libkimageviewer.la
-%{_libdir}/libkimageviewer.so
-%{_libdir}/libkmultipage.la
-%{_libdir}/libkmultipage.so
-%{_libdir}/libkpovmodeler.la
-%{_libdir}/libkpovmodeler.so
-%{_libdir}/libksvg.la
-%{_libdir}/libksvg.so
-%{_libdir}/libtext2path.la
-%{_libdir}/libtext2path.so
-%{_datadir}/cmake/*
+%{tde_tdeincludedir}/dom/
+#%{tde_tdeincludedir}/kfaximage.h
+%{tde_tdeincludedir}/kmultipageInterface.h
+%{tde_tdeincludedir}/ksvg/
+%{tde_tdeincludedir}/kviewshell/
+%{tde_tdeincludedir}/libtext2path-0.1/BezierPath.h
+%{tde_tdeincludedir}/libtext2path-0.1/Glyph.h
+%{tde_tdeincludedir}/libtext2path-0.1/GlyphTracer.h
+%{tde_libdir}/lib[kt]deinit_kview.la
+%{tde_libdir}/lib[kt]deinit_mrmlsearch.la
+%{tde_libdir}/libkghostviewlib.la
+%{tde_libdir}/libkghostviewlib.so
+%{tde_libdir}/libkimageviewer.la
+%{tde_libdir}/libkimageviewer.so
+%{tde_libdir}/libkmultipage.la
+%{tde_libdir}/libkmultipage.so
+%{tde_libdir}/libkpovmodeler.la
+%{tde_libdir}/libkpovmodeler.so
+%{tde_libdir}/libksvg.la
+%{tde_libdir}/libksvg.so
+%{tde_libdir}/libtext2path.la
+%{tde_libdir}/libtext2path.so
+%{tde_datadir}/cmake/*
 
 ############
 
 # Excludes kuickshow (built separately)
-%exclude %{_bindir}/kuickshow
-%exclude %{tde_libdir}/kuickshow.la
-%exclude %{tde_libdir}/kuickshow.so
-%exclude %{_libdir}/lib[kt]deinit_kuickshow.la
-%exclude %{_libdir}/lib[kt]deinit_kuickshow.so
-%exclude %{tde_appdir}/kuickshow.desktop
-%exclude %{_datadir}/apps/kuickshow/
-%exclude %{_datadir}/icons/hicolor/*/apps/kuickshow.png
-%exclude %{tde_docdir}/HTML/en/kuickshow/
+%exclude %{tde_bindir}/kuickshow
+%exclude %{tde_tdelibdir}/kuickshow.la
+%exclude %{tde_tdelibdir}/kuickshow.so
+%exclude %{tde_libdir}/lib[kt]deinit_kuickshow.la
+%exclude %{tde_libdir}/lib[kt]deinit_kuickshow.so
+%exclude %{tde_tdeappdir}/kuickshow.desktop
+%exclude %{tde_datadir}/apps/kuickshow/
+%exclude %{tde_datadir}/icons/hicolor/*/apps/kuickshow.png
+%exclude %{tde_tdedocdir}/HTML/en/kuickshow/
 
 ##########
 
@@ -865,18 +898,25 @@ Requires: %{name}-libpoppler-tqt-devel = %{version}-%{release}
 %patch5 -p1 -b .gcc47
 %patch6 -p1 -b .poppler
 %patch7 -p1
+%patch8 -p1
+%patch9 -p1
 
 
 %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:${PKG_CONFIG_PATH}"
+export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
+#export LD_LIBRARY_PATH="%{tde_libdir}"
 
-%__mkdir build
-cd build
+%{?!mgaversion:%__mkdir build; cd build}
 %cmake \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
+  -DCMAKE_SKIP_RPATH="OFF" \
   -DWITH_T1LIB=ON \
   -DWITH_LIBPAPER=ON \
   -DWITH_TIFF=ON \
@@ -889,12 +929,11 @@ cd build
 %__make %{?_smp_mflags}
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot} -C build
 
 # locale's
-%find_lang %{name} || touch %{name}.lang
 HTML_DIR=$(kde-config --expandvars --install html)
 if [ -d %{buildroot}$HTML_DIR ]; then
 for lang_dir in %{buildroot}$HTML_DIR/* ; do
@@ -932,6 +971,9 @@ rm -f %{buildroot}/libkpovmodeler.so
 
 
 %changelog
+* Wed Aug 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-6
+- Add poppler-tqt.pc file [Commit #b2d01d00]
+
 * Mon Jul 09 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5
 - Renames 'kdegraphics' to 'tdegraphics'
 - Split in several packages
diff --git a/redhat/kdelibs/kdelibs-3.5.13-add_ability_to_set_kled_off_color.patch b/redhat/kdelibs/kdelibs-3.5.13-add_ability_to_set_kled_off_color.patch
new file mode 100644
index 000000000..bdaac75ad
--- /dev/null
+++ b/redhat/kdelibs/kdelibs-3.5.13-add_ability_to_set_kled_off_color.patch
@@ -0,0 +1,100 @@
+commit 513ffc6edff67b5f7f121c3064b059ce82cbb842
+Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Date:   1341187933 -0500
+
+    Add ability to set KLed off color
+
+diff --git a/kdeui/kled.cpp b/kdeui/kled.cpp
+index 3a3aa2a..dc245cd 100644
+--- a/kdeui/kled.cpp
++++ b/kdeui/kled.cpp
+@@ -536,6 +536,12 @@ KLed::color() const
+   return led_color;
+ }
+ 
++TQColor
++KLed::offColor() const
++{
++  return led_off_color;
++}
++
+ KLed::Look
+ KLed::look() const
+ {
+@@ -581,6 +587,17 @@ KLed::setColor(const TQColor& col)
+ }
+ 
+ void
++KLed::setOffColor(const TQColor& col)
++{
++  if(led_off_color!=col) {
++    if(d->on_map)  { delete d->on_map; d->on_map = 0; }
++    if(d->off_map) { delete d->off_map; d->off_map = 0; }
++    d->offcolor = col;
++    update();
++  }
++}
++
++void
+ KLed::setDarkFactor(int darkfactor)
+ {
+   if (d->dark_factor != darkfactor) {
+diff --git a/kdeui/kled.h b/kdeui/kled.h
+index 7b9f327..b4f828e 100644
+--- a/kdeui/kled.h
++++ b/kdeui/kled.h
+@@ -50,6 +50,7 @@ class TDEUI_EXPORT KLed : public TQWidget
+     Q_PROPERTY( Shape tqshape READ tqshape WRITE setShape )
+     Q_PROPERTY( Look look READ look WRITE setLook )
+     Q_PROPERTY( TQColor color READ color WRITE setColor )
++    Q_PROPERTY( TQColor offColor READ color WRITE setOffColor )
+     Q_PROPERTY( int darkFactor READ darkFactor WRITE setDarkFactor )
+ 
+ public:
+@@ -148,6 +149,14 @@ public:
+   TQColor color() const;
+ 
+   /**
++   * Returns the off color of the widget
++   *
++   * @see OffColor
++   * @short Returns LED off color.
++   */
++  TQColor offColor() const;
++
++  /**
+    * Returns the look of the widget.
+    *
+    * @see Look
+@@ -204,6 +213,23 @@ public:
+   void setColor(const TQColor& color);
+ 
+   /**
++   * Set the off color of the widget.
++   * The Color is shown with the KLed::On state.
++   * The KLed::Off state is shown with this color if set
++   *
++   * The widget calls the update() method, so it will
++   * be updated when entering the main event loop.
++   *
++   * Note that calling setColor will override this value
++   *
++   * @see Color
++   *
++   * @param color New off color of the LED.
++   * @short Sets the LED off color.
++   */
++  void setOffColor(const TQColor& color);
++
++  /**
+    * Sets the factor to darken the LED in OFF state.
+    * Same as TQColor::dark().
+    * "darkfactor should be greater than 100, else the LED gets lighter
+@@ -316,6 +342,7 @@ protected:
+ private:
+   State led_state;
+   TQColor led_color;
++  TQColor led_off_color;
+   Look  led_look;
+   Shape led_tqshape;
+ 
diff --git a/redhat/kdelibs/kdelibs-3.5.13-add_readonly_to_tde_application.patch.ORI b/redhat/kdelibs/kdelibs-3.5.13-add_readonly_to_tde_application.patch.ORI
new file mode 100644
index 000000000..a249f1733
--- /dev/null
+++ b/redhat/kdelibs/kdelibs-3.5.13-add_readonly_to_tde_application.patch.ORI
@@ -0,0 +1,178 @@
+commit d3a9d56143cf668c7d29b26a324a424d02036371
+Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Date:   1337109016 -0500
+
+    Add the ability to force read-only configuration file access in a TDE application
+    Force kde-config to use read-only access
+    This closes Bug 293
+
+diff --git a/kdecore/kconfigbackend.cpp b/kdecore/kconfigbackend.cpp
+index 9ee9dd6..4ad0e5f 100644
+--- a/kdecore/kconfigbackend.cpp
++++ b/kdecore/kconfigbackend.cpp
+@@ -247,17 +247,22 @@ void KConfigBackEnd::changeFileName(const TQString &_fileName,
+    mfileName = _fileName;
+    resType = _resType;
+    useKDEGlobals = _useKDEGlobals;
+-   if (mfileName.isEmpty())
++   if (mfileName.isEmpty()) {
+       mLocalFileName = TQString::null;
+-   else if (!TQDir::isRelativePath(mfileName))
++   }
++   else if (!TQDir::isRelativePath(mfileName)) {
+       mLocalFileName = mfileName;
+-   else
+-      mLocalFileName = KGlobal::dirs()->saveLocation(resType) + mfileName;
++   }
++   else {
++      mLocalFileName = KGlobal::dirs()->saveLocation(resType, TQString(), false) + mfileName;
++   }
+ 
+-   if (useKDEGlobals)
++   if (useKDEGlobals) {
+       mGlobalFileName = KGlobal::dirs()->saveLocation("config", TQString(), false) + TQString::fromLatin1("kdeglobals");
+-   else
++   }
++   else {
+       mGlobalFileName = TQString::null;
++   }
+ 
+    d->localLastModified = TQDateTime();
+    d->localLastSize = 0;
+diff --git a/kdecore/kconfigbase.cpp b/kdecore/kconfigbase.cpp
+index 9ad6600..c5c0a4e 100644
+--- a/kdecore/kconfigbase.cpp
++++ b/kdecore/kconfigbase.cpp
+@@ -1139,16 +1139,18 @@ static TQString translatePath( TQString path )
+ 
+    // return original path, if it refers to another type of URL (e.g. http:/), or
+    // if the path is already relative to another directory
+-   if (!startsWithFile && path[0] != '/' ||
+-        startsWithFile && path[5] != '/')
++   if (((!startsWithFile) && (path[0] != '/')) || (startsWithFile && (path[5] != '/'))) {
+ 	return path;
++   }
+ 
+-   if (startsWithFile)
++   if (startsWithFile) {
+         path.remove(0,5); // strip leading "file:/" off the string
++   }
+ 
+    // keep only one single '/' at the beginning - needed for cleanHomeDirPath()
+-   while (path[0] == '/' && path[1] == '/')
++   while (path[0] == '/' && path[1] == '/') {
+ 	path.remove(0,1);
++   }
+ 
+    // we can not use KGlobal::dirs()->relativeLocation("home", path) here,
+    // since it would not recognize paths without a trailing '/'.
+diff --git a/kdecore/kinstance.cpp b/kdecore/kinstance.cpp
+index fe0a515..5b3aa86 100644
+--- ./kdecore/kinstance.cpp.orig	2011-08-11 04:30:15.000000000 +0200
++++ ./kdecore/kinstance.cpp	2012-06-18 23:34:55.942376042 +0200
+@@ -70,7 +70,7 @@
+   : _dirs (0L),
+     _config (0L),
+     _iconLoader (0L),
+-    _name( name ), _aboutData( new KAboutData( name, "", 0 ) )
++    _name( name ), _aboutData( new KAboutData( name, "", 0 ) ), m_configReadOnly(false)
+ {
+     DEBUG_ADD
+     Q_ASSERT(!name.isEmpty());
+@@ -88,7 +88,7 @@
+   : _dirs (0L),
+     _config (0L),
+     _iconLoader (0L),
+-    _name( aboutData->appName() ), _aboutData( aboutData )
++    _name( aboutData->appName() ), _aboutData( aboutData ), m_configReadOnly(false)
+ {
+     DEBUG_ADD
+     Q_ASSERT(!_name.isEmpty());
+@@ -107,7 +107,7 @@
+   : _dirs ( src->_dirs ),
+     _config ( src->_config ),
+     _iconLoader ( src->_iconLoader ),
+-    _name( src->_name ), _aboutData( src->_aboutData )
++    _name( src->_name ), _aboutData( src->_aboutData ), m_configReadOnly(false)
+ {
+     DEBUG_ADD
+     Q_ASSERT(!_name.isEmpty());
+@@ -174,6 +174,11 @@
+ extern bool kde_kiosk_exception;
+ extern bool kde_kiosk_admin;
+ 
++void KInstance::setConfigReadOnly(bool ro)
++{
++    m_configReadOnly = ro;
++}
++
+ KConfig	*KInstance::config() const
+ {
+     DEBUG_CHECK_ALIVE
+@@ -199,7 +204,7 @@
+         if ( d->sharedConfig == 0 )
+         {
+ 	    if ( !_name.isEmpty() )
+-	        d->sharedConfig = KSharedConfig::openConfig( _name + "rc");
++	        d->sharedConfig = KSharedConfig::openConfig( _name + "rc"), m_configReadOnly;
+ 	    else
+ 	        d->sharedConfig = KSharedConfig::openConfig( TQString::null );
+ 	}
+diff --git a/kdecore/kinstance.h b/kdecore/kinstance.h
+index 75cc4b4..444a2d8 100644
+--- a/kdecore/kinstance.h
++++ b/kdecore/kinstance.h
+@@ -96,6 +96,14 @@ class kdecore_EXPORT KInstance
+     KSharedConfig      *sharedConfig() const;
+ 
+     /**
++     * Set a read-only flag on the configuration files
++     * This must be called before config() or dirs() to have any effect
++     * Defaults to FALSE
++     * @param ro read only if TRUE
++     */
++    void                setConfigReadOnly(bool ro);
++
++    /**
+      *  Returns an iconloader object.
+      * @return the iconloader object.
+      */
+@@ -162,6 +170,7 @@ protected:
+     virtual void virtual_hook( int id, void* data );
+ private:
+     KInstancePrivate *d;
++    bool m_configReadOnly;
+ };
+ 
+ #endif
+diff --git a/kdecore/kstandarddirs.cpp b/kdecore/kstandarddirs.cpp
+index bce4bf4..bb8ae97 100644
+--- ./kdecore/kstandarddirs.cpp.orig	2011-08-21 06:15:32.000000000 +0200
++++ ./kdecore/kstandarddirs.cpp	2012-06-18 23:46:56.765409982 +0200
+@@ -767,8 +766,12 @@
+          srv = findExe(TQString::tqfromLatin1("lnusertemp"));
+       if (!srv.isEmpty())
+       {
+-         system(TQFile::encodeName(srv)+" "+type);
+-         result = readlink(TQFile::encodeName(dir).data(), link, 1023);
++         if (system(TQFile::encodeName(srv)+" "+type) < 0 ) {
++             result = readlink(TQFile::encodeName(dir).data(), link, 1023);
++         }
++         else {
++             result = -1;
++         }
+       }
+    }
+    if (result > 0)
+diff --git a/kdecore/kde-config.cpp.in b/kdecore/kde-config.cpp.in
+index 90c5dae..c988b00 100644
+--- a/kdecore/kde-config.cpp.in
++++ b/kdecore/kde-config.cpp.in
+@@ -120,6 +120,7 @@ int main(int argc, char **argv)
+     KCmdLineArgs::addCmdLineOptions( options ); // Add my own options.
+ 
+     KInstance a("kde-config");
++    a.setConfigReadOnly(TRUE);
+     (void)KGlobal::dirs(); // trigger the creation
+     (void)KGlobal::config();
+ 
diff --git a/redhat/kdelibs/kdelibs-3.5.13-fix_iso_kioslave_not_parsing_large_image_properly.patch b/redhat/kdelibs/kdelibs-3.5.13-fix_iso_kioslave_not_parsing_large_image_properly.patch
new file mode 100644
index 000000000..f55310ed8
--- /dev/null
+++ b/redhat/kdelibs/kdelibs-3.5.13-fix_iso_kioslave_not_parsing_large_image_properly.patch
@@ -0,0 +1,171 @@
+commit b4bba7b553995a6b13214dbbabe18ff311007eea
+Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Date:   1341113466 -0500
+
+    Fix iso kioslave not parsing large images properly
+
+diff --git a/kioslave/iso/kiso.cpp b/kioslave/iso/kiso.cpp
+index c6faa65..6403f62 100644
+--- a/kioslave/iso/kiso.cpp
++++ b/kioslave/iso/kiso.cpp
+@@ -188,7 +188,7 @@ KIso::~KIso()
+ }
+ 
+ /* callback function for libisofs */
+-static int readf(char *buf, int start, int len,void *udata) {
++static int readf(char *buf, long start, long len,void *udata) {
+ 
+     TQIODevice* dev = ( static_cast<KIso*> (udata) )->device();
+ 
+@@ -212,7 +212,7 @@ static int mycallb(struct iso_directory_record *idr,void *udata) {
+     bool special=false;
+     KArchiveEntry *entry=NULL,*oldentry=NULL;
+     char z_algo[2],z_params[2];
+-    int z_size=0;
++    long long z_size=0;
+ 
+     if ((idr->flags[0] & 1) && !iso->showhidden) return 0;
+     if (iso->level) {
+@@ -289,7 +289,8 @@ static int mycallb(struct iso_directory_record *idr,void *udata) {
+ 
+ void KIso::addBoot(struct el_torito_boot_descriptor* bootdesc) {
+ 
+-    int i,size;
++    int i;
++    long long size;
+     boot_head boot;
+     boot_entry *be;
+     TQString path;
+diff --git a/kioslave/iso/kisofile.cpp b/kioslave/iso/kisofile.cpp
+index afac16b..ffae0d3 100644
+--- a/kioslave/iso/kisofile.cpp
++++ b/kioslave/iso/kisofile.cpp
+@@ -20,7 +20,7 @@
+ 
+ KIsoFile::KIsoFile( KArchive* archive, const TQString& name, int access,
+     int date, int adate,int cdate, const TQString& user, const TQString& group,
+-    const TQString& symlink,int pos, int size) :
++    const TQString& symlink,long long pos, long long size) :
+         KArchiveFile(archive, name, access, date, user, group, symlink, pos, size) {
+ 
+ 
+@@ -32,7 +32,7 @@ KIsoFile::KIsoFile( KArchive* archive, const TQString& name, int access,
+ KIsoFile::~KIsoFile(){
+ }
+ 
+-void KIsoFile::setZF(char algo[2],char parms[2],int realsize) {
++void KIsoFile::setZF(char algo[2],char parms[2],long long realsize) {
+     m_algo[0]=algo[0];m_algo[1]=algo[1];
+     m_parms[0]=parms[0];m_parms[1]=parms[1];
+     m_realsize=realsize;
+diff --git a/kioslave/iso/kisofile.h b/kioslave/iso/kisofile.h
+index 193509c..696a8c1 100644
+--- a/kioslave/iso/kisofile.h
++++ b/kioslave/iso/kisofile.h
+@@ -29,9 +29,9 @@ class KIsoFile : public KArchiveFile  {
+ public: 
+     KIsoFile( KArchive* archive, const TQString& name, int access, int date,
+                     int adate,int cdate, const TQString& user, const TQString& group,
+-                   const TQString& symlink, int pos, int size);
++                   const TQString& symlink, long long pos, long long size);
+     ~KIsoFile();
+-    void setZF(char algo[2],char parms[2],int realsize);
++    void setZF(char algo[2],char parms[2],long long realsize);
+     int adate() const { return m_adate; }
+     int cdate() const { return m_cdate; }
+     long long realsize() const { return m_realsize; }
+diff --git a/kioslave/iso/libisofs/isofs.c b/kioslave/iso/libisofs/isofs.c
+index ab13d9e..e599450 100644
+--- a/kioslave/iso/libisofs/isofs.c
++++ b/kioslave/iso/libisofs/isofs.c
+@@ -122,8 +122,8 @@ void FreeBootTable(boot_head *boot) {
+ 	boot->defentry=NULL;
+ }
+ 
+-int BootImageSize(int media,int len) {
+-	int ret;
++int BootImageSize(int media,long len) {
++	long long ret;
+ 
+ 	switch(media & 0xf) {
+ 		case 0:
+@@ -158,7 +158,7 @@ static boot_entry *CreateBootEntry(char *be) {
+ 	return entry;
+ }
+ 
+-int ReadBootTable(readfunc *read,int sector, boot_head *head, void *udata) {
++int ReadBootTable(readfunc *read,long sector, boot_head *head, void *udata) {
+ 
+ 	char buf[2048], *c, *be;
+ 	int i,end=0;
+@@ -221,7 +221,7 @@ err:
+ /**
+  * Creates the linked list of the volume descriptors
+  */
+-iso_vol_desc *ReadISO9660(readfunc *read,int sector,void *udata) {
++iso_vol_desc *ReadISO9660(readfunc *read,long sector,void *udata) {
+ 				
+ 	int i;
+ 	struct iso_volume_descriptor buf;
+@@ -577,10 +577,10 @@ int level=0,joliet=0,dirs,files;
+ iconv_t iconv_d;
+ int fd;
+ 
+-int readf(char *buf, int start, int len,void *udata) {
++int readf(char *buf, long start, long len,void *udata) {
+ 	int ret;
+ 	
+-	if ((ret=lseek(fd, start << 11, SEEK_SET))<0) return ret;
++	if ((ret=lseek64(fd, start << 11, SEEK_SET))<0) return ret;
+ 	ret=read(fd, buf, len << 11);
+ 	if (ret<0) return ret;
+ 	return (ret >> 11);
+diff --git a/kioslave/iso/libisofs/isofs.h b/kioslave/iso/libisofs/isofs.h
+index 52190e6..b8971a4 100644
+--- a/kioslave/iso/libisofs/isofs.h
++++ b/kioslave/iso/libisofs/isofs.h
+@@ -50,7 +50,7 @@ typedef struct _rr_entry {
+ 	int		re; /* relocated */
+ 	char	z_algo[2]; /* zizofs algorithm */
+ 	char	z_params[2]; /* zizofs parameters */
+-	int		z_size; /* zizofs real_size */
++	long		z_size; /* zizofs real_size */
+ } rr_entry;
+ 
+ typedef struct _iso_vol_desc {
+@@ -78,7 +78,7 @@ typedef struct _boot_head {
+ /**
+  * this callback function needs to read 'len' sectors from 'start' into 'buf' 
+  */
+-typedef int readfunc(char *buf,int start, int len,void *);
++typedef int readfunc(char *buf,long start, long len,void *);
+ 
+ /**
+  * ProcessDir uses this callback
+@@ -107,7 +107,7 @@ time_t isodate_84261(char * p, int hs);
+  * If the function fails, returns NULL
+  * Don't forget to call FreeISO9660 after using the volume descriptor list!
+  */
+-iso_vol_desc *ReadISO9660(readfunc *read,int sector,void *udata);
++iso_vol_desc *ReadISO9660(readfunc *read,long sector,void *udata);
+ 
+ /**
+  * Frees the linked list of volume descriptors
+@@ -140,7 +140,7 @@ int JolietLevel(struct iso_volume_descriptor *ivd);
+ /**
+  * Returns the size of the boot image (in 512 byte sectors)
+  */
+-int BootImageSize(int media,int len);
++int BootImageSize(int media,long len);
+ 
+ /**
+  * Frees the boot catalog entries in 'boot'. If you ever called ReadBootTable,
+@@ -151,7 +151,7 @@ void FreeBootTable(boot_head *boot);
+ /**
+  * Reads the boot catalog into 'head'. Don't forget to call FreeBootTable!
+  */
+-int ReadBootTable(readfunc *read,int sector, boot_head *head, void *udata);
++int ReadBootTable(readfunc *read,long sector, boot_head *head, void *udata);
+ 
+ #ifdef __cplusplus
+ } //extern "C"
diff --git a/redhat/kdelibs/kdelibs-3.5.13-fix_spinbox_text_entry_when_base_not_10.patch b/redhat/kdelibs/kdelibs-3.5.13-fix_spinbox_text_entry_when_base_not_10.patch
new file mode 100644
index 000000000..9a34f74db
--- /dev/null
+++ b/redhat/kdelibs/kdelibs-3.5.13-fix_spinbox_text_entry_when_base_not_10.patch
@@ -0,0 +1,35 @@
+commit d1c71f692f5329dbfe817bbed41c5137be608efa
+Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Date:   1341199632 -0500
+
+    Fix spinbox text entry when base is not 10
+
+diff --git a/kdeui/knuminput.cpp b/kdeui/knuminput.cpp
+index 27b86f9..118af6c 100644
+--- a/kdeui/knuminput.cpp
++++ b/kdeui/knuminput.cpp
+@@ -206,6 +206,7 @@ KIntSpinBox::KIntSpinBox(TQWidget *parent, const char *name)
+ {
+     editor()->tqsetAlignment(AlignRight);
+     val_base = 10;
++    setValidator(new KIntValidator(this, val_base));
+     setValue(0);
+ }
+ 
+@@ -219,11 +220,16 @@ KIntSpinBox::KIntSpinBox(int lower, int upper, int step, int value, int base,
+ {
+     editor()->tqsetAlignment(AlignRight);
+     val_base = base;
++    setValidator(new KIntValidator(this, val_base));
+     setValue(value);
+ }
+ 
+ void KIntSpinBox::setBase(int base)
+ {
++    const KIntValidator* kvalidator = dynamic_cast<const KIntValidator*>(validator());
++    if (kvalidator) {
++    	const_cast<KIntValidator*>(kvalidator)->setBase(base);
++    }
+     val_base = base;
+ }
+ 
diff --git a/redhat/kdelibs/kdelibs-3.5.13-restore_tdesu_keeppassword_default_disabled.patch b/redhat/kdelibs/kdelibs-3.5.13-restore_tdesu_keeppassword_default_disabled.patch
new file mode 100644
index 000000000..8c3f43a11
--- /dev/null
+++ b/redhat/kdelibs/kdelibs-3.5.13-restore_tdesu_keeppassword_default_disabled.patch
@@ -0,0 +1,21 @@
+commit 87363770ea3fe6167445b6d445ca563f2a3f05fc
+Author: Darrell Anderson <humanreadable@yahoo.com>
+Date:   1339430277 -0500
+
+    Restore tdesu dialog "Keep password" check box default to disabled/unchecked.
+
+diff --git a/tdesu/defaults.h b/tdesu/defaults.h
+index 4649b2b..7fd724e 100644
+--- a/kdesu/defaults.h
++++ b/kdesu/defaults.h
+@@ -13,9 +13,8 @@
+ #ifndef __Defaults_h_included__
+ #define __Defaults_h_included__
+ 
+-/*const int defTimeout = 120*60;*/
+ const int defTimeout = 120*60;
+ const int defEchoMode = 0;
+-const int defKeep = true;
++const int defKeep = false;
+ 
+ #endif
diff --git a/redhat/kdelibs/kdelibs-3.5.13-update_iso_kioslave_better_handle_large_image.patch b/redhat/kdelibs/kdelibs-3.5.13-update_iso_kioslave_better_handle_large_image.patch
new file mode 100644
index 000000000..601bc41ea
--- /dev/null
+++ b/redhat/kdelibs/kdelibs-3.5.13-update_iso_kioslave_better_handle_large_image.patch
@@ -0,0 +1,115 @@
+commit dca4c677237b01768f5d6d798a2d918547d2ee8e
+Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Date:   1341289561 -0500
+
+    Update iso kioslave to better handle large images
+
+diff --git a/kioslave/iso/kiso.cpp b/kioslave/iso/kiso.cpp
+index c9e2d43..9ec1f1c 100644
+--- a/kioslave/iso/kiso.cpp
++++ b/kioslave/iso/kiso.cpp
+@@ -188,7 +188,7 @@ KIso::~KIso()
+ }
+ 
+ /* callback function for libisofs */
+-static int readf(char *buf, long start, long len,void *udata) {
++static int readf(char *buf, long long start, long long len,void *udata) {
+ 
+     TQIODevice* dev = ( static_cast<KIso*> (udata) )->device();
+ 
+diff --git a/kioslave/iso/libisofs/isofs.c b/kioslave/iso/libisofs/isofs.c
+index e599450..f1db442 100644
+--- a/kioslave/iso/libisofs/isofs.c
++++ b/kioslave/iso/libisofs/isofs.c
+@@ -122,7 +122,7 @@ void FreeBootTable(boot_head *boot) {
+ 	boot->defentry=NULL;
+ }
+ 
+-int BootImageSize(int media,long len) {
++int BootImageSize(int media,long long len) {
+ 	long long ret;
+ 
+ 	switch(media & 0xf) {
+@@ -158,7 +158,7 @@ static boot_entry *CreateBootEntry(char *be) {
+ 	return entry;
+ }
+ 
+-int ReadBootTable(readfunc *read,long sector, boot_head *head, void *udata) {
++int ReadBootTable(readfunc *read,long long sector, boot_head *head, void *udata) {
+ 
+ 	char buf[2048], *c, *be;
+ 	int i,end=0;
+@@ -221,7 +221,7 @@ err:
+ /**
+  * Creates the linked list of the volume descriptors
+  */
+-iso_vol_desc *ReadISO9660(readfunc *read,long sector,void *udata) {
++iso_vol_desc *ReadISO9660(readfunc *read,long long sector,void *udata) {
+ 				
+ 	int i;
+ 	struct iso_volume_descriptor buf;
+@@ -577,7 +577,7 @@ int level=0,joliet=0,dirs,files;
+ iconv_t iconv_d;
+ int fd;
+ 
+-int readf(char *buf, long start, long len,void *udata) {
++int readf(char *buf, long long start, long long len,void *udata) {
+ 	int ret;
+ 	
+ 	if ((ret=lseek64(fd, start << 11, SEEK_SET))<0) return ret;
+diff --git a/kioslave/iso/libisofs/isofs.h b/kioslave/iso/libisofs/isofs.h
+index b8971a4..1d17de4 100644
+--- a/kioslave/iso/libisofs/isofs.h
++++ b/kioslave/iso/libisofs/isofs.h
+@@ -50,13 +50,13 @@ typedef struct _rr_entry {
+ 	int		re; /* relocated */
+ 	char	z_algo[2]; /* zizofs algorithm */
+ 	char	z_params[2]; /* zizofs parameters */
+-	long		z_size; /* zizofs real_size */
++	long long	z_size; /* zizofs real_size */
+ } rr_entry;
+ 
+ typedef struct _iso_vol_desc {
+ 	struct _iso_vol_desc	*next;
+ 	struct _iso_vol_desc	*prev;
+-	struct iso_volume_descriptor	data;	
++	struct iso_volume_descriptor	data;
+ } iso_vol_desc;
+ 
+ typedef struct _boot_entry {
+@@ -78,7 +78,7 @@ typedef struct _boot_head {
+ /**
+  * this callback function needs to read 'len' sectors from 'start' into 'buf' 
+  */
+-typedef int readfunc(char *buf,long start, long len,void *);
++typedef int readfunc(char *buf,long long start, long long len,void *);
+ 
+ /**
+  * ProcessDir uses this callback
+@@ -107,7 +107,7 @@ time_t isodate_84261(char * p, int hs);
+  * If the function fails, returns NULL
+  * Don't forget to call FreeISO9660 after using the volume descriptor list!
+  */
+-iso_vol_desc *ReadISO9660(readfunc *read,long sector,void *udata);
++iso_vol_desc *ReadISO9660(readfunc *read,long long sector,void *udata);
+ 
+ /**
+  * Frees the linked list of volume descriptors
+@@ -140,7 +140,7 @@ int JolietLevel(struct iso_volume_descriptor *ivd);
+ /**
+  * Returns the size of the boot image (in 512 byte sectors)
+  */
+-int BootImageSize(int media,long len);
++int BootImageSize(int media,long long len);
+ 
+ /**
+  * Frees the boot catalog entries in 'boot'. If you ever called ReadBootTable,
+@@ -151,7 +151,7 @@ void FreeBootTable(boot_head *boot);
+ /**
+  * Reads the boot catalog into 'head'. Don't forget to call FreeBootTable!
+  */
+-int ReadBootTable(readfunc *read,long sector, boot_head *head, void *udata);
++int ReadBootTable(readfunc *read,long long sector, boot_head *head, void *udata);
+ 
+ #ifdef __cplusplus
+ } //extern "C"
diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
index 85e6f5e05..89e939507 100755
--- a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
+++ b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
@@ -1,16 +1,23 @@
 # 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 variables
-%define tde_docdir %{_docdir}/kde
-%define tde_libdir %{_libdir}/trinity
+%define tde_bindir %{_prefix}/bin
+%define tde_datadir %{_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{_prefix}/include
+%define tde_libdir %{_prefix}/%{_lib}
+
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_docdir}
 
 Name:		trinity-tdelibs
 Version:	3.5.13
-Release:	10%{?dist}%{?_variant}
+Release:	11%{?dist}%{?_variant}
 License:	GPL
 Summary:	TDE Libraries
 Group:		Environment/Libraries
@@ -71,12 +78,21 @@ Patch27:	kdelibs-3.5.13-add_dynamic_label_to_kpassword.patch
 Patch28:	kdelibs-3.5.13-fix_build_kspell2.patch
 ## [tdelibs] Export kdemain symbol in iso kioslave [Bug #465] [Commit #0536f0b7]
 Patch29:	kdelibs-3.5.13-fix_iso_kioslave.patch
+## [tdelibs] Fix iso kioslave not parsing large images properly [Commit #b4bba7b5]
+Patch30:	kdelibs-3.5.13-fix_iso_kioslave_not_parsing_large_image_properly.patch
+## [tdelibs] Add ability to set KLed off color [Commit #513ffc6e]
+Patch31:	kdelibs-3.5.13-add_ability_to_set_kled_off_color.patch
+## [tdelibs] Fix spinbox text entry when base is not 10 [Commit #d1c71f69]
+Patch32:	kdelibs-3.5.13-fix_spinbox_text_entry_when_base_not_10.patch
+## [tdelibs] Update iso kioslave to better handle large images [Commit #dca4c677]
+Patch33:	kdelibs-3.5.13-update_iso_kioslave_better_handle_large_image.patch
+## [tdelibs] Restore tdesu dialog "Keep password" check box default to disabled/unchecked. [Commit #87363770]
+Patch34:	kdelibs-3.5.13-restore_tdesu_keeppassword_default_disabled.patch
 
 BuildRequires:	cmake >= 2.8
 BuildRequires:	libtool
 BuildRequires:	tqtinterface-devel
 BuildRequires:	trinity-arts-devel
-BuildRequires:	avahi-devel
 BuildRequires:	krb5-devel libxslt-devel cups-devel libart_lgpl-devel pcre-devel
 BuildRequires:	libutempter-devel
 BuildRequires:	bzip2-devel
@@ -85,25 +101,34 @@ BuildRequires:	gcc-c++
 BuildRequires:	alsa-lib-devel
 BuildRequires:	libidn-devel
 BuildRequires:	qt3-devel
-BuildRequires:	avahi-qt3-devel
 BuildRequires:	jasper-devel
 BuildRequires:	libtiff-devel
 BuildRequires:	OpenEXR-devel
-BuildRequires:	libtool-ltdl-devel
 BuildRequires:	glib2-devel
 BuildRequires:	gamin-devel
-BuildRequires:	xorg-x11-proto-devel
-BuildRequires:	libXcomposite-devel
 BuildRequires:	aspell-devel
 BuildRequires:	hspell-devel
+BuildRequires:	avahi-tqt-devel >= 3.5.13
 # LUA support are not ready yet
 #BuildRequires:	lua-devel
 
-Requires:		tqtinterface
-Requires:		trinity-arts
+%if 0%{?mgaversion}
+BuildRequires:	%{_lib}avahi-client-devel
+BuildRequires:	%{_lib}ltdl-devel
+BuildRequires:	x11-proto-devel
+BuildRequires:	%{_lib}xcomposite1-devel
+Requires:		%{_lib}avahi-client3
+%else
+BuildRequires:	avahi-devel
+BuildRequires:	libtool-ltdl-devel
+BuildRequires:	xorg-x11-proto-devel
+BuildRequires:	libXcomposite-devel
+%endif
+
+Requires:		tqtinterface >= 3.5.13
+Requires:		trinity-arts >= 3.5.13
 Requires:		avahi
-Requires:		qt3
-Requires:		avahi-qt3
+Requires:		qt3 >= 3.3.8.d
 
 %description
 Libraries for the Trinity Desktop Environment:
@@ -115,103 +140,103 @@ kimgio (image manipulation).
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYING-DOCS COPYING.LIB README TODO
-%{_bindir}/artsmessage
-%{_bindir}/cupsdconf
-%{_bindir}/cupsdoprint
-%{_bindir}/dcop
-%{_bindir}/dcopclient
-%{_bindir}/dcopfind
-%{_bindir}/dcopobject
-%{_bindir}/dcopquit
-%{_bindir}/dcopref
-%{_bindir}/dcopserver
-%{_bindir}/dcopserver_shutdown
-%{_bindir}/dcopstart
-%{_bindir}/filesharelist
-%{_bindir}/fileshareset
-%{_bindir}/imagetops
-%{_bindir}/kab2kabc
-%{_bindir}/kaddprinterwizard
-%{_bindir}/kbuildsycoca
-%{_bindir}/kcmshell
-%{_bindir}/kconf_update
-%{_bindir}/kcookiejar
-%{_bindir}/kde-config
-%{_bindir}/kde-menu
-%{_bindir}/kded
-%{_bindir}/kdeinit
-%{_bindir}/kdeinit_shutdown
-%{_bindir}/kdeinit_wrapper
-%{_bindir}/kdesu_stub
-%{_bindir}/kdontchangethehostname
-%{_bindir}/kdostartupconfig
-%{_bindir}/kfile
-%{_bindir}/kfmexec
-%{_bindir}/khotnewstuff
-%{_bindir}/kinstalltheme
-%{_bindir}/kio_http_cache_cleaner
-%{_bindir}/kio_uiserver
-%{_bindir}/kioexec
-%{_bindir}/kioslave
-%{_bindir}/klauncher
-%{_bindir}/kmailservice
-%{_bindir}/kmimelist
-%attr(4755,root,root) %{_bindir}/kpac_dhcp_helper
-%{_bindir}/ksendbugmail
-%{_bindir}/kshell
-%{_bindir}/kstartupconfig
-%{_bindir}/ktelnetservice
-%{_bindir}/ktradertest
-%{_bindir}/kwrapper
-%{_bindir}/lnusertemp
-%{_bindir}/make_driver_db_cups
-%{_bindir}/make_driver_db_lpr
-%{_bindir}/meinproc
-%{_bindir}/networkstatustestservice
-%{_bindir}/start_kdeinit
-%{_bindir}/start_kdeinit_wrapper
-%attr(4755,root,root) %{_bindir}/kgrantpty
-%{_libdir}/lib*.so.*
-%{_libdir}/lib[kt]deinit_*.la
-%{_libdir}/lib[kt]deinit_*.so
-%{tde_libdir}/
-%{_datadir}/applications/kde/*.desktop
-%{_datadir}/autostart/kab2kabc.desktop
-%{_datadir}/applnk/kio_iso.desktop
-%{_datadir}/apps/*
-%exclude %{_datadir}/apps/ksgmltools2/
-%config(noreplace) %{_datadir}/config/*
-%{_datadir}/emoticons/*
-%{_datadir}/icons/default.kde
-%{_datadir}/mimelnk/magic
-%{_datadir}/mimelnk/*/*.desktop
-%{_datadir}/services/*
-%{_datadir}/servicetypes/*
-%{_datadir}/icons/crystalsvg/
-%{tde_docdir}/HTML/en/kspell
+%{tde_bindir}/artsmessage
+%{tde_bindir}/cupsdconf
+%{tde_bindir}/cupsdoprint
+%{tde_bindir}/dcop
+%{tde_bindir}/dcopclient
+%{tde_bindir}/dcopfind
+%{tde_bindir}/dcopobject
+%{tde_bindir}/dcopquit
+%{tde_bindir}/dcopref
+%{tde_bindir}/dcopserver
+%{tde_bindir}/dcopserver_shutdown
+%{tde_bindir}/dcopstart
+%{tde_bindir}/filesharelist
+%{tde_bindir}/fileshareset
+%{tde_bindir}/imagetops
+%{tde_bindir}/kab2kabc
+%{tde_bindir}/kaddprinterwizard
+%{tde_bindir}/kbuildsycoca
+%{tde_bindir}/kcmshell
+%{tde_bindir}/kconf_update
+%{tde_bindir}/kcookiejar
+%{tde_bindir}/kde-config
+%{tde_bindir}/kde-menu
+%{tde_bindir}/kded
+%{tde_bindir}/kdeinit
+%{tde_bindir}/kdeinit_shutdown
+%{tde_bindir}/kdeinit_wrapper
+%{tde_bindir}/kdesu_stub
+%{tde_bindir}/kdontchangethehostname
+%{tde_bindir}/kdostartupconfig
+%{tde_bindir}/kfile
+%{tde_bindir}/kfmexec
+%{tde_bindir}/khotnewstuff
+%{tde_bindir}/kinstalltheme
+%{tde_bindir}/kio_http_cache_cleaner
+%{tde_bindir}/kio_uiserver
+%{tde_bindir}/kioexec
+%{tde_bindir}/kioslave
+%{tde_bindir}/klauncher
+%{tde_bindir}/kmailservice
+%{tde_bindir}/kmimelist
+%attr(4755,root,root) %{tde_bindir}/kpac_dhcp_helper
+%{tde_bindir}/ksendbugmail
+%{tde_bindir}/kshell
+%{tde_bindir}/kstartupconfig
+%{tde_bindir}/ktelnetservice
+%{tde_bindir}/ktradertest
+%{tde_bindir}/kwrapper
+%{tde_bindir}/lnusertemp
+%{tde_bindir}/make_driver_db_cups
+%{tde_bindir}/make_driver_db_lpr
+%{tde_bindir}/meinproc
+%{tde_bindir}/networkstatustestservice
+%{tde_bindir}/start_kdeinit
+%{tde_bindir}/start_kdeinit_wrapper
+%attr(4755,root,root) %{tde_bindir}/kgrantpty
+%{tde_tdelibdir}/*
+%{tde_libdir}/lib*.so.*
+%{tde_libdir}/lib[kt]deinit_*.la
+%{tde_libdir}/lib[kt]deinit_*.so
+%{tde_datadir}/applications/kde/*.desktop
+%{tde_datadir}/autostart/kab2kabc.desktop
+%{tde_datadir}/applnk/kio_iso.desktop
+%{tde_datadir}/apps/*
+%exclude %{tde_datadir}/apps/ksgmltools2/
+%config(noreplace) %{tde_datadir}/config/*
+%{tde_datadir}/emoticons/*
+%{tde_datadir}/icons/default.kde
+%{tde_datadir}/mimelnk/magic
+%{tde_datadir}/mimelnk/*/*.desktop
+%{tde_datadir}/services/*
+%{tde_datadir}/servicetypes/*
+%{tde_datadir}/icons/crystalsvg/
+%{tde_tdedocdir}/HTML/en/kspell/
 # remove conflicts with kdelibs-4
 %if "%{?_prefix}" != "/usr"
-%{_bindir}/checkXML
-%{_bindir}/ksvgtopng
-%{_bindir}/kunittestmodrunner
-%{_bindir}/preparetips
-%{_datadir}/icons/hicolor/index.theme
-%{_datadir}/locale/all_languages
-%{tde_docdir}/HTML/en/common/*
+%{tde_bindir}/checkXML
+%{tde_bindir}/ksvgtopng
+%{tde_bindir}/kunittestmodrunner
+%{tde_bindir}/preparetips
+%{tde_datadir}/icons/hicolor/index.theme
+%{tde_datadir}/locale/all_languages
+%{tde_tdedocdir}/HTML/en/common/*
 %{_sysconfdir}/ld.so.conf.d/trinity.conf
 %else
-%exclude %{_bindir}/checkXML
-%exclude %{_bindir}/ksvgtopng
-%exclude %{_bindir}/kunittestmodrunner
-%exclude %{_bindir}/preparetips
-%exclude %{_datadir}/config/colors
-%exclude %{_datadir}/config/kdebug.areas
-%exclude %{_datadir}/config/kdebugrc
-%exclude %{_datadir}/config/ksslcalist
-%exclude %{_datadir}/config/ui/ui_standards.rc
-%exclude %{_datadir}/icons/hicolor/index.theme
-%exclude %{_datadir}/locale/all_languages
-%exclude %{tde_docdir}/HTML/en/common/*
+%exclude %{tde_bindir}/checkXML
+%exclude %{tde_bindir}/ksvgtopng
+%exclude %{tde_bindir}/kunittestmodrunner
+%exclude %{tde_bindir}/preparetips
+%exclude %{tde_datadir}/config/colors
+%exclude %{tde_datadir}/config/kdebug.areas
+%exclude %{tde_datadir}/config/kdebugrc
+%exclude %{tde_datadir}/config/ksslcalist
+%exclude %{tde_datadir}/config/ui/ui_standards.rc
+%exclude %{tde_datadir}/icons/hicolor/index.theme
+%exclude %{tde_datadir}/locale/all_languages
+%exclude %{tde_tdedocdir}/HTML/en/common/*
 %endif
 
 # Avoid conflict with 'redhat-menus' package
@@ -222,11 +247,13 @@ kimgio (image manipulation).
 %endif
 
 # New in TDE 3.5.13
-%{_bindir}/kdetcompmgr
+%{tde_bindir}/kdetcompmgr
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig || :
 
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig || :
 
 ##########
 
@@ -246,40 +273,25 @@ applications for TDE.
 
 %files devel
 %defattr(-,root,root,-)
-%{_bindir}/dcopidl*
-%{_bindir}/kconfig_compiler
-%{_bindir}/makekdewidgets
-%{_datadir}/apps/ksgmltools2/
-%{_includedir}/*
-%{_libdir}/*.la
-%{_libdir}/*.so
-%{_libdir}/*.a
-%exclude %{_libdir}/libkdeinit_*.la
-%exclude %{_libdir}/libkdeinit_*.so
+%{tde_bindir}/dcopidl*
+%{tde_bindir}/kconfig_compiler
+%{tde_bindir}/makekdewidgets
+%{tde_datadir}/apps/ksgmltools2/
+%{tde_includedir}/*
+%{tde_libdir}/*.la
+%{tde_libdir}/*.so
+%{tde_libdir}/*.a
+%exclude %{tde_libdir}/libkdeinit_*.la
+%exclude %{tde_libdir}/libkdeinit_*.so
 
 # New in TDE 3.5.13
-%{_datadir}/cmake/kdelibs.cmake
+%{tde_datadir}/cmake/kdelibs.cmake
 
-%post devel -p /sbin/ldconfig
+%post devel
+/sbin/ldconfig || :
 
-%postun devel -p /sbin/ldconfig
-
-##########
-
-%if 0
-%package apidocs
-Group:		Development/Libraries
-Summary:	%{name} - API documentation
-Requires:	%{name} = %{version}-%{release}
-
-%description apidocs
-This package includes the TDE API documentation in HTML
-format for easy browsing
-
-%files apidocs
-%defattr(-,root,root,-)
-#%{tde_docdir}/HTML/en/kdelibs*
-%endif
+%postun devel
+/sbin/ldconfig || :
 
 ##########
 
@@ -304,18 +316,33 @@ format for easy browsing
 %patch26 -p1
 %patch27 -p1
 %patch28 -p1
+%patch29 -p1
+%patch30 -p1
+%patch31 -p1
+%patch32 -p1
+%patch33 -p1
+%patch34 -p1
 
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
-export PATH="%{_bindir}:${PATH}"
-export LD_LIBRARY_PATH="%{_libdir}"
-export PKG_CONFIG_PATH="%{_libdir}/pkgconfig"
-export CMAKE_INCLUDE_PATH="%{_includedir}:%{_includedir}/tqt"
+export PATH="%{tde_bindir}:${QTDIR}/bin:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
 
-%__mkdir build
-cd build
+# We need LD_LIBRARY_PATH here because ld.so.conf file has not been written yet
+export LD_LIBRARY_PATH="%{tde_libdir}"
+
+
+%{?!mgaversion:%__mkdir build; cd build}
 %cmake \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DDOC_INSTALL_DIR=%{tde_docdir} \
+  -DINCLUDE_INSTALL_DIR=%{tde_includedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DPKGCONFIG_INSTALL_DIR=%{tde_libdir}/pkgconfig \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  -DCMAKE_SKIP_RPATH="OFF" \
   -DWITH_ARTS=ON \
   -DWITH_ALSA=ON \
   -DWITH_LIBART=ON \
@@ -345,7 +372,7 @@ cd build
 %if "%{?_prefix}" != "/usr"
 %__mkdir_p %{?buildroot}%{_sysconfdir}/ld.so.conf.d
 cat <<EOF >%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf
-%{_libdir}
+%{tde_libdir}
 EOF
 %endif
 
@@ -365,6 +392,13 @@ EOF
 
 
 %changelog
+* Sun Jul 22 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-11
+- Fix iso kioslave not parsing large images properly [Commit #b4bba7b5]
+- Add ability to set KLed off color [Commit #513ffc6e]
+- Fix spinbox text entry when base is not 10 [Commit #d1c71f69]
+- Update iso kioslave to better handle large images [Commit #dca4c677]
+- Restore tdesu dialog "Keep password" check box default to disabled/unchecked. [Commit #87363770]
+
 * Tue Jun 26 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-10
 - Renames to 'trinity-tdelibs'
 - Enable 'aspell', 'hspell' and 'libidn'
diff --git a/redhat/kdemultimedia/kdemultimedia-3.5.13-fix_autostart_again.patch b/redhat/kdemultimedia/kdemultimedia-3.5.13-fix_autostart_again.patch
new file mode 100644
index 000000000..75fdf0610
--- /dev/null
+++ b/redhat/kdemultimedia/kdemultimedia-3.5.13-fix_autostart_again.patch
@@ -0,0 +1,31 @@
+commit 7eb7626c8a6d819c040cd9aba0b0bca3b484fde7
+Author: Darrell Anderson <humanreadable@yahoo.com>
+Date:   1337622268 -0500
+
+    Reverse patch from GIT hash 2cc2e3a2.
+
+diff --git a/kmix/CMakeLists.txt b/kmix/CMakeLists.txt
+index 237c95d..a8a419f 100644
+--- a/kmix/CMakeLists.txt
++++ b/kmix/CMakeLists.txt
+@@ -26,7 +26,6 @@ link_directories(
+ ##### other data ################################
+ 
+ install( FILES kmix.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+-install( FILES kmix.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
+ install( FILES kmixui.rc DESTINATION ${DATA_INSTALL_DIR}/kmix )
+ install( FILES restore_kmix_volumes.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
+ install( FILES kmixapplet.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/applets )
+diff --git a/kmix/Makefile.am b/kmix/Makefile.am
+index d2da702..5051363 100644
+--- a/kmix/Makefile.am
++++ b/kmix/Makefile.am
+@@ -49,7 +49,7 @@ xdg_apps_DATA = kmix.desktop
+ rcdir = $(kde_datadir)/kmix
+ rc_DATA = kmixui.rc
+ 
+-autostart_DATA = kmix.desktop restore_kmix_volumes.desktop
++autostart_DATA = restore_kmix_volumes.desktop
+ autostartdir = $(datadir)/autostart
+ 
+ lnkdir = $(kde_datadir)/kicker/applets
diff --git a/redhat/kdemultimedia/kdemultimedia-3.5.13-missing_ldflags.patch b/redhat/kdemultimedia/kdemultimedia-3.5.13-missing_ldflags.patch
new file mode 100644
index 000000000..20770d670
--- /dev/null
+++ b/redhat/kdemultimedia/kdemultimedia-3.5.13-missing_ldflags.patch
@@ -0,0 +1,133 @@
+--- kdemultimedia/arts/runtime/Makefile.am.ORI	2012-07-31 13:56:06.508165053 +0200
++++ kdemultimedia/arts/runtime/Makefile.am	2012-07-31 13:57:03.018059604 +0200
+@@ -11,7 +11,7 @@
+   structurebuilder_impl.cc structures_impl.cc moduleinfo.cc \
+   compatibility.cc localfactory_impl.cc artsbuilderloader_impl.cc
+ 
+-libartsbuilder_la_LIBADD = -lmcop -lartsflow $(LIBDL)
++libartsbuilder_la_LIBADD = -lmcop -lartsflow -lartsflow_idl $(LIBDL)
+ libartsbuilder_la_COMPILE_FIRST = artsbuilder.h
+ libartsbuilder_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) \
+   -no-undefined
+--- kdemultimedia/arts/gui/kde/Makefile.am.ORI	2012-07-31 14:06:50.128691312 +0200
++++ kdemultimedia/arts/gui/kde/Makefile.am	2012-07-31 14:07:00.431493289 +0200
+@@ -15,7 +15,7 @@
+   klevelmeter_normalbars.cpp klevelmeter_firebars.cpp \
+   ktickmarks_impl.cpp kvolumefader_impl.cpp klabel_impl.cpp
+ 
+-libartsgui_kde_la_LIBADD = $(LIB_KIO) -lkdecore -lkdeui \
++libartsgui_kde_la_LIBADD = $(LIB_KIO) -lkdecore -lkdeui -lkdefx -lqt-mt \
+   $(top_builddir)/arts/gui/common/libartsgui_idl.la
+ libartsgui_kde_la_LDFLAGS = $(all_libraries) -no-undefined
+ libartsgui_kde_la_COMPILE_FIRST = ../common/artsgui.h
+--- kdemultimedia/arts/modules/synth/Makefile.am.ORI	2012-07-31 12:30:46.465821368 +0000
++++ kdemultimedia/arts/modules/synth/Makefile.am	2012-07-31 12:32:09.287170210 +0000
+@@ -31,7 +31,7 @@
+ libartsmodulessynth_la_LIBADD = \
+ 	$(top_builddir)/arts/runtime/libartsbuilder.la \
+ 	$(top_builddir)/arts/midi/libartsmidi_idl.la \
+-	-lartsflow -lartsgsl -lartsflow_idl -lmcop
++	-lartsflow -lartsgsl -lartsflow_idl -lmcop -lglib-2.0
+ 
+ #libartsmodulessynth_la_LIBADD = $(top_builddir)/arts/gui/common/libartsgui_idl.la $(top_builddir)/arts/midi/libartsmidi_idl.la -lartsflow -lartsflow_idl -lmcop $(LIBDL) $(LIB_KDEUI) $(LIB_KDECORE)
+ libartsmodulessynth_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -lartsflow -lartsgsl -no-undefined
+--- kdemultimedia/arts/modules/common/Makefile.am.ORI	2012-07-31 12:36:08.682126035 +0000
++++ kdemultimedia/arts/modules/common/Makefile.am	2012-07-31 12:36:17.362939295 +0000
+@@ -25,7 +25,7 @@
+ 	$(top_builddir)/arts/gui/common/libartsgui_idl.la \
+ 	$(top_builddir)/arts/midi/libartsmidi_idl.la \
+ 	$(top_builddir)/arts/modules/synth/libartsmodulessynth.la \
+-	-lartsflow -lartsflow_idl -lmcop $(LIB_KDECORE)
++	-lartsflow -lartsflow_idl -lmcop $(LIB_KDECORE) -lqt-mt -lvorbisfile
+ 
+ libartsmodulescommon_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -no-undefined
+ 
+--- kdemultimedia/juk/Makefile.am.ORI	2012-07-31 14:39:39.222531330 +0200
++++ kdemultimedia/juk/Makefile.am	2012-07-31 14:40:03.805986466 +0200
+@@ -85,7 +85,7 @@
+ ##################################################
+ 
+ juk_LDADD = -lm $(LDADD_GST) $(mblibs) $(LIB_KIO) $(taglib_libs) $(akode_libs) $(LIB_KHTML) $(LIB_ARTS)
+-juk_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LDFLAGS_GST) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl
++juk_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LDFLAGS_GST) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -lakode
+ 
+ KDE_CXXFLAGS = $(USE_EXCEPTIONS)
+ 
+--- kdemultimedia/kmid/Makefile.am.ORI	2012-07-31 14:42:26.666868929 +0200
++++ kdemultimedia/kmid/Makefile.am	2012-07-31 14:43:01.345123193 +0200
+@@ -4,7 +4,7 @@
+ lib_LTLIBRARIES = libkmidlib.la
+ 
+ libkmidlib_la_LDFLAGS = $(all_libraries)
+-libkmidlib_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KIO) -lkmid
++libkmidlib_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KIO) -lkmid -lqt-mt -lkdeui -lDCOP -lkdecore
+ 
+ libkmidpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+ libkmidpart_la_LIBADD = libkmidlib.la
+--- kdemultimedia/kmix/Makefile.am.ORI	2012-07-31 14:45:49.958546243 +0200
++++ kdemultimedia/kmix/Makefile.am	2012-07-31 14:47:51.780002978 +0200
+@@ -25,13 +25,13 @@
+ 	volume.cpp kledbutton.cpp verticaltext.cpp mixerIface.skel \
+ 	kmixtoolbox.cpp mixertoolbox.cpp dialogviewconfiguration.cpp KMixApp.cpp dialogselectmaster.cpp
+ 
+-kmix_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND)
++kmix_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) -lqt-mt -lkdecore -lDCOP
+ kmix_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -avoid-version
+ 
+ kmixctrl_la_SOURCES = kmixctrl.cpp mixer.cpp mixset.cpp mixdevice.cpp volume.cpp mixerIface.skel \
+ 	mixertoolbox.cpp mixer_backend.cpp
+ 
+-kmixctrl_la_LIBADD = $(LIB_KDECORE) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND)
++kmixctrl_la_LIBADD = $(LIB_KDECORE) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) -lqt-mt -lDCOP
+ kmixctrl_la_LDFLAGS = $(all_libraries) -module -avoid-version
+ 
+ kmix_panelapplet_la_SOURCES = kmixapplet.cpp \
+--- kdemultimedia/libkcddb/Makefile.am.ORI	2012-07-31 14:54:00.740438712 +0200
++++ kdemultimedia/libkcddb/Makefile.am	2012-07-31 14:54:14.899151410 +0200
+@@ -14,7 +14,7 @@
+     cdinfoencodingwidget.cpp cdinfoencodingwidgetbase.ui
+ 
+ libkcddb_la_LDFLAGS = $(all_libraries) -version-info 1:0:0
+-libkcddb_la_LIBADD  = $(LIB_KDECORE) $(LIB_KIO)
++libkcddb_la_LIBADD  = $(LIB_KDECORE) $(LIB_KIO) -lqt-mt -lkdeui
+ 
+ METASOURCES = AUTO
+ 
+--- kdemultimedia/noatun/library/noatunarts/Makefile.am.ORI	2012-07-31 15:07:07.507909928 +0200
++++ kdemultimedia/noatun/library/noatunarts/Makefile.am	2012-07-31 15:07:17.378685278 +0200
+@@ -7,7 +7,7 @@
+                            StereoVolumeControl_impl.cpp Session_impl.cpp
+ libnoatunarts_la_COMPILE_FIRST = noatunarts.h
+ libnoatunarts_la_LDFLAGS = $(all_libraries) -avoid-version -no-undefined
+-libnoatunarts_la_LIBADD =  -lkmedia2_idl -lsoundserver_idl -lartsflow
++libnoatunarts_la_LIBADD =  -lkmedia2_idl -lsoundserver_idl -lartsflow -lmcop -lartsflow_idl
+ libnoatunarts_la_METASOURCES = AUTO
+ 
+ noatunarts.mcoptype: noatunarts.h
+--- kdemultimedia/noatun/library/Makefile.am.ftbfs	2011-10-28 21:13:18.000000000 +0200
++++ kdemultimedia/noatun/library/Makefile.am	2012-07-31 15:20:52.961371759 +0200
+@@ -30,11 +30,11 @@
+ libnoatun_la_LIBADD      = $(top_builddir)/arts/gui/common/libartsgui.la \
+ 	$(top_builddir)/arts/gui/kde/libartsgui_kde.la $(top_builddir)/arts/modules/libartsmodules.la \
+ 	-lkio -lqtmcop -lkmedia2_idl $(top_builddir)/noatun/library/noatunarts/libnoatunarts.la \
+-	-lartsflow -lsoundserver_idl -lartskde $(LIBDL)
++	-lartsflow -lsoundserver_idl -lartskde $(LIBDL) -lqt-mt -lDCOP
+ 
+ libnoatuncontrols_la_SOURCES = controls.cpp scrollinglabel.cpp
+ libnoatuncontrols_la_LDFLAGS = -version-info 3:0:2 $(KDE_RPATH) $(all_libraries) -no-undefined
+-libnoatuncontrols_la_LIBADD  = $(LIBDL) $(LIB_KDEUI)
++libnoatuncontrols_la_LIBADD  = $(LIBDL) $(LIB_KDEUI) -lqt-mt -lkdecore
+ 
+ METASOURCES = AUTO
+ META_INCLUDES = $(srcdir)/noatun
+--- kdemultimedia/noatun/modules/winskin/vis/Makefile.am.ORI	2012-07-31 15:26:20.619544165 +0200
++++ kdemultimedia/noatun/modules/winskin/vis/Makefile.am	2012-07-31 15:26:33.802272534 +0200
+@@ -17,7 +17,7 @@
+ libwinskinvis_la_LDFLAGS=	$(all_libraries) -avoid-version \
+ 				-no-undefined
+ 
+-libwinskinvis_la_LIBADD =	-lkmedia2_idl -lsoundserver_idl -lartsflow
++libwinskinvis_la_LIBADD =	-lkmedia2_idl -lsoundserver_idl -lartsflow -lartsflow_idl -lmcop
+ libwinskinvis_la_COMPILE_FIRST = winskinvis.cc
+ libwinskinvis_la_METASOURCES =	AUTO
+ 
diff --git a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec
index 38a445109..85966f4e3 100644
--- a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec
+++ b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec
@@ -1,14 +1,21 @@
 # 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
-%define tde_appdir %{_datadir}/applications/kde
-%define tde_docdir %{_docdir}
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%define tde_bindir %{_prefix}/bin
+%define tde_datadir %{_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{_prefix}/include
+%define tde_libdir %{_prefix}/%{_lib}
+
+%define tde_tdeappdir %{tde_datadir}/applications/kde
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_docdir}
 
 # former extras bits
 %define _with_akode --with-akode
@@ -42,8 +49,11 @@ Provides: kdemultimedia3 = %{version}-%{release}
 %endif
 
 # RedHat Legacy patches (from Fedora 8)
-Patch3: kdemultimedia-3.4.0-xdg.patch
-Patch5: kdemultimedia-3.5.7-pthread.patch
+Patch3:		kdemultimedia-3.4.0-xdg.patch
+Patch5:		kdemultimedia-3.5.7-pthread.patch
+
+# Missing LDFLAGS on Mageia cause FTBFS
+Patch1:		kdemultimedia-3.5.13-missing_ldflags.patch
 
 # [kdemultimedia] Fix MMX detection [Bug #800]
 Patch10:	kdemultimedia-3.5.13-fix_mmx_detection.patch
@@ -73,18 +83,30 @@ BuildRequires: libvorbis-devel
 BuildRequires: audiofile-devel
 BuildRequires: desktop-file-utils
 BuildRequires: libtheora-devel
-BuildRequires: flac-devel
 BuildRequires: alsa-lib-devel 
-BuildRequires: cdparanoia-devel cdparanoia
-BuildRequires: gstreamer-devel
 BuildRequires: automake libtool
 %{?_with_akode:BuildRequires: trinity-akode-devel}
 %{?_with_musicbrainz:BuildRequires: libmusicbrainz-devel libtunepimp-devel}
 %{?_with_taglib:BuildRequires: taglib-devel}
+BuildRequires:	cdparanoia
+
+%if 0%{?mgaversion}
+BuildRequires:	%{_lib}gstreamer0.10-devel
+BuildRequires:	%{_lib}flac-devel
+%{?_with_xine:BuildRequires: %{_lib}xine-devel}
+BuildRequires:	%{_lib}xxf86dga-devel
+BuildRequires:	%{_lib}xxf86vm-devel
+BuildRequires:	%{_lib}xtst-devel
+BuildRequires:	libcdda-devel
+%else
+BuildRequires: gstreamer-devel
+BuildRequires: flac-devel
+BuildRequires: cdparanoia-devel
 %{?_with_xine:BuildRequires: xine-lib-devel}
 BuildRequires:	libXxf86dga-devel
 BuildRequires:	libXxf86vm-devel
 BuildRequires:	libXt-devel
+%endif
 
 Requires: trinity-artsbuilder = %{version}-%{release}
 Requires: trinity-juk = %{version}-%{release}
@@ -133,174 +155,175 @@ Group:		Applications/Multimedia
 This is the analog Realtime synthesizer's graphical design tool.
 
 %files -n trinity-artsbuilder
-%{_bindir}/artsbuilder
-%{_bindir}/artscontrol
-%{_bindir}/midisend
-%{_libdir}/libartsbuilder.la
-%{_libdir}/libartsbuilder.so.*
-%{_libdir}/libartscontrolapplet.la
-%{_libdir}/libartscontrolapplet.so.*
-%{_libdir}/libartscontrolsupport.la
-%{_libdir}/libartscontrolsupport.so.*
-%{_libdir}/libartsgui_idl.la
-%{_libdir}/libartsgui_idl.so.*
-%{_libdir}/libartsgui_kde.la
-%{_libdir}/libartsgui_kde.so.*
-%{_libdir}/libartsgui.la
-%{_libdir}/libartsgui.so.*
-%{_libdir}/libartsmidi_idl.la
-%{_libdir}/libartsmidi_idl.so.*
-%{_libdir}/libartsmidi.la
-%{_libdir}/libartsmidi.so.*
-%{_libdir}/libartsmodulescommon.la
-%{_libdir}/libartsmodulescommon.so.*
-%{_libdir}/libartsmoduleseffects.la
-%{_libdir}/libartsmoduleseffects.so.*
-%{_libdir}/libartsmodulesmixers.la
-%{_libdir}/libartsmodulesmixers.so.*
-%{_libdir}/libartsmodules.la
-%{_libdir}/libartsmodules.so.*
-%{_libdir}/libartsmodulessynth.la
-%{_libdir}/libartsmodulessynth.so.*
-%{_libdir}/mcop/Arts/ArtsBuilderLoader.mcopclass
-%{_libdir}/mcop/artsbuilder.mcopclass
-%{_libdir}/mcop/artsbuilder.mcoptype
-%{_libdir}/mcop/Arts/Button.mcopclass
-%{_libdir}/mcop/Arts/EffectRackGuiFactory.mcopclass
-%{_libdir}/mcop/Arts/Effect_WAVECAPTURE.mcopclass
-%{_libdir}/mcop/Arts/Environment/Container.mcopclass
-%{_libdir}/mcop/Arts/Environment/EffectRackItem.mcopclass
-%{_libdir}/mcop/Arts/Environment/InstrumentItemGuiFactory.mcopclass
-%{_libdir}/mcop/Arts/Environment/InstrumentItem.mcopclass
-%{_libdir}/mcop/Arts/Environment/MixerItem.mcopclass
-%{_libdir}/mcop/Arts/Fader.mcopclass
-%{_libdir}/mcop/Arts/FiveBandMonoComplexEQGuiFactory.mcopclass
-%{_libdir}/mcop/Arts/FiveBandMonoComplexEQ.mcopclass
-%{_libdir}/mcop/Arts/FreeverbGuiFactory.mcopclass
-%{_libdir}/mcop/Arts/GenericGuiFactory.mcopclass
-%{_libdir}/mcop/Arts/GraphLine.mcopclass
-%{_libdir}/mcop/artsgui.mcopclass
-%{_libdir}/mcop/artsgui.mcoptype
-%{_libdir}/mcop/Arts/HBox.mcopclass
-%{_libdir}/mcop/Arts/Label.mcopclass
-%{_libdir}/mcop/Arts/LayoutBox.mcopclass
-%{_libdir}/mcop/Arts/LevelMeter.mcopclass
-%{_libdir}/mcop/Arts/LineEdit.mcopclass
-%{_libdir}/mcop/Arts/LittleStereoMixerChannelGuiFactory.mcopclass
-%{_libdir}/mcop/Arts/LittleStereoMixerChannel.mcopclass
-%{_libdir}/mcop/Arts/LocalFactory.mcopclass
-%{_libdir}/mcop/Arts/MidiManager.mcopclass
-%{_libdir}/mcop/artsmidi.mcopclass
-%{_libdir}/mcop/artsmidi.mcoptype
-%{_libdir}/mcop/Arts/MixerGuiFactory.mcopclass
-%{_libdir}/mcop/artsmodulescommon.mcopclass
-%{_libdir}/mcop/artsmodulescommon.mcoptype
-%{_libdir}/mcop/artsmoduleseffects.mcopclass
-%{_libdir}/mcop/artsmoduleseffects.mcoptype
-%{_libdir}/mcop/artsmodules.mcopclass
-%{_libdir}/mcop/artsmodules.mcoptype
-%{_libdir}/mcop/artsmodulesmixers.mcopclass
-%{_libdir}/mcop/artsmodulesmixers.mcoptype
-%{_libdir}/mcop/artsmodulessynth.mcopclass
-%{_libdir}/mcop/artsmodulessynth.mcoptype
-%{_libdir}/mcop/Arts/MonoSimpleMixerChannelGuiFactory.mcopclass
-%{_libdir}/mcop/Arts/MonoSimpleMixerChannel.mcopclass
-%{_libdir}/mcop/Arts/MonoToStereo.mcopclass
-%{_libdir}/mcop/Arts/PopupBox.mcopclass
-%{_libdir}/mcop/Arts/Poti.mcopclass
-%{_libdir}/mcop/Arts/SimpleMixerChannelGuiFactory.mcopclass
-%{_libdir}/mcop/Arts/SimpleMixerChannel.mcopclass
-%{_libdir}/mcop/Arts/SpinBox.mcopclass
-%{_libdir}/mcop/Arts/StereoBalanceGuiFactory.mcopclass
-%{_libdir}/mcop/Arts/StereoBalance.mcopclass
-%{_libdir}/mcop/Arts/StereoCompressorGuiFactory.mcopclass
-%{_libdir}/mcop/Arts/StereoFirEqualizerGuiFactory.mcopclass
-%{_libdir}/mcop/Arts/StereoToMono.mcopclass
-%{_libdir}/mcop/Arts/StereoVolumeControlGuiFactory.mcopclass
-%{_libdir}/mcop/Arts/StereoVolumeControlGui.mcopclass
-%{_libdir}/mcop/Arts/StructureBuilder.mcopclass
-%{_libdir}/mcop/Arts/StructureDesc.mcopclass
-%{_libdir}/mcop/Arts/Synth_ATAN_SATURATE.mcopclass
-%{_libdir}/mcop/Arts/Synth_AUTOPANNER.mcopclass
-%{_libdir}/mcop/Arts/Synth_BRICKWALL_LIMITER.mcopclass
-%{_libdir}/mcop/Arts/Synth_CAPTURE_WAV.mcopclass
-%{_libdir}/mcop/Arts/Synth_CDELAY.mcopclass
-%{_libdir}/mcop/Arts/Synth_COMPRESSOR.mcopclass
-%{_libdir}/mcop/Arts/Synth_DATA.mcopclass
-%{_libdir}/mcop/Arts/Synth_DEBUG.mcopclass
-%{_libdir}/mcop/Arts/Synth_DELAY.mcopclass
-%{_libdir}/mcop/Arts/Synth_DIV.mcopclass
-%{_libdir}/mcop/Arts/Synth_ENVELOPE_ADSR.mcopclass
-%{_libdir}/mcop/Arts/Synth_FM_SOURCE.mcopclass
-%{_libdir}/mcop/Arts/Synth_FREEVERB.mcopclass
-%{_libdir}/mcop/Arts/Synth_FX_CFLANGER.mcopclass
-%{_libdir}/mcop/Arts/Synth_MIDI_DEBUG.mcopclass
-%{_libdir}/mcop/Arts/Synth_MIDI_TEST.mcopclass
-%{_libdir}/mcop/Arts/Synth_MOOG_VCF.mcopclass
-%{_libdir}/mcop/Arts/Synth_NIL.mcopclass
-%{_libdir}/mcop/Arts/Synth_NOISE.mcopclass
-%{_libdir}/mcop/Arts/Synth_OSC.mcopclass
-%{_libdir}/mcop/Arts/Synth_PITCH_SHIFT_FFT.mcopclass
-%{_libdir}/mcop/Arts/Synth_PITCH_SHIFT.mcopclass
-%{_libdir}/mcop/Arts/Synth_PLAY_PAT.mcopclass
-%{_libdir}/mcop/Arts/Synth_PSCALE.mcopclass
-%{_libdir}/mcop/Arts/Synth_RC.mcopclass
-%{_libdir}/mcop/Arts/Synth_SEQUENCE_FREQ.mcopclass
-%{_libdir}/mcop/Arts/Synth_SEQUENCE.mcopclass
-%{_libdir}/mcop/Arts/Synth_SHELVE_CUTOFF.mcopclass
-%{_libdir}/mcop/Arts/Synth_STD_EQUALIZER.mcopclass
-%{_libdir}/mcop/Arts/Synth_STEREO_COMPRESSOR.mcopclass
-%{_libdir}/mcop/Arts/Synth_STEREO_FIR_EQUALIZER.mcopclass
-%{_libdir}/mcop/Arts/Synth_STEREO_PITCH_SHIFT_FFT.mcopclass
-%{_libdir}/mcop/Arts/Synth_STEREO_PITCH_SHIFT.mcopclass
-%{_libdir}/mcop/Arts/Synth_TREMOLO.mcopclass
-%{_libdir}/mcop/Arts/Synth_VOICE_REMOVAL.mcopclass
-%{_libdir}/mcop/Arts/Synth_WAVE_PULSE.mcopclass
-%{_libdir}/mcop/Arts/Synth_WAVE_SOFTSAW.mcopclass
-%{_libdir}/mcop/Arts/Synth_WAVE_SQUARE.mcopclass
-%{_libdir}/mcop/Arts/Synth_WAVE_TRI.mcopclass
-%{_libdir}/mcop/Arts/Synth_XFADE.mcopclass
-%{_libdir}/mcop/Arts/VBox.mcopclass
-%{_libdir}/mcop/Arts/VoiceRemovalGuiFactory.mcopclass
-%{_libdir}/mcop/Arts/Widget.mcopclass
-%{tde_appdir}/artsbuilder.desktop
-%{tde_appdir}/artscontrol.desktop
-%{_datadir}/apps/artsbuilder/
-%{_datadir}/apps/artscontrol/
-%{_datadir}/apps/kicker/applets/artscontrolapplet.desktop
-%{_datadir}/icons/crystalsvg/*/actions/artsaudiomanager.png
-%{_datadir}/icons/crystalsvg/*/actions/artsbuilderexecute.png
-%{_datadir}/icons/crystalsvg/*/actions/artsenvironment.png
-%{_datadir}/icons/crystalsvg/*/actions/artsfftscope.png
-%{_datadir}/icons/crystalsvg/*/actions/artsmediatypes.png
-%{_datadir}/icons/crystalsvg/*/actions/artsmidimanager.png
-%{_datadir}/icons/crystalsvg/scalable/actions/artsaudiomanager.svgz
-%{_datadir}/icons/crystalsvg/scalable/actions/artsenvironment.svgz
-%{_datadir}/icons/crystalsvg/scalable/actions/artsfftscope.svgz
-%{_datadir}/icons/crystalsvg/scalable/actions/artsmediatypes.svgz
-%{_datadir}/icons/crystalsvg/scalable/actions/artsmidimanager.svgz
-%{_datadir}/icons/hicolor/*/apps/artsbuilder.png
-%{_datadir}/icons/hicolor/*/apps/artscontrol.png
-%{_datadir}/icons/hicolor/scalable/apps/artsbuilder.svgz
-%{_datadir}/icons/hicolor/scalable/apps/artscontrol.svgz
-%{_datadir}/mimelnk/application/x-artsbuilder.desktop
-%{tde_docdir}/HTML/en/artsbuilder/
+%defattr(-,root,root,-)
+%{tde_bindir}/artsbuilder
+%{tde_bindir}/artscontrol
+%{tde_bindir}/midisend
+%{tde_libdir}/libartsbuilder.la
+%{tde_libdir}/libartsbuilder.so.*
+%{tde_libdir}/libartscontrolapplet.la
+%{tde_libdir}/libartscontrolapplet.so.*
+%{tde_libdir}/libartscontrolsupport.la
+%{tde_libdir}/libartscontrolsupport.so.*
+%{tde_libdir}/libartsgui_idl.la
+%{tde_libdir}/libartsgui_idl.so.*
+%{tde_libdir}/libartsgui_kde.la
+%{tde_libdir}/libartsgui_kde.so.*
+%{tde_libdir}/libartsgui.la
+%{tde_libdir}/libartsgui.so.*
+%{tde_libdir}/libartsmidi_idl.la
+%{tde_libdir}/libartsmidi_idl.so.*
+%{tde_libdir}/libartsmidi.la
+%{tde_libdir}/libartsmidi.so.*
+%{tde_libdir}/libartsmodulescommon.la
+%{tde_libdir}/libartsmodulescommon.so.*
+%{tde_libdir}/libartsmoduleseffects.la
+%{tde_libdir}/libartsmoduleseffects.so.*
+%{tde_libdir}/libartsmodulesmixers.la
+%{tde_libdir}/libartsmodulesmixers.so.*
+%{tde_libdir}/libartsmodules.la
+%{tde_libdir}/libartsmodules.so.*
+%{tde_libdir}/libartsmodulessynth.la
+%{tde_libdir}/libartsmodulessynth.so.*
+%{tde_libdir}/mcop/Arts/ArtsBuilderLoader.mcopclass
+%{tde_libdir}/mcop/artsbuilder.mcopclass
+%{tde_libdir}/mcop/artsbuilder.mcoptype
+%{tde_libdir}/mcop/Arts/Button.mcopclass
+%{tde_libdir}/mcop/Arts/EffectRackGuiFactory.mcopclass
+%{tde_libdir}/mcop/Arts/Effect_WAVECAPTURE.mcopclass
+%{tde_libdir}/mcop/Arts/Environment/Container.mcopclass
+%{tde_libdir}/mcop/Arts/Environment/EffectRackItem.mcopclass
+%{tde_libdir}/mcop/Arts/Environment/InstrumentItemGuiFactory.mcopclass
+%{tde_libdir}/mcop/Arts/Environment/InstrumentItem.mcopclass
+%{tde_libdir}/mcop/Arts/Environment/MixerItem.mcopclass
+%{tde_libdir}/mcop/Arts/Fader.mcopclass
+%{tde_libdir}/mcop/Arts/FiveBandMonoComplexEQGuiFactory.mcopclass
+%{tde_libdir}/mcop/Arts/FiveBandMonoComplexEQ.mcopclass
+%{tde_libdir}/mcop/Arts/FreeverbGuiFactory.mcopclass
+%{tde_libdir}/mcop/Arts/GenericGuiFactory.mcopclass
+%{tde_libdir}/mcop/Arts/GraphLine.mcopclass
+%{tde_libdir}/mcop/artsgui.mcopclass
+%{tde_libdir}/mcop/artsgui.mcoptype
+%{tde_libdir}/mcop/Arts/HBox.mcopclass
+%{tde_libdir}/mcop/Arts/Label.mcopclass
+%{tde_libdir}/mcop/Arts/LayoutBox.mcopclass
+%{tde_libdir}/mcop/Arts/LevelMeter.mcopclass
+%{tde_libdir}/mcop/Arts/LineEdit.mcopclass
+%{tde_libdir}/mcop/Arts/LittleStereoMixerChannelGuiFactory.mcopclass
+%{tde_libdir}/mcop/Arts/LittleStereoMixerChannel.mcopclass
+%{tde_libdir}/mcop/Arts/LocalFactory.mcopclass
+%{tde_libdir}/mcop/Arts/MidiManager.mcopclass
+%{tde_libdir}/mcop/artsmidi.mcopclass
+%{tde_libdir}/mcop/artsmidi.mcoptype
+%{tde_libdir}/mcop/Arts/MixerGuiFactory.mcopclass
+%{tde_libdir}/mcop/artsmodulescommon.mcopclass
+%{tde_libdir}/mcop/artsmodulescommon.mcoptype
+%{tde_libdir}/mcop/artsmoduleseffects.mcopclass
+%{tde_libdir}/mcop/artsmoduleseffects.mcoptype
+%{tde_libdir}/mcop/artsmodules.mcopclass
+%{tde_libdir}/mcop/artsmodules.mcoptype
+%{tde_libdir}/mcop/artsmodulesmixers.mcopclass
+%{tde_libdir}/mcop/artsmodulesmixers.mcoptype
+%{tde_libdir}/mcop/artsmodulessynth.mcopclass
+%{tde_libdir}/mcop/artsmodulessynth.mcoptype
+%{tde_libdir}/mcop/Arts/MonoSimpleMixerChannelGuiFactory.mcopclass
+%{tde_libdir}/mcop/Arts/MonoSimpleMixerChannel.mcopclass
+%{tde_libdir}/mcop/Arts/MonoToStereo.mcopclass
+%{tde_libdir}/mcop/Arts/PopupBox.mcopclass
+%{tde_libdir}/mcop/Arts/Poti.mcopclass
+%{tde_libdir}/mcop/Arts/SimpleMixerChannelGuiFactory.mcopclass
+%{tde_libdir}/mcop/Arts/SimpleMixerChannel.mcopclass
+%{tde_libdir}/mcop/Arts/SpinBox.mcopclass
+%{tde_libdir}/mcop/Arts/StereoBalanceGuiFactory.mcopclass
+%{tde_libdir}/mcop/Arts/StereoBalance.mcopclass
+%{tde_libdir}/mcop/Arts/StereoCompressorGuiFactory.mcopclass
+%{tde_libdir}/mcop/Arts/StereoFirEqualizerGuiFactory.mcopclass
+%{tde_libdir}/mcop/Arts/StereoToMono.mcopclass
+%{tde_libdir}/mcop/Arts/StereoVolumeControlGuiFactory.mcopclass
+%{tde_libdir}/mcop/Arts/StereoVolumeControlGui.mcopclass
+%{tde_libdir}/mcop/Arts/StructureBuilder.mcopclass
+%{tde_libdir}/mcop/Arts/StructureDesc.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_ATAN_SATURATE.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_AUTOPANNER.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_BRICKWALL_LIMITER.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_CAPTURE_WAV.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_CDELAY.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_COMPRESSOR.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_DATA.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_DEBUG.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_DELAY.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_DIV.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_ENVELOPE_ADSR.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_FM_SOURCE.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_FREEVERB.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_FX_CFLANGER.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_MIDI_DEBUG.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_MIDI_TEST.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_MOOG_VCF.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_NIL.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_NOISE.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_OSC.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_PITCH_SHIFT_FFT.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_PITCH_SHIFT.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_PLAY_PAT.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_PSCALE.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_RC.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_SEQUENCE_FREQ.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_SEQUENCE.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_SHELVE_CUTOFF.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_STD_EQUALIZER.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_STEREO_COMPRESSOR.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_STEREO_FIR_EQUALIZER.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_STEREO_PITCH_SHIFT_FFT.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_STEREO_PITCH_SHIFT.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_TREMOLO.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_VOICE_REMOVAL.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_WAVE_PULSE.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_WAVE_SOFTSAW.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_WAVE_SQUARE.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_WAVE_TRI.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_XFADE.mcopclass
+%{tde_libdir}/mcop/Arts/VBox.mcopclass
+%{tde_libdir}/mcop/Arts/VoiceRemovalGuiFactory.mcopclass
+%{tde_libdir}/mcop/Arts/Widget.mcopclass
+%{tde_tdeappdir}/artsbuilder.desktop
+%{tde_tdeappdir}/artscontrol.desktop
+%{tde_datadir}/apps/artsbuilder/
+%{tde_datadir}/apps/artscontrol/
+%{tde_datadir}/apps/kicker/applets/artscontrolapplet.desktop
+%{tde_datadir}/icons/crystalsvg/*/actions/artsaudiomanager.png
+%{tde_datadir}/icons/crystalsvg/*/actions/artsbuilderexecute.png
+%{tde_datadir}/icons/crystalsvg/*/actions/artsenvironment.png
+%{tde_datadir}/icons/crystalsvg/*/actions/artsfftscope.png
+%{tde_datadir}/icons/crystalsvg/*/actions/artsmediatypes.png
+%{tde_datadir}/icons/crystalsvg/*/actions/artsmidimanager.png
+%{tde_datadir}/icons/crystalsvg/scalable/actions/artsaudiomanager.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/actions/artsenvironment.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/actions/artsfftscope.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/actions/artsmediatypes.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/actions/artsmidimanager.svgz
+%{tde_datadir}/icons/hicolor/*/apps/artsbuilder.png
+%{tde_datadir}/icons/hicolor/*/apps/artscontrol.png
+%{tde_datadir}/icons/hicolor/scalable/apps/artsbuilder.svgz
+%{tde_datadir}/icons/hicolor/scalable/apps/artscontrol.svgz
+%{tde_datadir}/mimelnk/application/x-artsbuilder.desktop
+%{tde_tdedocdir}/HTML/en/artsbuilder/
 
 %post -n trinity-artsbuilder
 /sbin/ldconfig
 for f in crystalsvg hicolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %postun -n trinity-artsbuilder
 /sbin/ldconfig
 for f in crystalsvg hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 ##########
 
@@ -327,27 +350,28 @@ Some of JuK's features include:
   with other TDE and X apps
 
 %files -n trinity-juk
-%{_bindir}/juk
-%{tde_appdir}/juk.desktop
-%{_datadir}/apps/juk/
-%{_datadir}/apps/konqueror/servicemenus/jukservicemenu.desktop
-%{_datadir}/icons/crystalsvg/*/actions/juk_dock.png
-%{_datadir}/icons/hicolor/*/apps/juk.png
-%{tde_docdir}/HTML/en/juk/
+%defattr(-,root,root,-)
+%{tde_bindir}/juk
+%{tde_tdeappdir}/juk.desktop
+%{tde_datadir}/apps/juk/
+%{tde_datadir}/apps/konqueror/servicemenus/jukservicemenu.desktop
+%{tde_datadir}/icons/crystalsvg/*/actions/juk_dock.png
+%{tde_datadir}/icons/hicolor/*/apps/juk.png
+%{tde_tdedocdir}/HTML/en/juk/
 
 %post -n trinity-juk
 for f in crystalsvg hicolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %postun -n trinity-juk
 for f in crystalsvg hicolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 ##########
 
@@ -362,29 +386,30 @@ Kaboodle is a light, embedded media player, supporting both video and audio,
 for TDE. It uses the aRts framework for playing media files.
 
 %files -n trinity-kaboodle
-%{_bindir}/kaboodle
-%{tde_libdir}/libkaboodlepart.la
-%{tde_libdir}/libkaboodlepart.so
-%{tde_appdir}/kaboodle.desktop
-%{_datadir}/apps/kaboodle/
-%{_datadir}/icons/hicolor/*/apps/kaboodle.png
-%{_datadir}/services/kaboodle_component.desktop
-%{_datadir}/services/kaboodleengine.desktop
-%{tde_docdir}/HTML/en/kaboodle/
+%defattr(-,root,root,-)
+%{tde_bindir}/kaboodle
+%{tde_tdelibdir}/libkaboodlepart.la
+%{tde_tdelibdir}/libkaboodlepart.so
+%{tde_tdeappdir}/kaboodle.desktop
+%{tde_datadir}/apps/kaboodle/
+%{tde_datadir}/icons/hicolor/*/apps/kaboodle.png
+%{tde_datadir}/services/kaboodle_component.desktop
+%{tde_datadir}/services/kaboodleengine.desktop
+%{tde_tdedocdir}/HTML/en/kaboodle/
 
 %post -n trinity-kaboodle
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %postun -n trinity-kaboodle
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 ##########
 
@@ -402,32 +427,33 @@ keep your WAV files, or convert them to Ogg/Vorbis, MP3, or FLAC. It also
 searches CDDB to retrieve the information of the disk.
 
 %files -n trinity-kaudiocreator
-%{_bindir}/kaudiocreator
-%{tde_appdir}/kaudiocreator.desktop
-%{_datadir}/apps/kaudiocreator/
-%{_datadir}/apps/kconf_update/kaudiocreator-libkcddb.upd
-%{_datadir}/apps/kconf_update/kaudiocreator-meta.upd
-%{_datadir}/apps/kconf_update/upgrade-kaudiocreator-metadata.sh
-%{_datadir}/apps/konqueror/servicemenus/audiocd_extract.desktop
-%{_datadir}/config.kcfg/kaudiocreator.kcfg
-%{_datadir}/config.kcfg/kaudiocreator_encoders.kcfg
-%{_datadir}/icons/hicolor/*/apps/kaudiocreator.png
-%{_datadir}/icons/locolor/*/apps/kaudiocreator.png
-%{tde_docdir}/HTML/en/kaudiocreator/
+%defattr(-,root,root,-)
+%{tde_bindir}/kaudiocreator
+%{tde_tdeappdir}/kaudiocreator.desktop
+%{tde_datadir}/apps/kaudiocreator/
+%{tde_datadir}/apps/kconf_update/kaudiocreator-libkcddb.upd
+%{tde_datadir}/apps/kconf_update/kaudiocreator-meta.upd
+%{tde_datadir}/apps/kconf_update/upgrade-kaudiocreator-metadata.sh
+%{tde_datadir}/apps/konqueror/servicemenus/audiocd_extract.desktop
+%{tde_datadir}/config.kcfg/kaudiocreator.kcfg
+%{tde_datadir}/config.kcfg/kaudiocreator_encoders.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/kaudiocreator.png
+%{tde_datadir}/icons/locolor/*/apps/kaudiocreator.png
+%{tde_tdedocdir}/HTML/en/kaudiocreator/
 
 %post -n trinity-kaudiocreator
 for f in hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %postun -n trinity-kaudiocreator
 for f in hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 ##########
 
@@ -439,39 +465,40 @@ Group:		Applications/Multimedia
 au/avi/m3u/mp3/ogg/wav file metainformation plugins for Trinity.
 
 %files kfile-plugins
-%{tde_libdir}/kfile_au.la
-%{tde_libdir}/kfile_au.so
-%{tde_libdir}/kfile_avi.la
-%{tde_libdir}/kfile_avi.so
-%{tde_libdir}/kfile_flac.la
-%{tde_libdir}/kfile_flac.so
-%{tde_libdir}/kfile_m3u.la
-%{tde_libdir}/kfile_m3u.so
-%{tde_libdir}/kfile_mp3.la
-%{tde_libdir}/kfile_mp3.so
-%{tde_libdir}/kfile_mpc.la
-%{tde_libdir}/kfile_mpc.so
-%{tde_libdir}/kfile_mpeg.la
-%{tde_libdir}/kfile_mpeg.so
-%{tde_libdir}/kfile_ogg.la
-%{tde_libdir}/kfile_ogg.so
-%{tde_libdir}/kfile_sid.la
-%{tde_libdir}/kfile_sid.so
-%{tde_libdir}/kfile_theora.la
-%{tde_libdir}/kfile_theora.so
-%{tde_libdir}/kfile_wav.la
-%{tde_libdir}/kfile_wav.so
-%{_datadir}/services/kfile_au.desktop
-%{_datadir}/services/kfile_avi.desktop
-%{_datadir}/services/kfile_flac.desktop
-%{_datadir}/services/kfile_m3u.desktop
-%{_datadir}/services/kfile_mp3.desktop
-%{_datadir}/services/kfile_mpc.desktop
-%{_datadir}/services/kfile_mpeg.desktop
-%{_datadir}/services/kfile_ogg.desktop
-%{_datadir}/services/kfile_sid.desktop
-%{_datadir}/services/kfile_theora.desktop
-%{_datadir}/services/kfile_wav.desktop
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/kfile_au.la
+%{tde_tdelibdir}/kfile_au.so
+%{tde_tdelibdir}/kfile_avi.la
+%{tde_tdelibdir}/kfile_avi.so
+%{tde_tdelibdir}/kfile_flac.la
+%{tde_tdelibdir}/kfile_flac.so
+%{tde_tdelibdir}/kfile_m3u.la
+%{tde_tdelibdir}/kfile_m3u.so
+%{tde_tdelibdir}/kfile_mp3.la
+%{tde_tdelibdir}/kfile_mp3.so
+%{tde_tdelibdir}/kfile_mpc.la
+%{tde_tdelibdir}/kfile_mpc.so
+%{tde_tdelibdir}/kfile_mpeg.la
+%{tde_tdelibdir}/kfile_mpeg.so
+%{tde_tdelibdir}/kfile_ogg.la
+%{tde_tdelibdir}/kfile_ogg.so
+%{tde_tdelibdir}/kfile_sid.la
+%{tde_tdelibdir}/kfile_sid.so
+%{tde_tdelibdir}/kfile_theora.la
+%{tde_tdelibdir}/kfile_theora.so
+%{tde_tdelibdir}/kfile_wav.la
+%{tde_tdelibdir}/kfile_wav.so
+%{tde_datadir}/services/kfile_au.desktop
+%{tde_datadir}/services/kfile_avi.desktop
+%{tde_datadir}/services/kfile_flac.desktop
+%{tde_datadir}/services/kfile_m3u.desktop
+%{tde_datadir}/services/kfile_mp3.desktop
+%{tde_datadir}/services/kfile_mpc.desktop
+%{tde_datadir}/services/kfile_mpeg.desktop
+%{tde_datadir}/services/kfile_ogg.desktop
+%{tde_datadir}/services/kfile_sid.desktop
+%{tde_datadir}/services/kfile_theora.desktop
+%{tde_datadir}/services/kfile_wav.desktop
 
 ##########
 
@@ -485,8 +512,9 @@ Requires: 	trinity-kappfinder
 This package provides data on multimedia applications for kappfinder.
 
 %files kappfinder-data
-%{_datadir}/apps/kappfinder/*
-%{_datadir}/desktop-directories/[kt]de-multimedia-music.directory
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/kappfinder/*
+%{tde_datadir}/desktop-directories/[kt]de-multimedia-music.directory
 %{_prefix}/etc/xdg/menus/applications-merged/trinity-multimedia-music.menu
 
 ##########
@@ -500,34 +528,35 @@ This package allow audio CDs to be browsed like a file system using
 Konqueror and the audiocd:/ URL.
 
 %files kio-plugins
-%{tde_libdir}/kcm_audiocd.la
-%{tde_libdir}/kcm_audiocd.so
-%{tde_libdir}/kio_audiocd.la
-%{tde_libdir}/kio_audiocd.so
-%{tde_libdir}/libaudiocd_encoder_flac.la
-%{tde_libdir}/libaudiocd_encoder_flac.so
-%{tde_libdir}/libaudiocd_encoder_lame.la
-%{tde_libdir}/libaudiocd_encoder_lame.so
-%{tde_libdir}/libaudiocd_encoder_vorbis.la
-%{tde_libdir}/libaudiocd_encoder_vorbis.so
-%{tde_libdir}/libaudiocd_encoder_wav.la
-%{tde_libdir}/libaudiocd_encoder_wav.so
-%{_libdir}/libaudiocdplugins.so.*
-%{tde_appdir}/audiocd.desktop
-%{_datadir}/apps/kconf_update/audiocd.upd
-%{_datadir}/apps/kconf_update/upgrade-metadata.sh
-%{_datadir}/config.kcfg/audiocd_lame_encoder.kcfg
-%{_datadir}/config.kcfg/audiocd_vorbis_encoder.kcfg
-%{_datadir}/services/audiocd.protocol
-%{tde_docdir}/HTML/en/kioslave/audiocd.docbook
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/kcm_audiocd.la
+%{tde_tdelibdir}/kcm_audiocd.so
+%{tde_tdelibdir}/kio_audiocd.la
+%{tde_tdelibdir}/kio_audiocd.so
+%{tde_tdelibdir}/libaudiocd_encoder_flac.la
+%{tde_tdelibdir}/libaudiocd_encoder_flac.so
+%{tde_tdelibdir}/libaudiocd_encoder_lame.la
+%{tde_tdelibdir}/libaudiocd_encoder_lame.so
+%{tde_tdelibdir}/libaudiocd_encoder_vorbis.la
+%{tde_tdelibdir}/libaudiocd_encoder_vorbis.so
+%{tde_tdelibdir}/libaudiocd_encoder_wav.la
+%{tde_tdelibdir}/libaudiocd_encoder_wav.so
+%{tde_libdir}/libaudiocdplugins.so.*
+%{tde_tdeappdir}/audiocd.desktop
+%{tde_datadir}/apps/kconf_update/audiocd.upd
+%{tde_datadir}/apps/kconf_update/upgrade-metadata.sh
+%{tde_datadir}/config.kcfg/audiocd_lame_encoder.kcfg
+%{tde_datadir}/config.kcfg/audiocd_vorbis_encoder.kcfg
+%{tde_datadir}/services/audiocd.protocol
+%{tde_tdedocdir}/HTML/en/kioslave/audiocd.docbook
 
 %post kio-plugins
 /sbin/ldconfig
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %postun kio-plugins
 /sbin/ldconfig
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 ##########
 
@@ -539,32 +568,33 @@ Group:		Applications/Multimedia
 This package provides a MIDI and karaoke player for TDE.
 
 %files -n trinity-kmid
-%{_bindir}/kmid
-%{tde_libdir}/libkmidpart.la
-%{tde_libdir}/libkmidpart.so
-%{_libdir}/libkmidlib.so.*
-%{tde_appdir}/kmid.desktop
-%{_datadir}/apps/kmid/
-%{_datadir}/icons/hicolor/*/apps/kmid.png
-%{_datadir}/mimelnk/audio/x-karaoke.desktop
-%{_datadir}/servicetypes/audiomidi.desktop
-%{tde_docdir}/HTML/en/kmid/
+%defattr(-,root,root,-)
+%{tde_bindir}/kmid
+%{tde_tdelibdir}/libkmidpart.la
+%{tde_tdelibdir}/libkmidpart.so
+%{tde_libdir}/libkmidlib.so.*
+%{tde_tdeappdir}/kmid.desktop
+%{tde_datadir}/apps/kmid/
+%{tde_datadir}/icons/hicolor/*/apps/kmid.png
+%{tde_datadir}/mimelnk/audio/x-karaoke.desktop
+%{tde_datadir}/servicetypes/audiomidi.desktop
+%{tde_tdedocdir}/HTML/en/kmid/
 
 %post -n trinity-kmid
 /sbin/ldconfig
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %postun -n trinity-kmid
 /sbin/ldconfig
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 ##########
 
@@ -576,39 +606,40 @@ Group:		Applications/Multimedia
 This package includes TDE's dockable sound mixer applet.
 
 %files -n trinity-kmix
-%{_bindir}/kmix
-%{_bindir}/kmixctrl
-%{tde_libdir}/kmix.la
-%{tde_libdir}/kmix.so
-%{tde_libdir}/kmix_panelapplet.la
-%{tde_libdir}/kmix_panelapplet.so
-%{tde_libdir}/kmixctrl.la
-%{tde_libdir}/kmixctrl.so
-%{_libdir}/lib[kt]deinit_kmix.so
-%{_libdir}/lib[kt]deinit_kmixctrl.so
-%{tde_appdir}/kmix.desktop
-%{_datadir}/apps/kicker/applets/kmixapplet.desktop
-%{_datadir}/apps/kmix/
-%{_datadir}/autostart/restore_kmix_volumes.desktop
-%{_datadir}/icons/hicolor/*/apps/kmix.png
-%{_datadir}/services/kmixctrl_restore.desktop
-%{tde_docdir}/HTML/en/kmix/
+%defattr(-,root,root,-)
+%{tde_bindir}/kmix
+%{tde_bindir}/kmixctrl
+%{tde_tdelibdir}/kmix.la
+%{tde_tdelibdir}/kmix.so
+%{tde_tdelibdir}/kmix_panelapplet.la
+%{tde_tdelibdir}/kmix_panelapplet.so
+%{tde_tdelibdir}/kmixctrl.la
+%{tde_tdelibdir}/kmixctrl.so
+%{tde_libdir}/lib[kt]deinit_kmix.so
+%{tde_libdir}/lib[kt]deinit_kmixctrl.so
+%{tde_tdeappdir}/kmix.desktop
+%{tde_datadir}/apps/kicker/applets/kmixapplet.desktop
+%{tde_datadir}/apps/kmix/
+%{tde_datadir}/autostart/restore_kmix_volumes.desktop
+%{tde_datadir}/icons/hicolor/*/apps/kmix.png
+%{tde_datadir}/services/kmixctrl_restore.desktop
+%{tde_tdedocdir}/HTML/en/kmix/
 
 %post -n trinity-kmix
 /sbin/ldconfig
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %postun -n trinity-kmix
 /sbin/ldconfig
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 ##########
 
@@ -620,43 +651,44 @@ Group:		Applications/Multimedia
 This is a sound recording utility for Trinity.
 
 %files -n trinity-krec
-%{_bindir}/krec
-%{tde_libdir}/kcm_krec.la
-%{tde_libdir}/kcm_krec.so
-%{tde_libdir}/kcm_krec_files.la
-%{tde_libdir}/kcm_krec_files.so
-%{tde_libdir}/krec.la
-%{tde_libdir}/krec.so
-%{tde_libdir}/libkrecexport_ogg.la
-%{tde_libdir}/libkrecexport_ogg.so
-%{tde_libdir}/libkrecexport_wave.la
-%{tde_libdir}/libkrecexport_wave.so
-%{_libdir}/lib[kt]deinit_krec.so
-%{tde_appdir}/krec.desktop
-%{_datadir}/apps/krec/
-%{_datadir}/icons/hicolor/*/apps/krec.png
-%{_datadir}/services/kcm_krec.desktop
-%{_datadir}/services/kcm_krec_files.desktop
-%{_datadir}/services/krec_exportogg.desktop
-%{_datadir}/services/krec_exportwave.desktop
-%{_datadir}/servicetypes/krec_exportitem.desktop
-%{tde_docdir}/HTML/en/krec/
+%defattr(-,root,root,-)
+%{tde_bindir}/krec
+%{tde_tdelibdir}/kcm_krec.la
+%{tde_tdelibdir}/kcm_krec.so
+%{tde_tdelibdir}/kcm_krec_files.la
+%{tde_tdelibdir}/kcm_krec_files.so
+%{tde_tdelibdir}/krec.la
+%{tde_tdelibdir}/krec.so
+%{tde_tdelibdir}/libkrecexport_ogg.la
+%{tde_tdelibdir}/libkrecexport_ogg.so
+%{tde_tdelibdir}/libkrecexport_wave.la
+%{tde_tdelibdir}/libkrecexport_wave.so
+%{tde_libdir}/lib[kt]deinit_krec.so
+%{tde_tdeappdir}/krec.desktop
+%{tde_datadir}/apps/krec/
+%{tde_datadir}/icons/hicolor/*/apps/krec.png
+%{tde_datadir}/services/kcm_krec.desktop
+%{tde_datadir}/services/kcm_krec_files.desktop
+%{tde_datadir}/services/krec_exportogg.desktop
+%{tde_datadir}/services/krec_exportwave.desktop
+%{tde_datadir}/servicetypes/krec_exportitem.desktop
+%{tde_tdedocdir}/HTML/en/krec/
 
 %post -n trinity-krec
 /sbin/ldconfig
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %postun -n trinity-krec
 /sbin/ldconfig
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 ##########
 
@@ -668,30 +700,31 @@ Group:		Applications/Multimedia
 This is Trinity's audio CD player.
 
 %files -n trinity-kscd
-%{_bindir}/kscd
-%{_bindir}/workman2cddb.pl
-%{tde_appdir}/kscd.desktop
-%{_datadir}/apps/konqueror/servicemenus/audiocd_play.desktop
-%{_datadir}/apps/kscd/
-%{_datadir}/apps/profiles/kscd.profile.xml
-%{_datadir}/config.kcfg/kscd.kcfg
-%{_datadir}/icons/hicolor/*/apps/kscd.png
-%{_datadir}/mimelnk/text/xmcd.desktop
-%{tde_docdir}/HTML/en/kscd/
+%defattr(-,root,root,-)
+%{tde_bindir}/kscd
+%{tde_bindir}/workman2cddb.pl
+%{tde_tdeappdir}/kscd.desktop
+%{tde_datadir}/apps/konqueror/servicemenus/audiocd_play.desktop
+%{tde_datadir}/apps/kscd/
+%{tde_datadir}/apps/profiles/kscd.profile.xml
+%{tde_datadir}/config.kcfg/kscd.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/kscd.png
+%{tde_datadir}/mimelnk/text/xmcd.desktop
+%{tde_tdedocdir}/HTML/en/kscd/
 
 %post -n trinity-kscd
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %postun -n trinity-kscd
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 ##########
 
@@ -703,16 +736,17 @@ Group:		Environment/Libraries
 This package contains akode plugins for aRts.
 
 %files -n trinity-libarts-akode
-%{_libdir}/libarts_akode.la
-%{_libdir}/libarts_akode.so
-%{_libdir}/libarts_akode.so.*
-%{_libdir}/mcop/akodearts.mcoptype
-%{_libdir}/mcop/akodearts.mcopclass
-%{_libdir}/mcop/akodeMPCPlayObject.mcopclass
-%{_libdir}/mcop/akodePlayObject.mcopclass
-%{_libdir}/mcop/akodeSpeexStreamPlayObject.mcopclass
-%{_libdir}/mcop/akodeVorbisStreamPlayObject.mcopclass
-%{_libdir}/mcop/akodeXiphPlayObject.mcopclass
+%defattr(-,root,root,-)
+%{tde_libdir}/libarts_akode.la
+%{tde_libdir}/libarts_akode.so
+%{tde_libdir}/libarts_akode.so.*
+%{tde_libdir}/mcop/akodearts.mcoptype
+%{tde_libdir}/mcop/akodearts.mcopclass
+%{tde_libdir}/mcop/akodeMPCPlayObject.mcopclass
+%{tde_libdir}/mcop/akodePlayObject.mcopclass
+%{tde_libdir}/mcop/akodeSpeexStreamPlayObject.mcopclass
+%{tde_libdir}/mcop/akodeVorbisStreamPlayObject.mcopclass
+%{tde_libdir}/mcop/akodeXiphPlayObject.mcopclass
 
 %post -n trinity-libarts-akode
 /sbin/ldconfig
@@ -730,12 +764,13 @@ Group:		Environment/Libraries
 This package contains audiofile plugins for aRts.
 
 %files -n trinity-libarts-audiofile
-%{_libdir}/libarts_audiofile.la
-%{_libdir}/libarts_audiofile.so
-%{_libdir}/libarts_audiofile.so.*
-%{_libdir}/mcop/Arts/audiofilePlayObject.mcopclass
-%{_libdir}/mcop/audiofilearts.mcopclass
-%{_libdir}/mcop/audiofilearts.mcoptype
+%defattr(-,root,root,-)
+%{tde_libdir}/libarts_audiofile.la
+%{tde_libdir}/libarts_audiofile.so
+%{tde_libdir}/libarts_audiofile.so.*
+%{tde_libdir}/mcop/Arts/audiofilePlayObject.mcopclass
+%{tde_libdir}/mcop/audiofilearts.mcopclass
+%{tde_libdir}/mcop/audiofilearts.mcoptype
 
 %post -n trinity-libarts-audiofile
 /sbin/ldconfig
@@ -756,17 +791,18 @@ audio and video.
 This is the arts (TDE Sound daemon) plugin.
 
 %files -n trinity-libarts-mpeglib
-%{_bindir}/mpeglibartsplay
-%{_libdir}/libarts_mpeglib-0.3.0.so.*
-%{_libdir}/libarts_mpeglib.la
-%{_libdir}/libarts_splay.la
-%{_libdir}/libarts_splay.so.*
-%{_libdir}/mcop/CDDAPlayObject.mcopclass
-%{_libdir}/mcop/MP3PlayObject.mcopclass
-%{_libdir}/mcop/NULLPlayObject.mcopclass
-%{_libdir}/mcop/OGGPlayObject.mcopclass
-%{_libdir}/mcop/SplayPlayObject.mcopclass
-%{_libdir}/mcop/WAVPlayObject.mcopclass
+%defattr(-,root,root,-)
+%{tde_bindir}/mpeglibartsplay
+%{tde_libdir}/libarts_mpeglib-0.3.0.so.*
+%{tde_libdir}/libarts_mpeglib.la
+%{tde_libdir}/libarts_splay.la
+%{tde_libdir}/libarts_splay.so.*
+%{tde_libdir}/mcop/CDDAPlayObject.mcopclass
+%{tde_libdir}/mcop/MP3PlayObject.mcopclass
+%{tde_libdir}/mcop/NULLPlayObject.mcopclass
+%{tde_libdir}/mcop/OGGPlayObject.mcopclass
+%{tde_libdir}/mcop/SplayPlayObject.mcopclass
+%{tde_libdir}/mcop/WAVPlayObject.mcopclass
 
 %post -n trinity-libarts-mpeglib
 /sbin/ldconfig
@@ -785,17 +821,18 @@ This package contains aRts' xine plugin, allowing the use of the xine
 multimedia engine though aRts.
 
 %files -n trinity-libarts-xine
-%{tde_libdir}/videothumbnail.la
-%{tde_libdir}/videothumbnail.so
-%{_libdir}/libarts_xine.la
-%{_libdir}/libarts_xine.so
-%{_libdir}/libarts_xine.so.*
-%{_libdir}/mcop/xineAudioPlayObject.mcopclass
-%{_libdir}/mcop/xineVideoPlayObject.mcopclass
-%{_datadir}/apps/videothumbnail/sprocket-large.png
-%{_datadir}/apps/videothumbnail/sprocket-medium.png
-%{_datadir}/apps/videothumbnail/sprocket-small.png
-%{_datadir}/services/videothumbnail.desktop
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/videothumbnail.la
+%{tde_tdelibdir}/videothumbnail.so
+%{tde_libdir}/libarts_xine.la
+%{tde_libdir}/libarts_xine.so
+%{tde_libdir}/libarts_xine.so.*
+%{tde_libdir}/mcop/xineAudioPlayObject.mcopclass
+%{tde_libdir}/mcop/xineVideoPlayObject.mcopclass
+%{tde_datadir}/apps/videothumbnail/sprocket-large.png
+%{tde_datadir}/apps/videothumbnail/sprocket-medium.png
+%{tde_datadir}/apps/videothumbnail/sprocket-small.png
+%{tde_datadir}/services/videothumbnail.desktop
 
 %post -n trinity-libarts-xine
 /sbin/ldconfig
@@ -815,20 +852,21 @@ CD meta-information (track titles, artist information, etc.) from on-line
 databases, for TDE applications.
 
 %files -n trinity-libkcddb
-%{tde_libdir}/kcm_cddb.la
-%{tde_libdir}/kcm_cddb.so
-%{_libdir}/libkcddb.so.*
-%{tde_appdir}/libkcddb.desktop
-%{_datadir}/apps/kconf_update/kcmcddb-emailsettings.upd
-%{_datadir}/config.kcfg/libkcddb.kcfg
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/kcm_cddb.la
+%{tde_tdelibdir}/kcm_cddb.so
+%{tde_libdir}/libkcddb.so.*
+%{tde_tdeappdir}/libkcddb.desktop
+%{tde_datadir}/apps/kconf_update/kcmcddb-emailsettings.upd
+%{tde_datadir}/config.kcfg/libkcddb.kcfg
 
 %post -n trinity-libkcddb
 /sbin/ldconfig
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %postun -n trinity-libkcddb
 /sbin/ldconfig
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 ##########
 
@@ -843,15 +881,16 @@ MPEG-1 audio (layers 1, 2, 3), MPEG-1 video, MPEG-1 system layer,
 and WAV playback
 
 %files -n trinity-mpeglib
-%{_bindir}/yaf-cdda
-%{_bindir}/yaf-mpgplay
-%{_bindir}/yaf-splay
-%{_bindir}/yaf-tplay
-%{_bindir}/yaf-vorbis
-%{_bindir}/yaf-yuv
-%{_libdir}/libmpeg-0.3.0.so
-%{_libdir}/libyafcore.so
-%{_libdir}/libyafxplayer.so
+%defattr(-,root,root,-)
+%{tde_bindir}/yaf-cdda
+%{tde_bindir}/yaf-mpgplay
+%{tde_bindir}/yaf-splay
+%{tde_bindir}/yaf-tplay
+%{tde_bindir}/yaf-vorbis
+%{tde_bindir}/yaf-yuv
+%{tde_libdir}/libmpeg-0.3.0.so
+%{tde_libdir}/libyafcore.so
+%{tde_libdir}/libyafxplayer.so
 
 %post -n trinity-mpeglib
 /sbin/ldconfig
@@ -865,103 +904,98 @@ and WAV playback
 Summary:	Media player for Trinity
 Group:		Applications/Multimedia
 
+%if 0%{?mgaversion}
+Provides:	devel(libnoatunarts)
+Provides:	devel(libnoatunarts(64bit))
+%endif
+
 %description -n trinity-noatun
 Noatun is an aRts-based audio and video player for Trinity. It supports all
 formats supported by your installation of aRts (including aRts plugins).
 
 %files -n trinity-noatun
-%{_bindir}/noatun
-%{_libdir}/kconf_update_bin/noatun20update
-%{tde_libdir}/noatun.la
-%{tde_libdir}/noatun.so
-%{tde_libdir}/noatun_dcopiface.la
-%{tde_libdir}/noatun_dcopiface.so
-%{tde_libdir}/noatun_excellent.la
-%{tde_libdir}/noatun_excellent.so
-%{tde_libdir}/noatun_htmlexport.la
-%{tde_libdir}/noatun_htmlexport.so
-%{tde_libdir}/noatun_infrared.la
-%{tde_libdir}/noatun_infrared.so
-%{tde_libdir}/noatun_kaiman.la
-%{tde_libdir}/noatun_kaiman.so
-%{tde_libdir}/noatun_keyz.la
-%{tde_libdir}/noatun_keyz.so
-%{tde_libdir}/noatun_kjofol.la
-%{tde_libdir}/noatun_kjofol.so
-%{tde_libdir}/noatun_marquis.la
-%{tde_libdir}/noatun_marquis.so
-%{tde_libdir}/noatun_metatag.la
-%{tde_libdir}/noatun_metatag.so
-%{tde_libdir}/noatun_monoscope.la
-%{tde_libdir}/noatun_monoscope.so
-%{tde_libdir}/noatun_net.la
-%{tde_libdir}/noatun_net.so
-%{tde_libdir}/noatun_splitplaylist.la
-%{tde_libdir}/noatun_splitplaylist.so
-%{tde_libdir}/noatun_systray.la
-%{tde_libdir}/noatun_systray.so
-%{tde_libdir}/noatun_ui.la
-%{tde_libdir}/noatun_ui.so
-%{tde_libdir}/noatun_voiceprint.la
-%{tde_libdir}/noatun_voiceprint.so
-%{tde_libdir}/noatun_winskin.la
-%{tde_libdir}/noatun_winskin.so
-%{tde_libdir}/noatunsimple.la
-%{tde_libdir}/noatunsimple.so
-%{_libdir}/libartseffects.la
-%{_libdir}/libartseffects.so
-%{_libdir}/lib[kt]deinit_noatun.so
-%{_libdir}/libnoatun.so.*
-%{_libdir}/libnoatunarts.la
-%{_libdir}/libnoatunarts.so
-%{_libdir}/libnoatuncontrols.so.*
-%{_libdir}/libnoatuntags.so.*
-%{_libdir}/libwinskinvis.la
-%{_libdir}/libwinskinvis.so
-%{_libdir}/mcop/ExtraStereo.mcopclass
-%{_libdir}/mcop/ExtraStereoGuiFactory.mcopclass
-%{_libdir}/mcop/Noatun/Equalizer.mcopclass
-%{_libdir}/mcop/Noatun/EqualizerSSE.mcopclass
-%{_libdir}/mcop/Noatun/FFTScope.mcopclass
-%{_libdir}/mcop/Noatun/FFTScopeStereo.mcopclass
-%{_libdir}/mcop/Noatun/Listener.mcopclass
-%{_libdir}/mcop/Noatun/RawScope.mcopclass
-%{_libdir}/mcop/Noatun/RawScopeStereo.mcopclass
-%{_libdir}/mcop/Noatun/Session.mcopclass
-%{_libdir}/mcop/Noatun/StereoEffectStack.mcopclass
-%{_libdir}/mcop/Noatun/StereoVolumeControl.mcopclass
-%{_libdir}/mcop/Noatun/StereoVolumeControlSSE.mcopclass
-%{_libdir}/mcop/Noatun/WinSkinFFT.mcopclass
-%{_libdir}/mcop/RawWriter.mcopclass
-%{_libdir}/mcop/VoiceRemoval.mcopclass
-%{_libdir}/mcop/artseffects.mcopclass
-%{_libdir}/mcop/artseffects.mcoptype
-%{_libdir}/mcop/noatunarts.mcopclass
-%{_libdir}/mcop/noatunarts.mcoptype
-%{_libdir}/mcop/winskinvis.mcopclass
-%{_libdir}/mcop/winskinvis.mcoptype
-%{tde_appdir}/noatun.desktop
-%{_datadir}/apps/kconf_update/noatun.upd
-%{_datadir}/apps/noatun/
-%{_datadir}/icons/hicolor/*/apps/noatun.png
-%{_datadir}/mimelnk/interface/x-winamp-skin.desktop
-%{tde_docdir}/HTML/en/noatun/
+%defattr(-,root,root,-)
+%{tde_bindir}/noatun
+%{tde_libdir}/kconf_update_bin/noatun20update
+%{tde_tdelibdir}/noatun.la
+%{tde_tdelibdir}/noatun.so
+%{tde_tdelibdir}/noatun_dcopiface.la
+%{tde_tdelibdir}/noatun_dcopiface.so
+%{tde_tdelibdir}/noatun_excellent.la
+%{tde_tdelibdir}/noatun_excellent.so
+%{tde_tdelibdir}/noatun_htmlexport.la
+%{tde_tdelibdir}/noatun_htmlexport.so
+%{tde_tdelibdir}/noatun_infrared.la
+%{tde_tdelibdir}/noatun_infrared.so
+%{tde_tdelibdir}/noatun_kaiman.la
+%{tde_tdelibdir}/noatun_kaiman.so
+%{tde_tdelibdir}/noatun_keyz.la
+%{tde_tdelibdir}/noatun_keyz.so
+%{tde_tdelibdir}/noatun_kjofol.la
+%{tde_tdelibdir}/noatun_kjofol.so
+%{tde_tdelibdir}/noatun_marquis.la
+%{tde_tdelibdir}/noatun_marquis.so
+%{tde_tdelibdir}/noatun_metatag.la
+%{tde_tdelibdir}/noatun_metatag.so
+%{tde_tdelibdir}/noatun_monoscope.la
+%{tde_tdelibdir}/noatun_monoscope.so
+%{tde_tdelibdir}/noatun_net.la
+%{tde_tdelibdir}/noatun_net.so
+%{tde_tdelibdir}/noatun_splitplaylist.la
+%{tde_tdelibdir}/noatun_splitplaylist.so
+%{tde_tdelibdir}/noatun_systray.la
+%{tde_tdelibdir}/noatun_systray.so
+%{tde_tdelibdir}/noatun_ui.la
+%{tde_tdelibdir}/noatun_ui.so
+%{tde_tdelibdir}/noatun_voiceprint.la
+%{tde_tdelibdir}/noatun_voiceprint.so
+%{tde_tdelibdir}/noatun_winskin.la
+%{tde_tdelibdir}/noatun_winskin.so
+%{tde_tdelibdir}/noatunsimple.la
+%{tde_tdelibdir}/noatunsimple.so
+%{tde_libdir}/libartseffects.la
+%{tde_libdir}/libartseffects.so
+%{tde_libdir}/lib[kt]deinit_noatun.so
+%{tde_libdir}/libnoatun.so.*
+%{tde_libdir}/libnoatunarts.la
+%{tde_libdir}/libnoatunarts.so
+%{tde_libdir}/libnoatuncontrols.so.*
+%{tde_libdir}/libnoatuntags.so.*
+%{tde_libdir}/libwinskinvis.la
+%{tde_libdir}/libwinskinvis.so
+%{tde_libdir}/mcop/ExtraStereo.mcopclass
+%{tde_libdir}/mcop/ExtraStereoGuiFactory.mcopclass
+%{tde_libdir}/mcop/Noatun/
+%{tde_libdir}/mcop/RawWriter.mcopclass
+%{tde_libdir}/mcop/VoiceRemoval.mcopclass
+%{tde_libdir}/mcop/artseffects.mcopclass
+%{tde_libdir}/mcop/artseffects.mcoptype
+%{tde_libdir}/mcop/noatunarts.mcopclass
+%{tde_libdir}/mcop/noatunarts.mcoptype
+%{tde_libdir}/mcop/winskinvis.mcopclass
+%{tde_libdir}/mcop/winskinvis.mcoptype
+%{tde_tdeappdir}/noatun.desktop
+%{tde_datadir}/apps/kconf_update/noatun.upd
+%{tde_datadir}/apps/noatun/
+%{tde_datadir}/icons/hicolor/*/apps/noatun.png
+%{tde_datadir}/mimelnk/interface/x-winamp-skin.desktop
+%{tde_tdedocdir}/HTML/en/noatun/
 
 %post -n trinity-noatun
 /sbin/ldconfig
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %postun -n trinity-noatun
 /sbin/ldconfig
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 ##########
 
@@ -982,42 +1016,43 @@ applications using aRtsbuilder, aRtsmidi, aRtskde, aRts modules or
 noatun plugins.
 
 %files devel
+%defattr(-,root,root,-)
 %{tde_includedir}/*
-%{_libdir}/libarts_mpeglib.so
-%{_libdir}/libarts_splay.so
-%{_libdir}/libartsbuilder.so
-%{_libdir}/libartscontrolapplet.so
-%{_libdir}/libartscontrolsupport.so
-%{_libdir}/libartsgui.so
-%{_libdir}/libartsgui_idl.so
-%{_libdir}/libartsgui_kde.so
-%{_libdir}/libartsmidi.so
-%{_libdir}/libartsmidi_idl.so
-%{_libdir}/libartsmodules.so
-%{_libdir}/libartsmodulescommon.so
-%{_libdir}/libartsmoduleseffects.so
-%{_libdir}/libartsmodulesmixers.so
-%{_libdir}/libartsmodulessynth.so
-%{_libdir}/libaudiocdplugins.la
-%{_libdir}/libaudiocdplugins.so
-%{_libdir}/libkcddb.la
-%{_libdir}/libkcddb.so
-%{_libdir}/lib[kt]deinit_kmix.la
-%{_libdir}/lib[kt]deinit_kmixctrl.la
-%{_libdir}/lib[kt]deinit_krec.la
-%{_libdir}/lib[kt]deinit_noatun.la
-%{_libdir}/libkmidlib.la
-%{_libdir}/libkmidlib.so
-%{_libdir}/libmpeg.la
-%{_libdir}/libmpeg.so
-%{_libdir}/libnoatun.la
-%{_libdir}/libnoatun.so
-%{_libdir}/libnoatuncontrols.la
-%{_libdir}/libnoatuncontrols.so
-%{_libdir}/libnoatuntags.la
-%{_libdir}/libnoatuntags.so
-%{_libdir}/libyafcore.la
-%{_libdir}/libyafxplayer.la
+%{tde_libdir}/libarts_mpeglib.so
+%{tde_libdir}/libarts_splay.so
+%{tde_libdir}/libartsbuilder.so
+%{tde_libdir}/libartscontrolapplet.so
+%{tde_libdir}/libartscontrolsupport.so
+%{tde_libdir}/libartsgui.so
+%{tde_libdir}/libartsgui_idl.so
+%{tde_libdir}/libartsgui_kde.so
+%{tde_libdir}/libartsmidi.so
+%{tde_libdir}/libartsmidi_idl.so
+%{tde_libdir}/libartsmodules.so
+%{tde_libdir}/libartsmodulescommon.so
+%{tde_libdir}/libartsmoduleseffects.so
+%{tde_libdir}/libartsmodulesmixers.so
+%{tde_libdir}/libartsmodulessynth.so
+%{tde_libdir}/libaudiocdplugins.la
+%{tde_libdir}/libaudiocdplugins.so
+%{tde_libdir}/libkcddb.la
+%{tde_libdir}/libkcddb.so
+%{tde_libdir}/lib[kt]deinit_kmix.la
+%{tde_libdir}/lib[kt]deinit_kmixctrl.la
+%{tde_libdir}/lib[kt]deinit_krec.la
+%{tde_libdir}/lib[kt]deinit_noatun.la
+%{tde_libdir}/libkmidlib.la
+%{tde_libdir}/libkmidlib.so
+%{tde_libdir}/libmpeg.la
+%{tde_libdir}/libmpeg.so
+%{tde_libdir}/libnoatun.la
+%{tde_libdir}/libnoatun.so
+%{tde_libdir}/libnoatuncontrols.la
+%{tde_libdir}/libnoatuncontrols.so
+%{tde_libdir}/libnoatuntags.la
+%{tde_libdir}/libnoatuntags.so
+%{tde_libdir}/libyafcore.la
+%{tde_libdir}/libyafxplayer.la
 
 %post devel
 /sbin/ldconfig
@@ -1030,6 +1065,7 @@ noatun plugins.
 
 %prep
 %setup -q -n kdemultimedia
+%patch1 -p1 -b .ftbfs
 %patch3 -p1 -b .xdg
 %patch5 -p1 -b .pthread
 %patch10 -p1
@@ -1040,8 +1076,8 @@ noatun plugins.
 # 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"
@@ -1050,13 +1086,21 @@ noatun plugins.
 
 %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}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
+
+# Required for some distro
+export KDEDIRS=%{_prefix}
 
 %configure  \
+   --exec-prefix=%{_prefix} \
+   --bindir=%{tde_bindir} \
+   --libdir=%{tde_libdir} \
+   --includedir=%{tde_includedir} \
+   --datadir=%{tde_datadir} \
    --enable-new-ldflags \
    --disable-dependency-tracking \
-   --includedir=%{tde_includedir} \
    --with-cdparanoia \
    --with-flac \
    --with-theora \
@@ -1072,29 +1116,19 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
   %{?_with_musicbrainz} %{!?_with_musicbrainz:--without-musicbrainz} \
   %{?_with_taglib} %{!?_with_taglib:--without-taglib} \
   %{?_with_xine} %{!?_with_xine:--without-xine} \
-   --with-extra-includes="%{_usr}/include/cdda:%{_includedir}/tqt" \
+   --with-extra-includes="%{_usr}/include/cdda:%{_usr}/include/cddb:%{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}
 
-## Remove/uninstall (conflicting) bits we don't want
-#%__rm -f $RPM_BUILD_ROOT%{_libdir}/mcop/akode*MPEGPlayObject.mcopclass
-
-# only show in KDE, really? -- Rex (FIXME)
-#for f in %{buildroot}%{tde_appdir}/*.desktop ; do
-#  if [ -f %{buildroot}%{tde_appdir}/*.desktop ] ; then
-#    echo "OnlyShowIn=KDE;" >> $f
-#  fi
-#done
-
 # don't make these world-writeable
-chmod go-w %{buildroot}%{_datadir}/apps/kscd/*
+chmod go-w %{buildroot}%{tde_datadir}/apps/kscd/*
 
 # locale's
 HTML_DIR=$(kde-config --expandvars --install html)
@@ -1113,19 +1147,6 @@ for lang_dir in %{buildroot}$HTML_DIR/* ; do
 done
 fi
 
-# rpmdocs
-for dir in k* ; do
-  for file in AUTHORS ChangeLog README TODO ; do
-    if test -s "$dir/$file" ; then
-       install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
-       # exclude kaboodle, juk, noatun
-       if [ $dir != kaboodle -a $dir != juk -a $dir != noatun ] ; then
-         echo "%doc rpmdocs/$dir/" >> %{name}.lang
-       fi
-    fi
-  done
-done
-
 # Moves the XDG configuration files to TDE directory
 %__install -p -D -m644 \
 	"%{?buildroot}%{_sysconfdir}/xdg/menus/applications-merged/kde-multimedia-music.menu" \
diff --git a/redhat/kdenetwork/kdenetwork-3.5.13-fix_a_fatal_error_message.patch b/redhat/kdenetwork/kdenetwork-3.5.13-fix_a_fatal_error_message.patch
new file mode 100644
index 000000000..594ac300a
--- /dev/null
+++ b/redhat/kdenetwork/kdenetwork-3.5.13-fix_a_fatal_error_message.patch
@@ -0,0 +1,20 @@
+commit 5c988de1bdaf2c4cf692e6c195375607a8c67ab0
+Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Date:   1343320500 -0500
+
+    Fix a fatal error message
+    Thanks to 'Nix' for the patch!
+
+diff --git a/kopete/plugins/netmeeting/CMakeLists.txt b/kopete/plugins/netmeeting/CMakeLists.txt
+index b6cc031..318b672 100644
+--- a/kopete/plugins/netmeeting/CMakeLists.txt
++++ b/kopete/plugins/netmeeting/CMakeLists.txt
+@@ -10,7 +10,7 @@
+ #################################################
+ 
+ if( NOT BUILD_KOPETE_PROTOCOL_MSN )
+-  tde_message_error( "netmeeting plugin needs msn protocol.\n Add -DBUILD_KOPETE_PROTOCOL_MSN=ON to cmake flags." )
++  tde_message_fatal( "netmeeting plugin needs msn protocol.\n Add -DBUILD_KOPETE_PROTOCOL_MSN=ON to cmake flags." )
+ endif( )
+ 
+ include_directories(
diff --git a/redhat/kdenetwork/kdenetwork-3.5.13-fix_html_specialchar_in_kopete_nowlistening.patch b/redhat/kdenetwork/kdenetwork-3.5.13-fix_html_specialchar_in_kopete_nowlistening.patch
new file mode 100644
index 000000000..d205ede38
--- /dev/null
+++ b/redhat/kdenetwork/kdenetwork-3.5.13-fix_html_specialchar_in_kopete_nowlistening.patch
@@ -0,0 +1,46 @@
+commit 0a2892edc380aa11fb5474004e02fd4d86abdec1
+Author: Slávek Banko <slavek.banko@axis.cz>
+Date:   1340214777 +0200
+
+    Fix html special chars in kopete nowlistening plugin
+    This partially resolves Bug 944
+
+diff --git a/kopete/plugins/nowlistening/nowlisteningplugin.cpp b/kopete/plugins/nowlistening/nowlisteningplugin.cpp
+index a914818..1f1fed5 100644
+--- a/kopete/plugins/nowlistening/nowlisteningplugin.cpp
++++ b/kopete/plugins/nowlistening/nowlisteningplugin.cpp
+@@ -20,6 +20,7 @@
+ 
+ #include <tqtimer.h>
+ #include <tqstringlist.h>
++#include <tqstylesheet.h>
+ #include <tqregexp.h>
+ 
+ #include <kdebug.h>
+@@ -189,7 +190,7 @@ void NowListeningPlugin::slotOutgoingMessage(Kopete::Message& msg)
+ 	if(!NowListeningConfig::self()->chatAdvertising())
+ 		return;
+ 
+-	TQString originalBody = msg.plainBody();
++	TQString originalBody = msg.escapedBody();
+ 
+ 	// If it is a /media message, don't process it
+ 	if(originalBody.startsWith(NowListeningConfig::self()->header()))
+@@ -222,7 +223,7 @@ void NowListeningPlugin::slotOutgoingMessage(Kopete::Message& msg)
+ 	{
+ 		TQString advert = mediaPlayerAdvert(false); // false since newTrackPlaying() did the update
+ 		if( !advert.isEmpty() )
+-			newBody = originalBody + "<br>" + advert;
++			newBody = originalBody + "<br>" + TQStyleSheet::escape(advert);
+ 
+ 		// If we send because the information has changed since it was last sent, we must
+ 		// rebuild the list of contacts the latest information was sent to.
+@@ -501,7 +502,7 @@ void NowListeningPlugin::advertiseToChat( Kopete::ChatSession *theChat, TQString
+ 			pl,
+ 			message,
+ 			Kopete::Message::Outbound,
+-			Kopete::Message::RichText );
++			Kopete::Message::PlainText );
+ 	theChat->sendMessage( msg );
+ }
+ 
diff --git a/redhat/kdenetwork/kdenetwork-3.5.13-fix_html_specialchar_in_kopete_nowlistening_2.patch b/redhat/kdenetwork/kdenetwork-3.5.13-fix_html_specialchar_in_kopete_nowlistening_2.patch
new file mode 100644
index 000000000..c6df5ffd7
--- /dev/null
+++ b/redhat/kdenetwork/kdenetwork-3.5.13-fix_html_specialchar_in_kopete_nowlistening_2.patch
@@ -0,0 +1,46 @@
+commit 2d699f523902244113eeec627ca6b9b18b740da0
+Author: Slávek Banko <slavek.banko@axis.cz>
+Date:   1340214777 +0200
+
+    Fix html special chars in kopete nowlistening plugin
+    This partially resolves Bug 994
+
+diff --git a/kopete/plugins/nowlistening/nowlisteningplugin.cpp b/kopete/plugins/nowlistening/nowlisteningplugin.cpp
+index a914818..1f1fed5 100644
+--- a/kopete/plugins/nowlistening/nowlisteningplugin.cpp
++++ b/kopete/plugins/nowlistening/nowlisteningplugin.cpp
+@@ -20,6 +20,7 @@
+ 
+ #include <tqtimer.h>
+ #include <tqstringlist.h>
++#include <tqstylesheet.h>
+ #include <tqregexp.h>
+ 
+ #include <kdebug.h>
+@@ -189,7 +190,7 @@ void NowListeningPlugin::slotOutgoingMessage(Kopete::Message& msg)
+ 	if(!NowListeningConfig::self()->chatAdvertising())
+ 		return;
+ 
+-	TQString originalBody = msg.plainBody();
++	TQString originalBody = msg.escapedBody();
+ 
+ 	// If it is a /media message, don't process it
+ 	if(originalBody.startsWith(NowListeningConfig::self()->header()))
+@@ -222,7 +223,7 @@ void NowListeningPlugin::slotOutgoingMessage(Kopete::Message& msg)
+ 	{
+ 		TQString advert = mediaPlayerAdvert(false); // false since newTrackPlaying() did the update
+ 		if( !advert.isEmpty() )
+-			newBody = originalBody + "<br>" + advert;
++			newBody = originalBody + "<br>" + TQStyleSheet::escape(advert);
+ 
+ 		// If we send because the information has changed since it was last sent, we must
+ 		// rebuild the list of contacts the latest information was sent to.
+@@ -501,7 +502,7 @@ void NowListeningPlugin::advertiseToChat( Kopete::ChatSession *theChat, TQString
+ 			pl,
+ 			message,
+ 			Kopete::Message::Outbound,
+-			Kopete::Message::RichText );
++			Kopete::Message::PlainText );
+ 	theChat->sendMessage( msg );
+ }
+ 
diff --git a/redhat/kdenetwork/kdenetwork-3.5.13-fix_parallel_build.patch b/redhat/kdenetwork/kdenetwork-3.5.13-fix_parallel_build.patch
new file mode 100644
index 000000000..92f0d72bc
--- /dev/null
+++ b/redhat/kdenetwork/kdenetwork-3.5.13-fix_parallel_build.patch
@@ -0,0 +1,19 @@
+commit 35c41f35b08e981caa062f963ad2611ee6ef35a9
+Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Date:   1343320733 -0500
+
+    Fix a parallel build bug
+    Thanks to 'Nix' for the patch!
+
+diff --git a/filesharing/advanced/propsdlgplugin/CMakeLists.txt b/filesharing/advanced/propsdlgplugin/CMakeLists.txt
+index f6477d1..26d94f5 100644
+--- a/filesharing/advanced/propsdlgplugin/CMakeLists.txt
++++ b/filesharing/advanced/propsdlgplugin/CMakeLists.txt
+@@ -32,6 +32,7 @@ install( FILES
+ 
+ tde_add_library( propsdlgplugin_common STATIC_PIC AUTOMOC
+   SOURCES propertiespage.cpp propertiespagegui.ui
++  DEPENDENCIES filesharesamba
+ )
+ 
+ 
diff --git a/redhat/kdenetwork/kdenetwork-3.5.13-use_libv4l_or_libv4l1.patch b/redhat/kdenetwork/kdenetwork-3.5.13-use_libv4l_or_libv4l1.patch
new file mode 100644
index 000000000..9d9d55344
--- /dev/null
+++ b/redhat/kdenetwork/kdenetwork-3.5.13-use_libv4l_or_libv4l1.patch
@@ -0,0 +1,114 @@
+commit d8cbbab802a063679a4db5cebc73122cdb1da100
+Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Date:   1343324022 -0500
+
+    Use libv4l if available, otherwise check for v4l1 headers
+
+diff --git a/kopete/ConfigureChecks.cmake b/kopete/ConfigureChecks.cmake
+index aece436..70e97f5 100644
+--- a/kopete/ConfigureChecks.cmake
++++ b/kopete/ConfigureChecks.cmake
+@@ -26,3 +26,10 @@ if ( HAVE_LIBV4L1_VIDEODEV_H )
+ endif ( )
+ # -- End libv4l1-videodev.h ----------------------------------------------
+ 
++# -- Check for linux/videodev.h presence --------------------
++CHECK_INCLUDE_FILE ( "linux/videodev.h" HAVE_LINUX_VIDEODEV_H )
++if ( HAVE_LINUX_VIDEODEV_H )
++  add_definitions( -DHAVE_LINUX_VIDEODEV_H )
++endif ( )
++# -- End linux-videodev.h ----------------------------------------------
++
+diff --git a/kopete/libkopete/avdevice/videocontrol.h b/kopete/libkopete/avdevice/videocontrol.h
+index c4db3b9..dbef6b5 100644
+--- a/kopete/libkopete/avdevice/videocontrol.h
++++ b/kopete/libkopete/avdevice/videocontrol.h
+@@ -15,8 +15,6 @@
+     *************************************************************************
+ */
+ 
+-#define ENABLE_AV
+-
+ #ifndef KOPETE_AVVIDEOCONTROL_H
+ #define KOPETE_AVVIDEOCONTROL_H
+ 
+diff --git a/kopete/libkopete/avdevice/videodevice.cpp b/kopete/libkopete/avdevice/videodevice.cpp
+index ea23544..e12fb02 100644
+--- a/kopete/libkopete/avdevice/videodevice.cpp
++++ b/kopete/libkopete/avdevice/videodevice.cpp
+@@ -15,8 +15,6 @@
+     *************************************************************************
+ */
+ 
+-#define ENABLE_AV
+-
+ #include <cstdlib>
+ #include <cerrno>
+ #include <cstring>
+diff --git a/kopete/libkopete/avdevice/videodevice.h b/kopete/libkopete/avdevice/videodevice.h
+index 7bba507..7e57513 100644
+--- a/kopete/libkopete/avdevice/videodevice.h
++++ b/kopete/libkopete/avdevice/videodevice.h
+@@ -15,11 +15,11 @@
+     *************************************************************************
+ */
+ 
+-#define ENABLE_AV
+-
+ #ifndef KOPETE_AVVIDEODEVICELISTITEM_H
+ #define KOPETE_AVVIDEODEVICELISTITEM_H
+ 
++#define ENABLE_AV
++
+ #if defined HAVE_CONFIG_H
+ #include <config.h>
+ #endif
+@@ -54,8 +54,10 @@
+ #include <linux/kernel.h>
+ #if defined(HAVE_LIBV4L1_VIDEODEV_H)
+ #include <libv4l1-videodev.h>
+-#else
++#elif defined(HAVE_LINUX_VIDEODEV_H)
+ #include <linux/videodev.h>
++#else
++#undef ENABLE_AV
+ #endif
+ #define VIDEO_MODE_PAL_Nc  3
+ #define VIDEO_MODE_PAL_M   4
+@@ -293,8 +295,10 @@ public:
+ void enumerateMenu (void);
+ 
+ #endif
++#ifndef ENABLE_AV
+ 	struct video_capability V4L_capabilities;
+ 	struct video_buffer V4L_videobuffer;
++#endif
+ #endif	
+ 	TQValueVector<Kopete::AV::VideoInput> m_input;
+ 	TQValueVector<Kopete::AV::VideoControl> m_control;
+diff --git a/kopete/libkopete/avdevice/videodevicepool.cpp b/kopete/libkopete/avdevice/videodevicepool.cpp
+index b725d5d..cbfe7cb 100644
+--- a/kopete/libkopete/avdevice/videodevicepool.cpp
++++ b/kopete/libkopete/avdevice/videodevicepool.cpp
+@@ -15,8 +15,6 @@
+     *************************************************************************
+ */
+ 
+-#define ENABLE_AV
+-
+ #include <assert.h>
+ #include <cstdlib>
+ #include <cerrno>
+diff --git a/kopete/libkopete/avdevice/videoinput.h b/kopete/libkopete/avdevice/videoinput.h
+index 9fc109a..dd7504f 100644
+--- a/kopete/libkopete/avdevice/videoinput.h
++++ b/kopete/libkopete/avdevice/videoinput.h
+@@ -15,8 +15,6 @@
+     *************************************************************************
+ */
+ 
+-#define ENABLE_AV
+-
+ #ifndef KOPETE_AVVIDEOINPUT_H
+ #define KOPETE_AVVIDEOINPUT_H
+ 
diff --git a/redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec b/redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec
index 405f8d0d6..676dcf495 100644
--- a/redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec
+++ b/redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec
@@ -1,15 +1,22 @@
 # If TDE is built iwn 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: cmake >= 2.8
-%define tde_docdir %{_docdir}/kde
-%define tde_appdir %{_datadir}/applications/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%define tde_bindir %{_prefix}/bin
+%define tde_datadir %{_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{_prefix}/include
+%define tde_libdir %{_prefix}/%{_lib}
+%define tde_sbindir %{_prefix}/sbin
+
+%define tde_tdeappdir %{tde_datadir}/applications/kde
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_docdir}
 
 
 # Fedora review:  http://bugzilla.redhat.com/195486
@@ -21,9 +28,9 @@ BuildRequires: cmake >= 2.8
 %define _with_wifi --with-wifi
 %endif
 
-Name:    tdenetwork
+Name:    trinity-tdenetwork
 Version: 3.5.13
-Release: 5%{?dist}%{?_variant}
+Release: 6%{?dist}%{?_variant}
 Summary: Trinity Desktop Environment - Network Applications
 
 Vendor:		Trinity Project
@@ -63,13 +70,22 @@ Patch15:	kdenetwork-3.5.13-fix_alphabet_string_error.patch
 Patch17:	kdenetwork-3.5.13-remove_more_applications_from_menu.patch
 # [tdenetwork] Improve Kaffeine support in Kopete now listening plugin [Commit #f6708531]
 Patch18:	kdenetwork-3.5.13-improve_kaffeine_support_in_nowlistening_plugin.patch
+# [tdenetwork] Fix html special chars in kopete nowlistening plugin [Bug #944] [Commit #0a2892ed]
+Patch19:	kdenetwork-3.5.13-fix_html_specialchar_in_kopete_nowlistening.patch
+# [tdenetwork] Fix a fatal error message [Commit #5c988de1]
+Patch20:	kdenetwork-3.5.13-fix_a_fatal_error_message.patch
+# [tdenetwork] Fix a parallel build bug [Commit #35c41f35]
+Patch21:	kdenetwork-3.5.13-fix_parallel_build.patch
+# [tdenetwork] Use libv4l if available, otherwise check for v4l1 headers [Commit #d8cbbab8]
+Patch22:	kdenetwork-3.5.13-use_libv4l_or_libv4l1.patch
 
 BuildRequires:	gettext
 BuildRequires:	trinity-kdelibs-devel
 BuildRequires:	coreutils 
 BuildRequires:	openssl-devel
-BuildRequires:  avahi-qt3-devel
+#BuildRequires:  avahi-qt3-devel
 BuildRequires:	sqlite-devel
+BuildRequires:	gnutls-devel
 BuildRequires:	libgadu-devel
 BuildRequires:	speex-devel
 
@@ -80,12 +96,17 @@ BuildRequires: libXmu-devel libXScrnSaver-devel libXtst-devel libXxf86vm-devel
 %if 0%{?fedora} > 5 || 0%{?rhel} > 4
 BuildRequires: wireless-tools-devel
 %else
+%if 0%{?mgaversion}
+BuildRequires:	%{_lib}iw29-devel
+%else
+# RHEL 5
 BuildRequires: wireless-tools
 %endif
 %endif
+%endif
 BuildRequires: openslp-devel
 %ifarch %{ix86}
-# BR: %{_includedir}/valgrind/valgrind.h
+# BR: %{tde_includedir}/valgrind/valgrind.h
 BuildRequires: valgrind
 %endif
 %{?_with_xmms:BuildRequires: xmms-devel}
@@ -93,14 +114,18 @@ BuildRequires: valgrind
 %if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
 BuildRequires:	libv4l-devel
 %endif
+%if 0%{?mgaversion}
+BuildRequires:	%{_lib}v4l-devel
+%endif
 
 Obsoletes:	trinity-kdenetwork < %{version}-%{release}
-Obsoletes:	trinity-kdenetwork-libs
-Obsoletes:	trinity-kdenetwork-extras
 Provides:	trinity-kdenetwork = %{version}-%{release}
+Obsoletes:	trinity-kdenetwork-libs < %{version}-%{release}
+Provides:	trinity-kdenetwork-libs = %{version}-%{release}
+Obsoletes:	trinity-kdenetwork-extras < %{version}-%{release}
 Provides:	trinity-kdenetwork-extras = %{version}-%{release}
-
-Requires: usermode-gtk
+Obsoletes:	tdenetwork < %{version}-%{release}
+Provides:	tdenetwork = %{version}-%{release}
 
 Requires: trinity-dcoprss = %{version}-%{release}
 Requires: %{name}-filesharing = %{version}-%{release}
@@ -143,6 +168,10 @@ Networking applications, including:
 * librss: RSS library for Trinity
 * lisa: lan information server
 
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING README
+
 
 ##########
 
@@ -159,10 +188,10 @@ DCOP is the TDE interprocess communication protocol.
 
 %files -n trinity-dcoprss
 %defattr(-,root,root,-)
-%{_bindir}/feedbrowser
-%{_bindir}/rssclient
-%{_bindir}/rssservice
-%{_datadir}/services/rssservice.desktop
+%{tde_bindir}/feedbrowser
+%{tde_bindir}/rssclient
+%{tde_bindir}/rssservice
+%{tde_datadir}/services/rssservice.desktop
 
 %post -n trinity-dcoprss
 update-desktop-database 2> /dev/null || : 
@@ -191,21 +220,21 @@ development-related files for the TDE network module.
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/kopete/*.h
-%{_includedir}/kopete/ui/*.h
-%{_includedir}/rss/*.h
-%{_libdir}/libkdeinit_kdict.la
-%{_libdir}/libkdeinit_ksirc.la
-%{_libdir}/libkopete.la
-%{_libdir}/libkopete.so
-%{_libdir}/libkopete_msn_shared.la
-%{_libdir}/libkopete_msn_shared.so
-%{_libdir}/libkopete_oscar.la
-%{_libdir}/libkopete_oscar.so
-%{_libdir}/libkopete_videodevice.la
-%{_libdir}/libkopete_videodevice.so
-%{_libdir}/librss.la
-%{_libdir}/librss.so
+%{tde_tdeincludedir}/kopete/*.h
+%{tde_tdeincludedir}/kopete/ui/*.h
+%{tde_tdeincludedir}/rss/*.h
+%{tde_libdir}/libkdeinit_kdict.la
+%{tde_libdir}/libkdeinit_ksirc.la
+%{tde_libdir}/libkopete.la
+%{tde_libdir}/libkopete.so
+%{tde_libdir}/libkopete_msn_shared.la
+%{tde_libdir}/libkopete_msn_shared.so
+%{tde_libdir}/libkopete_oscar.la
+%{tde_libdir}/libkopete_oscar.so
+%{tde_libdir}/libkopete_videodevice.la
+%{tde_libdir}/libkopete_videodevice.so
+%{tde_libdir}/librss.la
+%{tde_libdir}/librss.so
 
 %post devel
 /sbin/ldconfig
@@ -220,32 +249,35 @@ development-related files for the TDE network module.
 Summary:		Network filesharing configuration module for Trinity
 Group:   		Applications/Internet
 
+Obsoletes:		tdenetwork-filesharing < %{version}-%{release}
+Provides:		tdenetwork-filesharing = %{version}-%{release}
+
 %description filesharing
 This package provides a TDE Control Center module to configure
 NFS and Samba.
 
 %files filesharing
 %defattr(-,root,root,-)
-%{tde_libdir}/fileshare_propsdlgplugin.la
-%{tde_libdir}/fileshare_propsdlgplugin.so
-%{tde_libdir}/kcm_fileshare.la
-%{tde_libdir}/kcm_fileshare.so
-%{tde_libdir}/kcm_kcmsambaconf.la
-%{tde_libdir}/kcm_kcmsambaconf.so
-%{tde_appdir}/fileshare.desktop
-%{tde_appdir}/kcmsambaconf.desktop
-%{_datadir}/icons/hicolor/*/apps/kcmsambaconf.png
-%{_datadir}/services/fileshare_propsdlgplugin.desktop
+%{tde_tdelibdir}/fileshare_propsdlgplugin.la
+%{tde_tdelibdir}/fileshare_propsdlgplugin.so
+%{tde_tdelibdir}/kcm_fileshare.la
+%{tde_tdelibdir}/kcm_fileshare.so
+%{tde_tdelibdir}/kcm_kcmsambaconf.la
+%{tde_tdelibdir}/kcm_kcmsambaconf.so
+%{tde_tdeappdir}/fileshare.desktop
+%{tde_tdeappdir}/kcmsambaconf.desktop
+%{tde_datadir}/icons/hicolor/*/apps/kcmsambaconf.png
+%{tde_datadir}/services/fileshare_propsdlgplugin.desktop
 
 %post filesharing
 for f in hicolor ; do
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 update-desktop-database 2> /dev/null || : 
 
 %postun filesharing
 for f in hicolor ; do
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 update-desktop-database 2> /dev/null || : 
 
@@ -263,25 +295,25 @@ basic as well as advanced queries.
 
 %files -n trinity-kdict
 %defattr(-,root,root,-)
-%{_bindir}/kdict
-%{tde_libdir}/kdict.*
-%{tde_libdir}/kdict_panelapplet.*
-%{_libdir}/libkdeinit_kdict.*
-%{tde_appdir}/kdict.desktop
-%{_datadir}/apps/kdict
-%{_datadir}/apps/kicker/applets/kdictapplet.desktop
-%{_datadir}/icons/hicolor/*/apps/kdict.*
-%{tde_docdir}/HTML/en/kdict
+%{tde_bindir}/kdict
+%{tde_tdelibdir}/kdict.*
+%{tde_tdelibdir}/kdict_panelapplet.*
+%{tde_libdir}/libkdeinit_kdict.*
+%{tde_tdeappdir}/kdict.desktop
+%{tde_datadir}/apps/kdict
+%{tde_datadir}/apps/kicker/applets/kdictapplet.desktop
+%{tde_datadir}/icons/hicolor/*/apps/kdict.*
+%{tde_tdedocdir}/HTML/en/kdict
 
 %post -n trinity-kdict
 for f in hicolor ; do
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 update-desktop-database 2> /dev/null || : 
 
 %postun -n trinity-kdict
 for f in hicolor ; do
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 update-desktop-database 2> /dev/null || : 
 
@@ -291,15 +323,18 @@ update-desktop-database 2> /dev/null || :
 Summary:		Torrent metainfo plugin for Trinity
 Group:			Applications/Internet
 
+Obsoletes:		tdenetwork-kfile-plugins < %{version}-%{release}
+Provides:		tdenetwork-kfile-plugins = %{version}-%{release}
+
 %description kfile-plugins
 This package provides a metainformation plugin for bittorrent files.
 TDE uses kfile-plugins to provide metainfo tab in the files properties
 dialog in konqueror and other file-handling applications.
 
 %files kfile-plugins
-%{tde_libdir}/kfile_torrent.la
-%{tde_libdir}/kfile_torrent.so
-%{_datadir}/services/kfile_torrent.desktop
+%{tde_tdelibdir}/kfile_torrent.la
+%{tde_tdelibdir}/kfile_torrent.so
+%{tde_datadir}/services/kfile_torrent.desktop
 
 %post kfile-plugins
 update-desktop-database 2> /dev/null || : 
@@ -323,33 +358,33 @@ applications and Netscape.
 
 %files -n trinity-kget
 %defattr(-,root,root,-)
-%{_bindir}/kget
-%{tde_libdir}/khtml_kget.la
-%{tde_libdir}/khtml_kget.so
-%{tde_appdir}/kget.desktop
-%{_datadir}/apps/kget
-%{_datadir}/apps/khtml/kpartplugins/kget_plug_in.desktop
-%{_datadir}/apps/khtml/kpartplugins/kget_plug_in.rc
-%{_datadir}/apps/konqueror/servicemenus/kget_download.desktop
-%{_datadir}/icons/crystalsvg/*/actions/khtml_kget.png
-%{_datadir}/icons/crystalsvg/*/apps/kget.png
-%{_datadir}/icons/crystalsvg/*/mimetypes/kget_list.png
-%{_datadir}/mimelnk/application/x-kgetlist.desktop
-%{_datadir}/sounds/KGet_Added.ogg
-%{_datadir}/sounds/KGet_Finished.ogg
-%{_datadir}/sounds/KGet_Finished_All.ogg
-%{_datadir}/sounds/KGet_Started.ogg
-%{tde_docdir}/HTML/en/kget
+%{tde_bindir}/kget
+%{tde_tdelibdir}/khtml_kget.la
+%{tde_tdelibdir}/khtml_kget.so
+%{tde_tdeappdir}/kget.desktop
+%{tde_datadir}/apps/kget
+%{tde_datadir}/apps/khtml/kpartplugins/kget_plug_in.desktop
+%{tde_datadir}/apps/khtml/kpartplugins/kget_plug_in.rc
+%{tde_datadir}/apps/konqueror/servicemenus/kget_download.desktop
+%{tde_datadir}/icons/crystalsvg/*/actions/khtml_kget.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kget.png
+%{tde_datadir}/icons/crystalsvg/*/mimetypes/kget_list.png
+%{tde_datadir}/mimelnk/application/x-kgetlist.desktop
+%{tde_datadir}/sounds/KGet_Added.ogg
+%{tde_datadir}/sounds/KGet_Finished.ogg
+%{tde_datadir}/sounds/KGet_Finished_All.ogg
+%{tde_datadir}/sounds/KGet_Started.ogg
+%{tde_tdedocdir}/HTML/en/kget
 
 %post -n trinity-kget
 for f in crystalsvg ; do
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 update-desktop-database 2> /dev/null || : 
 
 %postun -n trinity-kget
 for f in crystalsvg ; do
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 update-desktop-database 2> /dev/null || : 
 
@@ -368,30 +403,30 @@ good news sources which provide such files.
 
 %files -n trinity-knewsticker
 %defattr(-,root,root,-)
-%{_bindir}/knewstickerstub
-%{tde_libdir}/knewsticker_panelapplet.la
-%{tde_libdir}/knewsticker_panelapplet.so
-%{tde_libdir}/kntsrcfilepropsdlg.la
-%{tde_libdir}/kntsrcfilepropsdlg.so
-%{tde_appdir}/knewsticker-standalone.desktop
-%{_datadir}/applnk/.hidden/knewstickerstub.desktop
-%{_datadir}/apps/kconf_update/knewsticker.upd
-%{_datadir}/apps/kconf_update/knt-0.1-0.2.pl
-%{_datadir}/apps/kicker/applets/knewsticker.desktop
-%{_datadir}/apps/knewsticker/eventsrc
-%{_datadir}/icons/hicolor/*/apps/knewsticker.png
-%{_datadir}/services/kntsrcfilepropsdlg.desktop
-%{tde_docdir}/HTML/en/knewsticker
+%{tde_bindir}/knewstickerstub
+%{tde_tdelibdir}/knewsticker_panelapplet.la
+%{tde_tdelibdir}/knewsticker_panelapplet.so
+%{tde_tdelibdir}/kntsrcfilepropsdlg.la
+%{tde_tdelibdir}/kntsrcfilepropsdlg.so
+%{tde_tdeappdir}/knewsticker-standalone.desktop
+%{tde_datadir}/applnk/.hidden/knewstickerstub.desktop
+%{tde_datadir}/apps/kconf_update/knewsticker.upd
+%{tde_datadir}/apps/kconf_update/knt-0.1-0.2.pl
+%{tde_datadir}/apps/kicker/applets/knewsticker.desktop
+%{tde_datadir}/apps/knewsticker/eventsrc
+%{tde_datadir}/icons/hicolor/*/apps/knewsticker.png
+%{tde_datadir}/services/kntsrcfilepropsdlg.desktop
+%{tde_tdedocdir}/HTML/en/knewsticker
 
 %post -n trinity-knewsticker
 for f in hicolor ; do
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 update-desktop-database 2> /dev/null || : 
 
 %postun -n trinity-knewsticker
 for f in hicolor ; do
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 update-desktop-database 2> /dev/null || : 
 
@@ -427,156 +462,156 @@ Support for more IM protocols can be added through a plugin system.
 %files -n trinity-kopete
 %defattr(-,root,root,-)
 # nowlistening support
-%exclude %{_datadir}/apps/kopete/*nowlisteningchatui*
-%exclude %{_datadir}/apps/kopete/*nowlisteningui*
-%exclude %{_datadir}/config.kcfg/nowlisteningconfig.kcfg
-%exclude %{_datadir}/services/kconfiguredialog/*nowlistening*
-%exclude %{_datadir}/services/*nowlistening*
-%exclude %{tde_libdir}/*nowlistening*
+%exclude %{tde_datadir}/apps/kopete/*nowlisteningchatui*
+%exclude %{tde_datadir}/apps/kopete/*nowlisteningui*
+%exclude %{tde_datadir}/config.kcfg/nowlisteningconfig.kcfg
+%exclude %{tde_datadir}/services/kconfiguredialog/*nowlistening*
+%exclude %{tde_datadir}/services/*nowlistening*
+%exclude %{tde_tdelibdir}/*nowlistening*
 # Main kopete package
-%{_bindir}/kopete
-%{_bindir}/kopete_latexconvert.sh
-%{_libdir}/kconf_update_bin/kopete_account_kconf_update
-%{_libdir}/kconf_update_bin/kopete_nameTracking_kconf_update
-%{_libdir}/kconf_update_bin/kopete_pluginloader2_kconf_update
-%{tde_libdir}/kcm_kopete_*.so
-%{tde_libdir}/kcm_kopete_*.la
-%{tde_libdir}/kio_jabberdisco.la
-%{tde_libdir}/kio_jabberdisco.so
-%{tde_libdir}/kopete_*.la
-%{tde_libdir}/kopete_*.so
-%{tde_libdir}/libkrichtexteditpart.la
-%{tde_libdir}/libkrichtexteditpart.so
-%{_libdir}/libkopete_msn_shared.so.*
-%{_libdir}/libkopete_oscar.so.*
-%{_libdir}/libkopete.so.*
-%{_libdir}/libkopete_videodevice.so.*
-%{tde_appdir}/kopete.desktop
-%{_datadir}/apps/kconf_update/kopete-*
-%{_datadir}/apps/kopete
-%{_datadir}/apps/kopete_*/*.rc
-%{_datadir}/apps/kopeterichtexteditpart/kopeterichtexteditpartfull.rc
-%{_datadir}/config.kcfg/historyconfig.kcfg
-%{_datadir}/config.kcfg/kopeteidentityconfigpreferences.kcfg
-%{_datadir}/config.kcfg/kopete.kcfg
-%{_datadir}/config.kcfg/latexconfig.kcfg
-%{_datadir}/icons/crystalsvg/*/actions/voicecall.png
-%{_datadir}/icons/crystalsvg/*/actions/webcamreceive.png
-%{_datadir}/icons/crystalsvg/*/actions/webcamsend.png
-%{_datadir}/icons/crystalsvg/*/actions/account_offline_overlay.png
-%{_datadir}/icons/crystalsvg/*/actions/add_user.png
-%{_datadir}/icons/crystalsvg/*/actions/contact_away_overlay.png
-%{_datadir}/icons/crystalsvg/*/actions/contact_busy_overlay.png
-%{_datadir}/icons/crystalsvg/*/actions/contact_food_overlay.png
-%{_datadir}/icons/crystalsvg/*/actions/contact_invisible_overlay.png
-%{_datadir}/icons/crystalsvg/*/actions/contact_phone_overlay.png
-%{_datadir}/icons/crystalsvg/*/actions/contact_xa_overlay.png
-%{_datadir}/icons/crystalsvg/*/actions/delete_user.png
-%{_datadir}/icons/crystalsvg/*/actions/edit_user.png
-%{_datadir}/icons/crystalsvg/*/actions/emoticon.png
-%{_datadir}/icons/crystalsvg/*/actions/jabber_away.png
-%{_datadir}/icons/crystalsvg/*/actions/jabber_chatty.png
-#%{_datadir}/icons/crystalsvg/*/actions/jabber_connecting.mng
-%{_datadir}/icons/crystalsvg/*/actions/jabber_group.png
-%{_datadir}/icons/crystalsvg/*/actions/jabber_invisible.png
-%{_datadir}/icons/crystalsvg/*/actions/jabber_na.png
-%{_datadir}/icons/crystalsvg/*/actions/jabber_offline.png
-%{_datadir}/icons/crystalsvg/*/actions/jabber_online.png
-%{_datadir}/icons/crystalsvg/*/actions/jabber_original.png
-%{_datadir}/icons/crystalsvg/*/actions/jabber_raw.png
-%{_datadir}/icons/crystalsvg/*/actions/jabber_serv_off.png
-%{_datadir}/icons/crystalsvg/*/actions/jabber_serv_on.png
-%{_datadir}/icons/crystalsvg/*/actions/jabber_xa.png
-%{_datadir}/icons/crystalsvg/*/actions/kopeteavailable.png
-%{_datadir}/icons/crystalsvg/*/actions/kopeteaway.png
-%{_datadir}/icons/crystalsvg/*/actions/kopeteeditstatusmessage.png
-%{_datadir}/icons/crystalsvg/*/actions/kopetestatusmessage.png
-%{_datadir}/icons/crystalsvg/*/actions/metacontact_away.png
-%{_datadir}/icons/crystalsvg/*/actions/metacontact_offline.png
-%{_datadir}/icons/crystalsvg/*/actions/metacontact_online.png
-%{_datadir}/icons/crystalsvg/*/actions/metacontact_unknown.png
-%{_datadir}/icons/crystalsvg/*/actions/newmsg.png
-%{_datadir}/icons/crystalsvg/*/actions/search_user.png
-%{_datadir}/icons/crystalsvg/*/actions/show_offliners.png
-%{_datadir}/icons/crystalsvg/*/actions/status_unknown_overlay.png
-%{_datadir}/icons/crystalsvg/*/actions/status_unknown.png
-%{_datadir}/icons/crystalsvg/*/apps/jabber_gateway_aim.png
-%{_datadir}/icons/crystalsvg/*/apps/jabber_gateway_gadu.png
-%{_datadir}/icons/crystalsvg/*/apps/jabber_gateway_http-ws.png
-%{_datadir}/icons/crystalsvg/*/apps/jabber_gateway_icq.png
-%{_datadir}/icons/crystalsvg/*/apps/jabber_gateway_irc.png
-%{_datadir}/icons/crystalsvg/*/apps/jabber_gateway_msn.png
-%{_datadir}/icons/crystalsvg/*/apps/jabber_gateway_qq.png
-%{_datadir}/icons/crystalsvg/*/apps/jabber_gateway_smtp.png
-%{_datadir}/icons/crystalsvg/*/apps/jabber_gateway_tlen.png
-%{_datadir}/icons/crystalsvg/*/apps/jabber_gateway_yahoo.png
-%{_datadir}/icons/crystalsvg/*/apps/jabber_protocol.png
-%{_datadir}/icons/crystalsvg/*/apps/kopete_all_away.png
-%{_datadir}/icons/crystalsvg/*/apps/kopete_offline.png
-%{_datadir}/icons/crystalsvg/*/apps/kopete_some_away.png
-%{_datadir}/icons/crystalsvg/*/apps/kopete_some_online.png
-%{_datadir}/icons/crystalsvg/*/mimetypes/kopete_emoticons.png
-%{_datadir}/icons/crystalsvg/scalable/actions/account_offline_overlay.svgz
-%{_datadir}/icons/hicolor/*/apps/kopete.png
-%{_datadir}/icons/hicolor/*/actions/emoticon.png
-%{_datadir}/icons/hicolor/*/actions/jabber_away.png
-%{_datadir}/icons/hicolor/*/actions/jabber_chatty.png
-#%{_datadir}/icons/hicolor/*/actions/jabber_connecting.mng
-%{_datadir}/icons/hicolor/*/actions/jabber_group.png
-%{_datadir}/icons/hicolor/*/actions/jabber_invisible.png
-%{_datadir}/icons/hicolor/*/actions/jabber_na.png
-%{_datadir}/icons/hicolor/*/actions/jabber_offline.png
-%{_datadir}/icons/hicolor/*/actions/jabber_online.png
-%{_datadir}/icons/hicolor/*/actions/jabber_original.png
-%{_datadir}/icons/hicolor/*/actions/jabber_raw.png
-%{_datadir}/icons/hicolor/*/actions/jabber_serv_off.png
-%{_datadir}/icons/hicolor/*/actions/jabber_serv_on.png
-%{_datadir}/icons/hicolor/*/actions/jabber_xa.png
-%{_datadir}/icons/hicolor/*/actions/kopeteavailable.png
-%{_datadir}/icons/hicolor/*/actions/kopeteaway.png
-%{_datadir}/icons/hicolor/*/actions/newmsg.png
-%{_datadir}/icons/hicolor/*/actions/status_unknown_overlay.png
-%{_datadir}/icons/hicolor/*/actions/status_unknown.png
-%{_datadir}/icons/hicolor/*/apps/jabber_protocol.png
-%{_datadir}/icons/hicolor/scalable/apps/kopete2.svgz
-%{_datadir}/mimelnk/application/x-icq.desktop
-%{_datadir}/mimelnk/application/x-kopete-emoticons.desktop
-%{_datadir}/services/aim.protocol
-%{_datadir}/services/chatwindow.desktop
-%{_datadir}/services/emailwindow.desktop
-#%{_datadir}/services/irc.protocol /opt/trinity/share/apps/kopete/
-%{_datadir}/services/jabberdisco.protocol
-%{_datadir}/services/kconfiguredialog/kopete_*.desktop
-%{_datadir}/services/kopete_*.desktop
-%{_datadir}/icons/crystalsvg/16x16/apps/jabber_gateway_sms.png
-%{_datadir}/servicetypes/kopete*.desktop
-%{_datadir}/sounds/Kopete_*.ogg
-%{tde_docdir}/HTML/en/kopete
+%{tde_bindir}/kopete
+%{tde_bindir}/kopete_latexconvert.sh
+%{tde_libdir}/kconf_update_bin/kopete_account_kconf_update
+%{tde_libdir}/kconf_update_bin/kopete_nameTracking_kconf_update
+%{tde_libdir}/kconf_update_bin/kopete_pluginloader2_kconf_update
+%{tde_tdelibdir}/kcm_kopete_*.so
+%{tde_tdelibdir}/kcm_kopete_*.la
+%{tde_tdelibdir}/kio_jabberdisco.la
+%{tde_tdelibdir}/kio_jabberdisco.so
+%{tde_tdelibdir}/kopete_*.la
+%{tde_tdelibdir}/kopete_*.so
+%{tde_tdelibdir}/libkrichtexteditpart.la
+%{tde_tdelibdir}/libkrichtexteditpart.so
+%{tde_libdir}/libkopete_msn_shared.so.*
+%{tde_libdir}/libkopete_oscar.so.*
+%{tde_libdir}/libkopete.so.*
+%{tde_libdir}/libkopete_videodevice.so.*
+%{tde_tdeappdir}/kopete.desktop
+%{tde_datadir}/apps/kconf_update/kopete-*
+%{tde_datadir}/apps/kopete
+%{tde_datadir}/apps/kopete_*/*.rc
+%{tde_datadir}/apps/kopeterichtexteditpart/kopeterichtexteditpartfull.rc
+%{tde_datadir}/config.kcfg/historyconfig.kcfg
+%{tde_datadir}/config.kcfg/kopeteidentityconfigpreferences.kcfg
+%{tde_datadir}/config.kcfg/kopete.kcfg
+%{tde_datadir}/config.kcfg/latexconfig.kcfg
+%{tde_datadir}/icons/crystalsvg/*/actions/voicecall.png
+%{tde_datadir}/icons/crystalsvg/*/actions/webcamreceive.png
+%{tde_datadir}/icons/crystalsvg/*/actions/webcamsend.png
+%{tde_datadir}/icons/crystalsvg/*/actions/account_offline_overlay.png
+%{tde_datadir}/icons/crystalsvg/*/actions/add_user.png
+%{tde_datadir}/icons/crystalsvg/*/actions/contact_away_overlay.png
+%{tde_datadir}/icons/crystalsvg/*/actions/contact_busy_overlay.png
+%{tde_datadir}/icons/crystalsvg/*/actions/contact_food_overlay.png
+%{tde_datadir}/icons/crystalsvg/*/actions/contact_invisible_overlay.png
+%{tde_datadir}/icons/crystalsvg/*/actions/contact_phone_overlay.png
+%{tde_datadir}/icons/crystalsvg/*/actions/contact_xa_overlay.png
+%{tde_datadir}/icons/crystalsvg/*/actions/delete_user.png
+%{tde_datadir}/icons/crystalsvg/*/actions/edit_user.png
+%{tde_datadir}/icons/crystalsvg/*/actions/emoticon.png
+%{tde_datadir}/icons/crystalsvg/*/actions/jabber_away.png
+%{tde_datadir}/icons/crystalsvg/*/actions/jabber_chatty.png
+#%{tde_datadir}/icons/crystalsvg/*/actions/jabber_connecting.mng
+%{tde_datadir}/icons/crystalsvg/*/actions/jabber_group.png
+%{tde_datadir}/icons/crystalsvg/*/actions/jabber_invisible.png
+%{tde_datadir}/icons/crystalsvg/*/actions/jabber_na.png
+%{tde_datadir}/icons/crystalsvg/*/actions/jabber_offline.png
+%{tde_datadir}/icons/crystalsvg/*/actions/jabber_online.png
+%{tde_datadir}/icons/crystalsvg/*/actions/jabber_original.png
+%{tde_datadir}/icons/crystalsvg/*/actions/jabber_raw.png
+%{tde_datadir}/icons/crystalsvg/*/actions/jabber_serv_off.png
+%{tde_datadir}/icons/crystalsvg/*/actions/jabber_serv_on.png
+%{tde_datadir}/icons/crystalsvg/*/actions/jabber_xa.png
+%{tde_datadir}/icons/crystalsvg/*/actions/kopeteavailable.png
+%{tde_datadir}/icons/crystalsvg/*/actions/kopeteaway.png
+%{tde_datadir}/icons/crystalsvg/*/actions/kopeteeditstatusmessage.png
+%{tde_datadir}/icons/crystalsvg/*/actions/kopetestatusmessage.png
+%{tde_datadir}/icons/crystalsvg/*/actions/metacontact_away.png
+%{tde_datadir}/icons/crystalsvg/*/actions/metacontact_offline.png
+%{tde_datadir}/icons/crystalsvg/*/actions/metacontact_online.png
+%{tde_datadir}/icons/crystalsvg/*/actions/metacontact_unknown.png
+%{tde_datadir}/icons/crystalsvg/*/actions/newmsg.png
+%{tde_datadir}/icons/crystalsvg/*/actions/search_user.png
+%{tde_datadir}/icons/crystalsvg/*/actions/show_offliners.png
+%{tde_datadir}/icons/crystalsvg/*/actions/status_unknown_overlay.png
+%{tde_datadir}/icons/crystalsvg/*/actions/status_unknown.png
+%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_aim.png
+%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_gadu.png
+%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_http-ws.png
+%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_icq.png
+%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_irc.png
+%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_msn.png
+%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_qq.png
+%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_smtp.png
+%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_tlen.png
+%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_yahoo.png
+%{tde_datadir}/icons/crystalsvg/*/apps/jabber_protocol.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kopete_all_away.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kopete_offline.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kopete_some_away.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kopete_some_online.png
+%{tde_datadir}/icons/crystalsvg/*/mimetypes/kopete_emoticons.png
+%{tde_datadir}/icons/crystalsvg/scalable/actions/account_offline_overlay.svgz
+%{tde_datadir}/icons/hicolor/*/apps/kopete.png
+%{tde_datadir}/icons/hicolor/*/actions/emoticon.png
+%{tde_datadir}/icons/hicolor/*/actions/jabber_away.png
+%{tde_datadir}/icons/hicolor/*/actions/jabber_chatty.png
+#%{tde_datadir}/icons/hicolor/*/actions/jabber_connecting.mng
+%{tde_datadir}/icons/hicolor/*/actions/jabber_group.png
+%{tde_datadir}/icons/hicolor/*/actions/jabber_invisible.png
+%{tde_datadir}/icons/hicolor/*/actions/jabber_na.png
+%{tde_datadir}/icons/hicolor/*/actions/jabber_offline.png
+%{tde_datadir}/icons/hicolor/*/actions/jabber_online.png
+%{tde_datadir}/icons/hicolor/*/actions/jabber_original.png
+%{tde_datadir}/icons/hicolor/*/actions/jabber_raw.png
+%{tde_datadir}/icons/hicolor/*/actions/jabber_serv_off.png
+%{tde_datadir}/icons/hicolor/*/actions/jabber_serv_on.png
+%{tde_datadir}/icons/hicolor/*/actions/jabber_xa.png
+%{tde_datadir}/icons/hicolor/*/actions/kopeteavailable.png
+%{tde_datadir}/icons/hicolor/*/actions/kopeteaway.png
+%{tde_datadir}/icons/hicolor/*/actions/newmsg.png
+%{tde_datadir}/icons/hicolor/*/actions/status_unknown_overlay.png
+%{tde_datadir}/icons/hicolor/*/actions/status_unknown.png
+%{tde_datadir}/icons/hicolor/*/apps/jabber_protocol.png
+%{tde_datadir}/icons/hicolor/scalable/apps/kopete2.svgz
+%{tde_datadir}/mimelnk/application/x-icq.desktop
+%{tde_datadir}/mimelnk/application/x-kopete-emoticons.desktop
+%{tde_datadir}/services/aim.protocol
+%{tde_datadir}/services/chatwindow.desktop
+%{tde_datadir}/services/emailwindow.desktop
+#%{tde_datadir}/services/irc.protocol /opt/trinity/share/apps/kopete/
+%{tde_datadir}/services/jabberdisco.protocol
+%{tde_datadir}/services/kconfiguredialog/kopete_*.desktop
+%{tde_datadir}/services/kopete_*.desktop
+%{tde_datadir}/icons/crystalsvg/16x16/apps/jabber_gateway_sms.png
+%{tde_datadir}/servicetypes/kopete*.desktop
+%{tde_datadir}/sounds/Kopete_*.ogg
+%{tde_tdedocdir}/HTML/en/kopete
 # jingle support for kopete
-%{_bindir}/relayserver
-%{_bindir}/stunserver
+%{tde_bindir}/relayserver
+%{tde_bindir}/stunserver
 # winpopup support for kopete
-%{_bindir}/winpopup-install.sh
-%{_bindir}/winpopup-send.sh
+%{tde_bindir}/winpopup-install.sh
+%{tde_bindir}/winpopup-send.sh
 # meanwhile protocol support for kopete
-%{tde_libdir}/new_target0.la
-%{tde_libdir}/new_target0.so
+%{tde_tdelibdir}/new_target0.la
+%{tde_tdelibdir}/new_target0.so
 # motionaway plugin for kopete
-%{_datadir}/config.kcfg/motionawayconfig.kcfg
+%{tde_datadir}/config.kcfg/motionawayconfig.kcfg
 # smpp plugin for kopete
-%{_datadir}/config.kcfg/smpppdcs.kcfg
+%{tde_datadir}/config.kcfg/smpppdcs.kcfg
 
 
 %post -n trinity-kopete
 for f in crystalsvg hicolor ; do
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 update-desktop-database 2> /dev/null || : 
 /sbin/ldconfig
 
 %postun -n trinity-kopete
 for f in crystalsvg hicolor ; do
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 update-desktop-database 2> /dev/null || : 
 /sbin/ldconfig
@@ -594,12 +629,12 @@ noatun, kscd, juk, kaffeine and amarok.
 
 %files -n trinity-kopete-nowlistening
 %defattr(-,root,root,-)
-%{_datadir}/apps/kopete/*nowlisteningchatui*
-%{_datadir}/apps/kopete/*nowlisteningui*
-%{_datadir}/config.kcfg/nowlisteningconfig.kcfg
-%{_datadir}/services/kconfiguredialog/*nowlistening*
-%{_datadir}/services/*nowlistening*
-%{tde_libdir}/*nowlistening*
+%{tde_datadir}/apps/kopete/*nowlisteningchatui*
+%{tde_datadir}/apps/kopete/*nowlisteningui*
+%{tde_datadir}/config.kcfg/nowlisteningconfig.kcfg
+%{tde_datadir}/services/kconfiguredialog/*nowlistening*
+%{tde_datadir}/services/*nowlistening*
+%{tde_tdelibdir}/*nowlistening*
 
 ##########
 
@@ -615,21 +650,21 @@ designed to be used for sharing files with friends.
 
 %files -n trinity-kpf
 %defattr(-,root,root,-)
-%{tde_libdir}/kpf*
-%{_datadir}/apps/kicker/applets/kpfapplet.desktop
-%{_datadir}/icons/crystalsvg/*/apps/kpf.*
-%{_datadir}/services/kpfpropertiesdialogplugin.desktop
-%{tde_docdir}/HTML/en/kpf
+%{tde_tdelibdir}/kpf*
+%{tde_datadir}/apps/kicker/applets/kpfapplet.desktop
+%{tde_datadir}/icons/crystalsvg/*/apps/kpf.*
+%{tde_datadir}/services/kpfpropertiesdialogplugin.desktop
+%{tde_tdedocdir}/HTML/en/kpf
 
 %post -n trinity-kpf
 for f in crystalsvg ; do
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 update-desktop-database 2> /dev/null || : 
 
 %postun -n trinity-kpf
 for f in crystalsvg ; do
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 update-desktop-database 2> /dev/null || : 
 
@@ -639,6 +674,11 @@ update-desktop-database 2> /dev/null || :
 Summary:		modem dialer and ppp frontend for Trinity
 Group:			Applications/Internet
 Requires:		ppp
+%if 0%{?rhel} || 0%{?fedora}
+Requires:		usermode-gtk
+%else
+Requires:		usermode
+%endif
 
 %description -n trinity-kppp
 KPPP is a dialer and front end for pppd. It allows for interactive
@@ -653,25 +693,25 @@ track of the time spent online for you.
 %defattr(-,root,root,-)
 %config(noreplace) /etc/security/console.apps/kppp3
 %config(noreplace) /etc/pam.d/kppp3
-%{_bindir}/kppp
-%{_bindir}/kppplogview
-%{_sbindir}/kppp
-%{tde_appdir}/Kppp.desktop
-%{tde_appdir}/kppplogview.desktop
-%{_datadir}/apps/checkrules
-%{_datadir}/apps/kppp
-%{_datadir}/icons/hicolor/*/apps/kppp.png
-%{tde_docdir}/HTML/en/kppp
+%{tde_bindir}/kppp
+%{tde_bindir}/kppplogview
+%{tde_sbindir}/kppp
+%{tde_tdeappdir}/Kppp.desktop
+%{tde_tdeappdir}/kppplogview.desktop
+%{tde_datadir}/apps/checkrules
+%{tde_datadir}/apps/kppp
+%{tde_datadir}/icons/hicolor/*/apps/kppp.png
+%{tde_tdedocdir}/HTML/en/kppp
 
 %post -n trinity-kppp
 for f in hicolor ; do
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 update-desktop-database 2> /dev/null || : 
 
 %postun -n trinity-kppp
 for f in hicolor ; do
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 update-desktop-database 2> /dev/null || : 
 
@@ -689,24 +729,24 @@ Servers using RDP.
 
 %files -n trinity-krdc
 %defattr(-,root,root,-)
-%{_bindir}/krdc
-%{tde_appdir}/krdc.desktop
-%{_datadir}/apps/konqueror/servicemenus/smb2rdc.desktop
-%{_datadir}/apps/krdc
-%{_datadir}/icons/crystalsvg/*/apps/krdc.png
-%{_datadir}/services/rdp.protocol
-%{_datadir}/services/vnc.protocol
-%{tde_docdir}/HTML/en/krdc
+%{tde_bindir}/krdc
+%{tde_tdeappdir}/krdc.desktop
+%{tde_datadir}/apps/konqueror/servicemenus/smb2rdc.desktop
+%{tde_datadir}/apps/krdc
+%{tde_datadir}/icons/crystalsvg/*/apps/krdc.png
+%{tde_datadir}/services/rdp.protocol
+%{tde_datadir}/services/vnc.protocol
+%{tde_tdedocdir}/HTML/en/krdc
 
 %post -n trinity-krdc
 for f in crystalsvg ; do
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 update-desktop-database 2> /dev/null || : 
 
 %postun -n trinity-krdc
 for f in crystalsvg ; do
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 update-desktop-database 2> /dev/null || : 
 
@@ -726,33 +766,33 @@ task.
 
 %files -n trinity-krfb
 %defattr(-,root,root,-)
-%{_bindir}/krfb
-%{_bindir}/krfb_httpd
-%{tde_libdir}/kcm_krfb.la
-%{tde_libdir}/kcm_krfb.so
-%{tde_libdir}/kded_kinetd.la
-%{tde_libdir}/kded_kinetd.so
-%{tde_appdir}/kcmkrfb.desktop
-%{tde_appdir}/krfb.desktop
-%{_datadir}/apps/kinetd/eventsrc
-%{_datadir}/apps/krfb
-%{_datadir}/icons/crystalsvg/*/apps/krfb.png
-%{_datadir}/icons/locolor/*/apps/krfb.png
-%{_datadir}/services/kded/kinetd.desktop
-%{_datadir}/services/kinetd_krfb.desktop
-%{_datadir}/services/kinetd_krfb_httpd.desktop
-%{_datadir}/servicetypes/kinetdmodule.desktop
-%{tde_docdir}/HTML/en/krfb
+%{tde_bindir}/krfb
+%{tde_bindir}/krfb_httpd
+%{tde_tdelibdir}/kcm_krfb.la
+%{tde_tdelibdir}/kcm_krfb.so
+%{tde_tdelibdir}/kded_kinetd.la
+%{tde_tdelibdir}/kded_kinetd.so
+%{tde_tdeappdir}/kcmkrfb.desktop
+%{tde_tdeappdir}/krfb.desktop
+%{tde_datadir}/apps/kinetd/eventsrc
+%{tde_datadir}/apps/krfb
+%{tde_datadir}/icons/crystalsvg/*/apps/krfb.png
+%{tde_datadir}/icons/locolor/*/apps/krfb.png
+%{tde_datadir}/services/kded/kinetd.desktop
+%{tde_datadir}/services/kinetd_krfb.desktop
+%{tde_datadir}/services/kinetd_krfb_httpd.desktop
+%{tde_datadir}/servicetypes/kinetdmodule.desktop
+%{tde_tdedocdir}/HTML/en/krfb
 
 %post -n trinity-krfb
 for f in crystalsvg locolor ; do
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 update-desktop-database 2> /dev/null || : 
 
 %postun -n trinity-krfb
 for f in crystalsvg locolor ; do
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 update-desktop-database 2> /dev/null || : 
 
@@ -771,19 +811,19 @@ recommended package libio-socket-ssl-perl.
 
 %files -n trinity-ksirc
 %defattr(-,root,root,-)
-%{_bindir}/dsirc
-%{_bindir}/ksirc
-%{_libdir}/libkdeinit_ksirc.*
-%{tde_libdir}/ksirc.*
-%{tde_appdir}/ksirc.desktop
-%{_datadir}/apps/ksirc/
-%config(noreplace) %{_datadir}/config/ksircrc
-%{_datadir}/icons/hicolor/*/apps/ksirc.*
-%{tde_docdir}/HTML/??/ksirc/
+%{tde_bindir}/dsirc
+%{tde_bindir}/ksirc
+%{tde_libdir}/libkdeinit_ksirc.*
+%{tde_tdelibdir}/ksirc.*
+%{tde_tdeappdir}/ksirc.desktop
+%{tde_datadir}/apps/ksirc/
+%config(noreplace) %{tde_datadir}/config/ksircrc
+%{tde_datadir}/icons/hicolor/*/apps/ksirc.*
+%{tde_tdedocdir}/HTML/??/ksirc/
 
 %post -n trinity-ksirc
 for f in hicolor ; do
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 update-desktop-database 2> /dev/null || : 
 /sbin/ldconfig
@@ -791,7 +831,7 @@ update-desktop-database 2> /dev/null || :
 
 %postun -n trinity-ksirc
 for f in hicolor ; do
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 update-desktop-database 2> /dev/null || : 
 /sbin/ldconfig
@@ -810,26 +850,26 @@ and shouldn't be run on a multi-user machine.
 
 %files -n trinity-ktalkd
 %defattr(-,root,root,-)
-%{_bindir}/ktalkd*
-%{_bindir}/mail.local
-%{tde_libdir}/kcm_ktalkd.*
-%{tde_appdir}/kcmktalkd.desktop
-%config(noreplace) %{_datadir}/config/ktalkdrc
-%{_datadir}/icons/crystalsvg/*/apps/ktalkd.*
-%{_datadir}/sounds/ktalkd.wav
+%{tde_bindir}/ktalkd*
+%{tde_bindir}/mail.local
+%{tde_tdelibdir}/kcm_ktalkd.*
+%{tde_tdeappdir}/kcmktalkd.desktop
+%config(noreplace) %{tde_datadir}/config/ktalkdrc
+%{tde_datadir}/icons/crystalsvg/*/apps/ktalkd.*
+%{tde_datadir}/sounds/ktalkd.wav
 %config(noreplace) %{_sysconfdir}/xinetd.d/ktalk
-%{tde_docdir}/HTML/en/kcontrol/kcmtalkd
-%{tde_docdir}/HTML/en/ktalkd
+%{tde_tdedocdir}/HTML/en/kcontrol/kcmtalkd
+%{tde_tdedocdir}/HTML/en/ktalkd
 
 %post -n trinity-ktalkd
 for f in crystalsvg ; do
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 update-desktop-database 2> /dev/null || : 
 
 %postun -n trinity-ktalkd
 for f in crystalsvg ; do
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 update-desktop-database 2> /dev/null || : 
 
@@ -850,27 +890,27 @@ wavelan card that uses the wireless extensions interface.
 
 %files -n trinity-kwifimanager
 %defattr(-,root,root,-)
-%{_bindir}/kwifimanager
-%{tde_libdir}/kcm_wifi.*
-%{tde_libdir}/libkwireless.la
-%{tde_libdir}/libkwireless.so
-%{tde_appdir}/kcmwifi.desktop
-%{tde_appdir}/kwifimanager.desktop
-%{_datadir}/apps/kicker/applets/kwireless.desktop
-%{_datadir}/apps/kwifimanager
-%{_datadir}/icons/hicolor/*/apps/kwifimanager.png
-%{_datadir}/icons/hicolor/*/apps/kwifimanager.svgz
-%doc %{tde_docdir}/HTML/en/kwifimanager
+%{tde_bindir}/kwifimanager
+%{tde_tdelibdir}/kcm_wifi.*
+%{tde_tdelibdir}/libkwireless.la
+%{tde_tdelibdir}/libkwireless.so
+%{tde_tdeappdir}/kcmwifi.desktop
+%{tde_tdeappdir}/kwifimanager.desktop
+%{tde_datadir}/apps/kicker/applets/kwireless.desktop
+%{tde_datadir}/apps/kwifimanager
+%{tde_datadir}/icons/hicolor/*/apps/kwifimanager.png
+%{tde_datadir}/icons/hicolor/*/apps/kwifimanager.svgz
+%doc %{tde_tdedocdir}/HTML/en/kwifimanager
 
 %post -n trinity-kwifimanager
 for f in hicolor ; do
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 update-desktop-database 2> /dev/null || : 
 
 %postun -n trinity-kwifimanager
 for f in hicolor ; do
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f}  2> /dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 update-desktop-database 2> /dev/null || : 
 %endif
@@ -888,7 +928,7 @@ automatically when needed.
 
 %files -n trinity-librss
 %defattr(-,root,root,-)
-%{_libdir}/librss.so.*
+%{tde_libdir}/librss.so.*
 
 %post -n trinity-librss
 /sbin/ldconfig
@@ -912,25 +952,25 @@ but relying only on the TCP/IP protocol.
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/lisarc*
 %config(noreplace) %{_initrddir}/lisa
-%{tde_libdir}/kcm_lanbrowser.la
-%{tde_libdir}/kcm_lanbrowser.so
-%{tde_libdir}/kio_lan.la
-%{tde_libdir}/kio_lan.so
-%{_datadir}/applnk/.hidden/kcmkiolan.desktop
-%{_datadir}/applnk/.hidden/kcmlisa.desktop
-%{_datadir}/applnk/.hidden/kcmreslisa.desktop
-%{_datadir}/apps/konqsidebartng/virtual_folders/services/lisa.desktop
-%{_datadir}/apps/konqueror/dirtree/remote/lan.desktop
-%{_datadir}/apps/lisa/README
-%{_datadir}/apps/remoteview/lan.desktop
-%{tde_docdir}/HTML/en/kcontrol/lanbrowser/common
-%{tde_docdir}/HTML/en/kcontrol/lanbrowser/index.cache.bz2
-%{tde_docdir}/HTML/en/kcontrol/lanbrowser/index.docbook
-%{tde_docdir}/HTML/en/lisa
-%{_datadir}/services/lan.protocol
-%{_datadir}/services/rlan.protocol
-%{_bindir}/lisa
-%{_bindir}/reslisa
+%{tde_tdelibdir}/kcm_lanbrowser.la
+%{tde_tdelibdir}/kcm_lanbrowser.so
+%{tde_tdelibdir}/kio_lan.la
+%{tde_tdelibdir}/kio_lan.so
+%{tde_datadir}/applnk/.hidden/kcmkiolan.desktop
+%{tde_datadir}/applnk/.hidden/kcmlisa.desktop
+%{tde_datadir}/applnk/.hidden/kcmreslisa.desktop
+%{tde_datadir}/apps/konqsidebartng/virtual_folders/services/lisa.desktop
+%{tde_datadir}/apps/konqueror/dirtree/remote/lan.desktop
+%{tde_datadir}/apps/lisa/README
+%{tde_datadir}/apps/remoteview/lan.desktop
+%{tde_tdedocdir}/HTML/en/kcontrol/lanbrowser/common
+%{tde_tdedocdir}/HTML/en/kcontrol/lanbrowser/index.cache.bz2
+%{tde_tdedocdir}/HTML/en/kcontrol/lanbrowser/index.docbook
+%{tde_tdedocdir}/HTML/en/lisa
+%{tde_datadir}/services/lan.protocol
+%{tde_datadir}/services/rlan.protocol
+%{tde_bindir}/lisa
+%{tde_bindir}/reslisa
 
 %post -n trinity-lisa
 /sbin/chkconfig --add lisa ||:
@@ -957,21 +997,21 @@ A kioslave and kded module that provide Zeroconf support. Try
 
 %files -n trinity-kdnssd
 %defattr(-,root,root,-)
-%{_datadir}/services/zeroconf.protocol
-%{_datadir}/services/invitation.protocol
-%{_datadir}/services/kded/dnssdwatcher.desktop
-%{_datadir}/apps/remoteview/zeroconf.desktop
-%{_datadir}/apps/zeroconf/_http._tcp
-%{_datadir}/apps/zeroconf/_ftp._tcp
-%{_datadir}/apps/zeroconf/_ldap._tcp
-%{_datadir}/apps/zeroconf/_webdav._tcp
-%{_datadir}/apps/zeroconf/_nfs._tcp
-%{_datadir}/apps/zeroconf/_ssh._tcp
-%{_datadir}/apps/zeroconf/_rfb._tcp
-%{tde_libdir}/kio_zeroconf.so
-%{tde_libdir}/kio_zeroconf.la
-%{tde_libdir}/kded_dnssdwatcher.so
-%{tde_libdir}/kded_dnssdwatcher.la
+%{tde_datadir}/services/zeroconf.protocol
+%{tde_datadir}/services/invitation.protocol
+%{tde_datadir}/services/kded/dnssdwatcher.desktop
+%{tde_datadir}/apps/remoteview/zeroconf.desktop
+%{tde_datadir}/apps/zeroconf/_http._tcp
+%{tde_datadir}/apps/zeroconf/_ftp._tcp
+%{tde_datadir}/apps/zeroconf/_ldap._tcp
+%{tde_datadir}/apps/zeroconf/_webdav._tcp
+%{tde_datadir}/apps/zeroconf/_nfs._tcp
+%{tde_datadir}/apps/zeroconf/_ssh._tcp
+%{tde_datadir}/apps/zeroconf/_rfb._tcp
+%{tde_tdelibdir}/kio_zeroconf.so
+%{tde_tdelibdir}/kio_zeroconf.la
+%{tde_tdelibdir}/kded_dnssdwatcher.so
+%{tde_tdelibdir}/kded_dnssdwatcher.la
 
 %post -n trinity-kdnssd
 update-desktop-database 2> /dev/null || : 
@@ -995,6 +1035,9 @@ update-desktop-database 2> /dev/null || :
 %patch15 -p1
 %patch17 -p1
 %patch18 -p1
+%patch19 -p1
+%patch20 -p1
+%patch21 -p1
 
 
 # TDE 3.5.13: missing 'dummy.cpp' in MSN protocol
@@ -1002,14 +1045,18 @@ update-desktop-database 2> /dev/null || :
 
 %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}"
+
+%{?!mgaversion:%__mkdir build; cd build}
 
-%__mkdir build
-cd build
 %cmake \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
   -DWITH_JINGLE=ON \
   -DWITH_SPEEX=ON \
   -DWITH_WEBCAM=ON \
@@ -1020,19 +1067,17 @@ cd build
   -DBUILD_KOPETE_PLUGIN_ALL=ON \
   ..
 
-# kdenetwork building is not SMP safe
-%__make 
+# Tdenetwork is not smp safe !
+%__make
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot} -C build
 
 
 ## File lists
-# locale's
-%find_lang %{name} || touch %{name}.lang
 # HTML (1.0)
 HTML_DIR=$(kde-config --expandvars --install html)
 if [ -d %{buildroot}$HTML_DIR ]; then
@@ -1053,20 +1098,20 @@ fi
 # Show only in KDE, FIXME, need to re-evaluate these -- Rex
 for i in fileshare kcmkrfb kcmktalkd kcmwifi krfb kppp kppplogview \
    kwifimanager kget knewsticker ksirc kdict ; do
-   if [ -f %{buildroot}%{_datadir}/applications/kde/$i.desktop ] ; then
-      echo "OnlyShowIn=KDE;" >> %{buildroot}%{_datadir}/applications/kde/$i.desktop
+   if [ -f %{buildroot}%{tde_datadir}/applications/kde/$i.desktop ] ; then
+      echo "OnlyShowIn=KDE;" >> %{buildroot}%{tde_datadir}/applications/kde/$i.desktop
    fi
 done
 
 # Run kppp through consolehelper
 install -p -m644 -D %{SOURCE1} %{buildroot}/etc/pam.d/kppp3
-mkdir -p %{buildroot}%{_sbindir}
-mv %{buildroot}%{_bindir}/kppp %{buildroot}%{_sbindir}
-ln -s /usr/bin/consolehelper %{buildroot}%{_bindir}/kppp
+mkdir -p %{buildroot}%{tde_sbindir}
+mv %{buildroot}%{tde_bindir}/kppp %{buildroot}%{tde_sbindir}
+ln -s /usr/bin/consolehelper %{buildroot}%{tde_bindir}/kppp
 mkdir -p %{buildroot}/etc/security/console.apps
 cat > %{buildroot}/etc/security/console.apps/kppp3 <<EOF
 USER=root
-PROGRAM=%{_sbindir}/kppp
+PROGRAM=%{tde_sbindir}/kppp
 SESSION=true
 EOF
 
@@ -1083,18 +1128,21 @@ EOF
 %endif
 
 # Avoids conflict with trinity-kvirc
-%__mv -f %{buildroot}%{_datadir}/services/irc.protocol %{buildroot}%{_datadir}/apps/kopete/
+%__mv -f %{buildroot}%{tde_datadir}/services/irc.protocol %{buildroot}%{tde_datadir}/apps/kopete/
 
 %clean
 %__rm -rf %{buildroot}
 
 
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING README
-
 
 %changelog
+* Wed Aug 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-6
+- Renames to 'trinity-tdenetwork'
+- Fix html special chars in kopete nowlistening plugin [Bug #944] [Commit #0a2892ed]
+- Fix a fatal error message [Commit #5c988de1]
+- Fix a parallel build bug [Commit #35c41f35]
+- Use libv4l if available, otherwise check for v4l1 headers [Commit #d8cbbab8]
+
 * Sat Jun 16 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5
 - Split single package in multiple packages
 - Removes useless 'Provides'
diff --git a/redhat/kdepim/trinity-kdepim-3.5.13.spec b/redhat/kdepim/trinity-kdepim-3.5.13.spec
index baf732d4d..ad4a29f14 100644
--- a/redhat/kdepim/trinity-kdepim-3.5.13.spec
+++ b/redhat/kdepim/trinity-kdepim-3.5.13.spec
@@ -1,18 +1,25 @@
 # 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: cmake >= 2.8
-%define tde_appdir %{_datadir}/applications/kde
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%define tde_bindir %{_prefix}/bin
+%define tde_datadir %{_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{_prefix}/include
+%define tde_libdir %{_prefix}/%{_lib}
+
+%define tde_tdeappdir %{tde_datadir}/applications/kde
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_docdir}
 
 # KDEPIM specific features
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?mgaversion}
 %define with_gnokii 1
 %else
 %define with_gnokii 0
@@ -25,7 +32,7 @@ BuildRequires: cmake >= 2.8
 
 Name:		trinity-tdepim
 Version:	3.5.13
-Release:	7%{?dist}%{?_variant}
+Release:	8%{?dist}%{?_variant}
 License:	GPL
 Group:		Applications/Productivity
 
@@ -71,11 +78,10 @@ BuildRequires:	libgpg-error-devel
 BuildRequires:	flex
 BuildRequires:	libical-devel
 BuildRequires:	boost-devel
-BuildRequires:	cyrus-sasl-devel
-BuildRequires:	libXcomposite-devel
 BuildRequires:	pcre-devel
 BuildRequires:	glib2-devel
 BuildRequires:	gcc-c++ make
+BuildRequires:	libidn-devel
 
 BuildRequires:	libcaldav-devel
 BuildRequires:	libcarddav-devel
@@ -93,6 +99,14 @@ BuildRequires:	trinity-libcurl-devel
 BuildRequires:	curl-devel
 %endif
 
+%if 0%{?mgaversion}
+BuildRequires:	%{_lib}xcomposite1-devel
+BuildRequires:	%{_lib}sasl2-devel
+%else
+BuildRequires:	libXcomposite-devel
+BuildRequires:	cyrus-sasl-devel
+%endif
+
 Requires:	trinity-libtdepim = %{version}-%{release}
 Requires:	%{name}-kfile-plugins = %{version}-%{release}
 Requires:	%{name}-kio-plugins = %{version}-%{release}
@@ -151,9 +165,14 @@ Obsoletes:	tdepim-devel < %{version}-%{release}
 Provides:	tdepim-devel = %{version}-%{release}
 
 Requires:	%{name} = %{version}-%{release}
+Requires:	trinity-akregator-devel = %{version}-%{release}
 Requires:	trinity-libtdepim-devel = %{version}-%{release}
+Requires:	trinity-kaddressbook-devel = %{version}-%{release}
 Requires:	trinity-karm-devel = %{version}-%{release}
+Requires:	trinity-kmail-devel = %{version}-%{release}
+Requires:	trinity-knode-devel = %{version}-%{release}
 Requires:	trinity-knotes-devel = %{version}-%{release}
+Requires:	trinity-kode-devel = %{version}-%{release}
 Requires:	trinity-kontact-devel = %{version}-%{release}
 Requires:	trinity-korganizer-devel = %{version}-%{release}
 Requires:	trinity-libindex-devel = %{version}-%{release}
@@ -173,7 +192,7 @@ This metapackage includes all development files for TDE PIM.
 It also contains the CMAKE macros.
 
 %files devel
-%{_datadir}/cmake/*
+%{tde_datadir}/cmake/*
 
 ##########
 
@@ -189,55 +208,64 @@ for TDE.  It allows you to quickly browse through hundreds of
 thousands of internet feeds in a quick, efficient, and familiar way.
 
 %files -n trinity-akregator
-%{_bindir}/akregator
-%{tde_libdir}/libakregatorpart.la
-%{tde_libdir}/libakregatorpart.so
-%{tde_libdir}/libakregator_mk4storage_plugin.la
-%{tde_libdir}/libakregator_mk4storage_plugin.so
-%{_libdir}/libakregatorprivate.la
-%{_libdir}/libakregatorprivate.so
-%{_libdir}/libakregatorprivate.so.0
-%{_libdir}/libakregatorprivate.so.0.0.0
-%{tde_appdir}/akregator.desktop
-%{_datadir}/apps/akregator
-%{_datadir}/config.kcfg/akregator.kcfg
-%{_datadir}/config.kcfg/mk4config.kcfg
-%{_datadir}/icons/hicolor/128x128/apps/akregator.png
-%{_datadir}/icons/crystalsvg/16x16/actions/rss_tag.png
-%{_datadir}/icons/crystalsvg/22x22/actions/rss_tag.png
-%{_datadir}/icons/crystalsvg/32x32/actions/rss_tag.png
-%{_datadir}/icons/crystalsvg/48x48/actions/rss_tag.png
-%{_datadir}/icons/crystalsvg/64x64/actions/rss_tag.png
-%{_datadir}/icons/crystalsvg/16x16/apps/akregator_empty.png
-%{_datadir}/icons/hicolor/16x16/apps/akregator.png
-%{_datadir}/icons/hicolor/22x22/apps/akregator.png
-%{_datadir}/icons/hicolor/32x32/apps/akregator.png
-%{_datadir}/icons/hicolor/48x48/apps/akregator.png
-%{_datadir}/icons/hicolor/64x64/apps/akregator.png
-%{_datadir}/icons/hicolor/scalable/apps/akregator.svgz
-%{_datadir}/services/akregator_mk4storage_plugin.desktop
-%{_datadir}/services/akregator_part.desktop
-%{_datadir}/services/feed.protocol
-%{_datadir}/services/kontact/akregatorplugin*.desktop
-%{_datadir}/servicetypes/akregator_plugin.desktop
-%{tde_docdir}/HTML/en/akregator
-%{tde_includedir}/akregator
+%{tde_bindir}/akregator
+%{tde_tdelibdir}/libakregatorpart.la
+%{tde_tdelibdir}/libakregatorpart.so
+%{tde_tdelibdir}/libakregator_mk4storage_plugin.la
+%{tde_tdelibdir}/libakregator_mk4storage_plugin.so
+%{tde_libdir}/libakregatorprivate.so.*
+%{tde_tdeappdir}/akregator.desktop
+%{tde_datadir}/apps/akregator
+%{tde_datadir}/config.kcfg/akregator.kcfg
+%{tde_datadir}/config.kcfg/mk4config.kcfg
+%{tde_datadir}/icons/hicolor/128x128/apps/akregator.png
+%{tde_datadir}/icons/crystalsvg/*/actions/rss_tag.png
+%{tde_datadir}/icons/crystalsvg/16x16/apps/akregator_empty.png
+%{tde_datadir}/icons/hicolor/*/apps/akregator.png
+%{tde_datadir}/icons/hicolor/scalable/apps/akregator.svgz
+%{tde_datadir}/services/akregator_mk4storage_plugin.desktop
+%{tde_datadir}/services/akregator_part.desktop
+%{tde_datadir}/services/feed.protocol
+%{tde_datadir}/services/kontact/akregatorplugin*.desktop
+%{tde_datadir}/servicetypes/akregator_plugin.desktop
+%{tde_tdedocdir}/HTML/en/akregator/
 
 %post -n trinity-akregator
-/sbin/ldconfig
+/sbin/ldconfig || :
 for f in crystalsvg hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %postun -n trinity-akregator
-/sbin/ldconfig
+/sbin/ldconfig || :
 for f in crystalsvg hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-akregator-devel
+Summary:	Development files for trinity-akregator
+Group:		Development/Libraries
+Requires:	trinity-akregator = %{version}-%{release}
+
+%description -n trinity-akregator-devel
+%{summary}
+
+%files -n trinity-akregator-devel
+%{tde_tdeincludedir}/akregator/
+%{tde_libdir}/libakregatorprivate.la
+%{tde_libdir}/libakregatorprivate.so
+
+%post -n trinity-akregator-devel
+/sbin/ldconfig || :
+
+%postun -n trinity-akregator-devel
+/sbin/ldconfig || :
 
 ##########
 
@@ -254,65 +282,81 @@ your contacts to many different locations, including the local file system,
 LDAP servers, and SQL databases.
 
 %files -n trinity-kaddressbook
-%{_bindir}/kabc2mutt
-%{_bindir}/kaddressbook
-%{_bindir}/kabcdistlistupdater
-%{tde_libdir}/kcm_kabconfig.la
-%{tde_libdir}/kcm_kabconfig.so
-%{tde_libdir}/kcm_kabcustomfields.la
-%{tde_libdir}/kcm_kabcustomfields.so
-%{tde_libdir}/kcm_kabldapconfig.la
-%{tde_libdir}/kcm_kabldapconfig.so
-%{tde_libdir}/ldifvcardthumbnail.la
-%{tde_libdir}/ldifvcardthumbnail.so
-%{tde_libdir}/libkaddrbk_*.la
-%{tde_libdir}/libkaddrbk_*.so
-%{tde_libdir}/libkaddressbookpart.la
-%{tde_libdir}/libkaddressbookpart.so
-%{_libdir}/libkabinterfaces.so.*
-%{_libdir}/libkaddressbook.so.*
-%{tde_appdir}/kaddressbook.desktop
-%{_datadir}/apps/kaddressbook
-%{_datadir}/icons/hicolor/*/apps/kaddressbook.png
-%{_datadir}/services/kabconfig.desktop
-%{_datadir}/services/kabcustomfields.desktop
-%{_datadir}/services/kabldapconfig.desktop
-%{_datadir}/services/kaddressbook
-%{_datadir}/services/kontact/kaddressbookplugin.desktop
-%{_datadir}/services/kresources/kabc/imap.desktop
-%{_datadir}/services/ldifvcardthumbnail.desktop
-%{_datadir}/servicetypes/dcopaddressbook.desktop
-%{_datadir}/servicetypes/kaddressbook_contacteditorwidget.desktop
-%{_datadir}/servicetypes/kaddressbookimprotocol.desktop
-%{_datadir}/servicetypes/kaddressbook_extension.desktop
-%{_datadir}/servicetypes/kaddressbook_view.desktop
-%{_datadir}/servicetypes/kaddressbook_xxport.desktop
-%{tde_docdir}/HTML/en/kaddressbook
-%{_datadir}/autostart/kabcdistlistupdater.desktop
-%{tde_includedir}/kaddressbook
-%{tde_includedir}/kabc
-
-# kaddressbook-devel
-%{_libdir}/libkabinterfaces.la
-%{_libdir}/libkabinterfaces.so
-%{_libdir}/libkaddressbook.la
-%{_libdir}/libkaddressbook.so
+%{tde_bindir}/kabc2mutt
+%{tde_bindir}/kaddressbook
+%{tde_bindir}/kabcdistlistupdater
+%{tde_tdelibdir}/kcm_kabconfig.la
+%{tde_tdelibdir}/kcm_kabconfig.so
+%{tde_tdelibdir}/kcm_kabcustomfields.la
+%{tde_tdelibdir}/kcm_kabcustomfields.so
+%{tde_tdelibdir}/kcm_kabldapconfig.la
+%{tde_tdelibdir}/kcm_kabldapconfig.so
+%{tde_tdelibdir}/ldifvcardthumbnail.la
+%{tde_tdelibdir}/ldifvcardthumbnail.so
+%{tde_tdelibdir}/libkaddrbk_*.la
+%{tde_tdelibdir}/libkaddrbk_*.so
+%{tde_tdelibdir}/libkaddressbookpart.la
+%{tde_tdelibdir}/libkaddressbookpart.so
+%{tde_libdir}/libkabinterfaces.so.*
+%{tde_libdir}/libkaddressbook.so.*
+%{tde_tdeappdir}/kaddressbook.desktop
+%{tde_datadir}/apps/kaddressbook
+%{tde_datadir}/icons/hicolor/*/apps/kaddressbook.png
+%{tde_datadir}/services/kabconfig.desktop
+%{tde_datadir}/services/kabcustomfields.desktop
+%{tde_datadir}/services/kabldapconfig.desktop
+%{tde_datadir}/services/kaddressbook
+%{tde_datadir}/services/kontact/kaddressbookplugin.desktop
+%{tde_datadir}/services/kresources/kabc/imap.desktop
+%{tde_datadir}/services/ldifvcardthumbnail.desktop
+%{tde_datadir}/servicetypes/dcopaddressbook.desktop
+%{tde_datadir}/servicetypes/kaddressbook_contacteditorwidget.desktop
+%{tde_datadir}/servicetypes/kaddressbookimprotocol.desktop
+%{tde_datadir}/servicetypes/kaddressbook_extension.desktop
+%{tde_datadir}/servicetypes/kaddressbook_view.desktop
+%{tde_datadir}/servicetypes/kaddressbook_xxport.desktop
+%{tde_tdedocdir}/HTML/en/kaddressbook/
+%{tde_datadir}/autostart/kabcdistlistupdater.desktop
+%{tde_tdeincludedir}/kaddressbook
+%{tde_tdeincludedir}/kabc
 
 %post -n trinity-kaddressbook
-/sbin/ldconfig
+/sbin/ldconfig || :
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %postun -n trinity-kaddressbook
-/sbin/ldconfig
+/sbin/ldconfig || :
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kaddressbook-devel
+Summary:	Development files for trinity-kaddressbook
+Group:		Development/Libraries
+Requires:	trinity-kaddressbook = %{version}-%{release}
+
+%description -n trinity-kaddressbook-devel
+%{summary}
+
+%files -n trinity-kaddressbook-devel
+%{tde_libdir}/libkabinterfaces.la
+%{tde_libdir}/libkabinterfaces.so
+%{tde_libdir}/libkaddressbook.la
+%{tde_libdir}/libkaddressbook.so
+
+%post -n trinity-kaddressbook-devel
+/sbin/ldconfig || :
+
+%postun -n trinity-kaddressbook-devel
+/sbin/ldconfig || :
 
 ##########
 
@@ -337,31 +381,31 @@ from the command line or via DCOP calls from other programs. KAlarm is
 TDE-based, but will also run on other desktops.
 
 %files -n trinity-kalarm
-%{_bindir}/kalarm
-%{_bindir}/kalarmd
-%{tde_appdir}/kalarm.desktop
-%{_datadir}/applnk/.hidden/kalarmd.desktop
-%{_datadir}/applnk/Applications/kalarm.desktop
-%{_datadir}/apps/kalarm
-%{_datadir}/autostart/kalarm.tray.desktop
-%{_datadir}/autostart/kalarmd.autostart.desktop
-%{_datadir}/icons/crystalsvg/*/actions/kalarm.png
-%{_datadir}/icons/hicolor/*/apps/kalarm.png
-%{tde_docdir}/HTML/en/kalarm
+%{tde_bindir}/kalarm
+%{tde_bindir}/kalarmd
+%{tde_tdeappdir}/kalarm.desktop
+%{tde_datadir}/applnk/.hidden/kalarmd.desktop
+%{tde_datadir}/applnk/Applications/kalarm.desktop
+%{tde_datadir}/apps/kalarm
+%{tde_datadir}/autostart/kalarm.tray.desktop
+%{tde_datadir}/autostart/kalarmd.autostart.desktop
+%{tde_datadir}/icons/crystalsvg/*/actions/kalarm.png
+%{tde_datadir}/icons/hicolor/*/apps/kalarm.png
+%{tde_tdedocdir}/HTML/en/kalarm/
 
 %post -n trinity-kalarm
 for f in crystalsvg hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %postun -n trinity-kalarm
 for f in crystalsvg hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 ##########
 
@@ -378,19 +422,19 @@ book to the TDE address book.
 Kandy is aimed at mobile phones with integrated (GSM) modems.
 
 %files -n trinity-kandy
-%{_bindir}/kandy
-%{_bindir}/kandy_client
-%{tde_appdir}/kandy.desktop
-%{_datadir}/applnk/Utilities/kandy.desktop
-%{_datadir}/apps/kandy
-%{_datadir}/config.kcfg/kandy.kcfg
-%{tde_docdir}/HTML/en/kandy
+%{tde_bindir}/kandy
+%{tde_bindir}/kandy_client
+%{tde_tdeappdir}/kandy.desktop
+%{tde_datadir}/applnk/Utilities/kandy.desktop
+%{tde_datadir}/apps/kandy
+%{tde_datadir}/config.kcfg/kandy.kcfg
+%{tde_tdedocdir}/HTML/en/kandy/
 
 %post -n trinity-kandy
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %postun -n trinity-kandy
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 ##########
 
@@ -403,34 +447,34 @@ KArm is a time tracker for busy people who need to keep track of the amount of
 time they spend on various tasks.
 
 %files -n trinity-karm
-%{_bindir}/karm
-%{_libdir}/libkarm.so.*
-%{tde_libdir}/libkarmpart.la
-%{tde_libdir}/libkarmpart.so
-%{tde_appdir}/karm.desktop
-%{_datadir}/applnk/Utilities/karm.desktop
-%{_datadir}/apps/karm
-%{_datadir}/apps/karmpart
-%{_datadir}/icons/hicolor/*/apps/karm.png
-%{_datadir}/services/karm_part.desktop
-%{_datadir}/services/kontact/karmplugin.desktop
-%{tde_docdir}/HTML/en/karm
+%{tde_bindir}/karm
+%{tde_libdir}/libkarm.so.*
+%{tde_tdelibdir}/libkarmpart.la
+%{tde_tdelibdir}/libkarmpart.so
+%{tde_tdeappdir}/karm.desktop
+%{tde_datadir}/applnk/Utilities/karm.desktop
+%{tde_datadir}/apps/karm
+%{tde_datadir}/apps/karmpart
+%{tde_datadir}/icons/hicolor/*/apps/karm.png
+%{tde_datadir}/services/karm_part.desktop
+%{tde_datadir}/services/kontact/karmplugin.desktop
+%{tde_tdedocdir}/HTML/en/karm/
 
 %post -n trinity-karm
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
 done
-/sbin/ldconfig
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+/sbin/ldconfig || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %postun -n trinity-karm
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
 done
-/sbin/ldconfig
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+/sbin/ldconfig || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 ##########
 
@@ -442,14 +486,14 @@ Group:		Development/Libraries
 %{summary}
 
 %files -n trinity-karm-devel
-%{_libdir}/libkarm.so
-%{_libdir}/libkarm.la
+%{tde_libdir}/libkarm.so
+%{tde_libdir}/libkarm.la
 
 %post -n trinity-karm-devel
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 %postun -n trinity-karm-devel
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 ##########
 
@@ -463,12 +507,12 @@ Obsoletes:	tdepim-kfile-plugins < %{version}-%{release}
 File dialog plugins for palm and vcf files.
 
 %files kfile-plugins
-%{tde_libdir}/kfile_ics.la
-%{tde_libdir}/kfile_ics.so
-%{tde_libdir}/kfile_vcf.la
-%{tde_libdir}/kfile_vcf.so
-%{_datadir}/services/kfile_ics.desktop
-%{_datadir}/services/kfile_vcf.desktop
+%{tde_tdelibdir}/kfile_ics.la
+%{tde_tdelibdir}/kfile_ics.so
+%{tde_tdelibdir}/kfile_vcf.la
+%{tde_tdelibdir}/kfile_vcf.so
+%{tde_datadir}/services/kfile_ics.desktop
+%{tde_datadir}/services/kfile_vcf.desktop
 
 ##########
 
@@ -483,25 +527,24 @@ This package includes the pim kioslaves. This includes imap4, sieve,
 and mbox.
 
 %files kio-plugins
-%{tde_libdir}/kio_groupwise.la
-%{tde_libdir}/kio_groupwise.so
-%{tde_libdir}/kio_imap4.la
-%{tde_libdir}/kio_imap4.so
-%{tde_libdir}/kio_mbox.la
-%{tde_libdir}/kio_mbox.so
-%{tde_libdir}/kio_scalix.la
-%{tde_libdir}/kio_scalix.so
-%{tde_libdir}/kio_sieve.la
-%{tde_libdir}/kio_sieve.so
-%{_datadir}/services/groupwise.protocol
-%{_datadir}/services/groupwises.protocol
-%{_datadir}/services/imap4.protocol
-%{_datadir}/services/imaps.protocol
-%{_datadir}/services/mbox.protocol
-%{_datadir}/services/scalix.protocol
-%{_datadir}/services/scalixs.protocol
-%{_datadir}/services/sieve.protocol
-
+%{tde_tdelibdir}/kio_groupwise.la
+%{tde_tdelibdir}/kio_groupwise.so
+%{tde_tdelibdir}/kio_imap4.la
+%{tde_tdelibdir}/kio_imap4.so
+%{tde_tdelibdir}/kio_mbox.la
+%{tde_tdelibdir}/kio_mbox.so
+%{tde_tdelibdir}/kio_scalix.la
+%{tde_tdelibdir}/kio_scalix.so
+%{tde_tdelibdir}/kio_sieve.la
+%{tde_tdelibdir}/kio_sieve.so
+%{tde_datadir}/services/groupwise.protocol
+%{tde_datadir}/services/groupwises.protocol
+%{tde_datadir}/services/imap4.protocol
+%{tde_datadir}/services/imaps.protocol
+%{tde_datadir}/services/mbox.protocol
+%{tde_datadir}/services/scalix.protocol
+%{tde_datadir}/services/scalixs.protocol
+%{tde_datadir}/services/sieve.protocol
 
 ##########
 
@@ -522,105 +565,105 @@ servers. It also includes plugins for features such as blogging and
 tracking feature plans.
 
 %files kresources
-%{tde_libdir}/kcal_caldav.la
-%{tde_libdir}/kcal_caldav.so
-%{tde_libdir}/kcal_groupdav.la
-%{tde_libdir}/kcal_groupdav.so
-%{tde_libdir}/kcal_groupwise.la
-%{tde_libdir}/kcal_groupwise.so
-%{tde_libdir}/kcal_kolab.la
-%{tde_libdir}/kcal_kolab.so
-%{tde_libdir}/kcal_scalix.la
-%{tde_libdir}/kcal_scalix.so
-%{tde_libdir}/kcal_newexchange.la
-%{tde_libdir}/kcal_newexchange.so
-%{tde_libdir}/kcal_resourcefeatureplan.la
-%{tde_libdir}/kcal_resourcefeatureplan.so
-%{tde_libdir}/kcal_slox.la
-%{tde_libdir}/kcal_slox.so
-%{tde_libdir}/kcal_xmlrpc.la
-%{tde_libdir}/kcal_xmlrpc.so
-%{tde_libdir}/knotes_kolab.la
-%{tde_libdir}/knotes_kolab.so
-%{tde_libdir}/knotes_scalix.la
-%{tde_libdir}/knotes_scalix.so
-%{tde_libdir}/knotes_xmlrpc.la
-%{tde_libdir}/knotes_xmlrpc.so
-%{_libdir}/libkabckolab.so.*
-%{_libdir}/libkabcscalix.so.*
-%{_libdir}/libkabc_groupdav.so.*
-%{_libdir}/libkabc_groupwise.so.*
-%{_libdir}/libkabc_newexchange.so.*
-%{_libdir}/libkabc_slox.so.*
-%{_libdir}/libkabc_xmlrpc.so.*
-%{_libdir}/libkcalkolab.so.*
-%{_libdir}/libkcalscalix.so.*
-%{_libdir}/libkcal_caldav.so.*
-%{_libdir}/libkabc_carddav.so.*
-%{_libdir}/libkcal_groupdav.so.*
-%{_libdir}/libkcal_groupwise.so.*
-%{_libdir}/libkcal_newexchange.so.*
-%{_libdir}/libkcal_resourcefeatureplan.so.*
-%{_libdir}/libkcal_slox.so.*
-%{_libdir}/libkcal_xmlrpc.so.*
-%{_libdir}/libkgroupwarebase.so.*
-%{_libdir}/libkgroupwaredav.so.*
-%{_libdir}/libknoteskolab.so.*
-%{_libdir}/libknotesscalix.so.*
-%{_libdir}/libknotes_xmlrpc.so.*
-%{_libdir}/libkslox.so.*
-%{_libdir}/libgwsoap.so.*
-%{_datadir}/services/kresources/kabc/kabc_groupdav.desktop
-%{_datadir}/services/kresources/kabc/kabc_groupwise.desktop
-%{_datadir}/services/kresources/kabc/kabc_newexchange.desktop
-%{_datadir}/services/kresources/kabc/kabc_opengroupware.desktop
-%{_datadir}/services/kresources/kabc/kabc_ox.desktop
-%{_datadir}/services/kresources/kabc/kabc_slox.desktop
-%{_datadir}/services/kresources/kabc/kabc_xmlrpc.desktop
-%{_datadir}/services/kresources/kabc/kolab.desktop
-%{_datadir}/services/kresources/kabc/scalix.desktop
-%{_datadir}/services/kresources/kcal/exchange.desktop
-%{_datadir}/services/kresources/kcal/kcal_caldav.desktop
-%{_datadir}/services/kresources/kabc/kabc_carddav.desktop
-%{_datadir}/services/kresources/kcal/kcal_groupdav.desktop
-%{_datadir}/services/kresources/kcal/kcal_groupwise.desktop
-%{_datadir}/services/kresources/kcal/kcal_newexchange.desktop
-%{_datadir}/services/kresources/kcal/kcal_opengroupware.desktop
-%{_datadir}/services/kresources/kcal/kcal_ox.desktop
-%{_datadir}/services/kresources/kcal/kcal_resourcefeatureplan.desktop
-%{_datadir}/services/kresources/kcal/kcal_slox.desktop
-%{_datadir}/services/kresources/kcal/kcal_xmlrpc.desktop
-%{_datadir}/services/kresources/kcal/kolab.desktop
-%{_datadir}/services/kresources/kcal/scalix.desktop
-%{_datadir}/services/kresources/knotes/knotes_xmlrpc.desktop
-%{_datadir}/services/kresources/knotes/kolabresource.desktop
-%{_datadir}/services/kresources/knotes/scalix.desktop
-
-%{_datadir}/apps/kconf_update/upgrade-resourcetype.pl
-%{_datadir}/apps/kconf_update/kolab-resource.upd
-
-%{tde_libdir}/kabc_carddav.la
-%{tde_libdir}/kabc_carddav.so
-%{tde_libdir}/kabc_groupdav.la
-%{tde_libdir}/kabc_groupdav.so
-%{tde_libdir}/kabc_groupwise.la
-%{tde_libdir}/kabc_groupwise.so
-%{tde_libdir}/kabc_kolab.la
-%{tde_libdir}/kabc_kolab.so
-%{tde_libdir}/kabc_newexchange.la
-%{tde_libdir}/kabc_newexchange.so
-%{tde_libdir}/kabc_scalix.la
-%{tde_libdir}/kabc_scalix.so
-%{tde_libdir}/kabc_slox.la
-%{tde_libdir}/kabc_slox.so
-%{tde_libdir}/kabc_xmlrpc.la
-%{tde_libdir}/kabc_xmlrpc.so
+%{tde_tdelibdir}/kcal_caldav.la
+%{tde_tdelibdir}/kcal_caldav.so
+%{tde_tdelibdir}/kcal_groupdav.la
+%{tde_tdelibdir}/kcal_groupdav.so
+%{tde_tdelibdir}/kcal_groupwise.la
+%{tde_tdelibdir}/kcal_groupwise.so
+%{tde_tdelibdir}/kcal_kolab.la
+%{tde_tdelibdir}/kcal_kolab.so
+%{tde_tdelibdir}/kcal_scalix.la
+%{tde_tdelibdir}/kcal_scalix.so
+%{tde_tdelibdir}/kcal_newexchange.la
+%{tde_tdelibdir}/kcal_newexchange.so
+%{tde_tdelibdir}/kcal_resourcefeatureplan.la
+%{tde_tdelibdir}/kcal_resourcefeatureplan.so
+%{tde_tdelibdir}/kcal_slox.la
+%{tde_tdelibdir}/kcal_slox.so
+%{tde_tdelibdir}/kcal_xmlrpc.la
+%{tde_tdelibdir}/kcal_xmlrpc.so
+%{tde_tdelibdir}/knotes_kolab.la
+%{tde_tdelibdir}/knotes_kolab.so
+%{tde_tdelibdir}/knotes_scalix.la
+%{tde_tdelibdir}/knotes_scalix.so
+%{tde_tdelibdir}/knotes_xmlrpc.la
+%{tde_tdelibdir}/knotes_xmlrpc.so
+%{tde_libdir}/libkabckolab.so.*
+%{tde_libdir}/libkabcscalix.so.*
+%{tde_libdir}/libkabc_groupdav.so.*
+%{tde_libdir}/libkabc_groupwise.so.*
+%{tde_libdir}/libkabc_newexchange.so.*
+%{tde_libdir}/libkabc_slox.so.*
+%{tde_libdir}/libkabc_xmlrpc.so.*
+%{tde_libdir}/libkcalkolab.so.*
+%{tde_libdir}/libkcalscalix.so.*
+%{tde_libdir}/libkcal_caldav.so.*
+%{tde_libdir}/libkabc_carddav.so.*
+%{tde_libdir}/libkcal_groupdav.so.*
+%{tde_libdir}/libkcal_groupwise.so.*
+%{tde_libdir}/libkcal_newexchange.so.*
+%{tde_libdir}/libkcal_resourcefeatureplan.so.*
+%{tde_libdir}/libkcal_slox.so.*
+%{tde_libdir}/libkcal_xmlrpc.so.*
+%{tde_libdir}/libkgroupwarebase.so.*
+%{tde_libdir}/libkgroupwaredav.so.*
+%{tde_libdir}/libknoteskolab.so.*
+%{tde_libdir}/libknotesscalix.so.*
+%{tde_libdir}/libknotes_xmlrpc.so.*
+%{tde_libdir}/libkslox.so.*
+%{tde_libdir}/libgwsoap.so.*
+%{tde_datadir}/services/kresources/kabc/kabc_groupdav.desktop
+%{tde_datadir}/services/kresources/kabc/kabc_groupwise.desktop
+%{tde_datadir}/services/kresources/kabc/kabc_newexchange.desktop
+%{tde_datadir}/services/kresources/kabc/kabc_opengroupware.desktop
+%{tde_datadir}/services/kresources/kabc/kabc_ox.desktop
+%{tde_datadir}/services/kresources/kabc/kabc_slox.desktop
+%{tde_datadir}/services/kresources/kabc/kabc_xmlrpc.desktop
+%{tde_datadir}/services/kresources/kabc/kolab.desktop
+%{tde_datadir}/services/kresources/kabc/scalix.desktop
+%{tde_datadir}/services/kresources/kcal/exchange.desktop
+%{tde_datadir}/services/kresources/kcal/kcal_caldav.desktop
+%{tde_datadir}/services/kresources/kabc/kabc_carddav.desktop
+%{tde_datadir}/services/kresources/kcal/kcal_groupdav.desktop
+%{tde_datadir}/services/kresources/kcal/kcal_groupwise.desktop
+%{tde_datadir}/services/kresources/kcal/kcal_newexchange.desktop
+%{tde_datadir}/services/kresources/kcal/kcal_opengroupware.desktop
+%{tde_datadir}/services/kresources/kcal/kcal_ox.desktop
+%{tde_datadir}/services/kresources/kcal/kcal_resourcefeatureplan.desktop
+%{tde_datadir}/services/kresources/kcal/kcal_slox.desktop
+%{tde_datadir}/services/kresources/kcal/kcal_xmlrpc.desktop
+%{tde_datadir}/services/kresources/kcal/kolab.desktop
+%{tde_datadir}/services/kresources/kcal/scalix.desktop
+%{tde_datadir}/services/kresources/knotes/knotes_xmlrpc.desktop
+%{tde_datadir}/services/kresources/knotes/kolabresource.desktop
+%{tde_datadir}/services/kresources/knotes/scalix.desktop
+
+%{tde_datadir}/apps/kconf_update/upgrade-resourcetype.pl
+%{tde_datadir}/apps/kconf_update/kolab-resource.upd
+
+%{tde_tdelibdir}/kabc_carddav.la
+%{tde_tdelibdir}/kabc_carddav.so
+%{tde_tdelibdir}/kabc_groupdav.la
+%{tde_tdelibdir}/kabc_groupdav.so
+%{tde_tdelibdir}/kabc_groupwise.la
+%{tde_tdelibdir}/kabc_groupwise.so
+%{tde_tdelibdir}/kabc_kolab.la
+%{tde_tdelibdir}/kabc_kolab.so
+%{tde_tdelibdir}/kabc_newexchange.la
+%{tde_tdelibdir}/kabc_newexchange.so
+%{tde_tdelibdir}/kabc_scalix.la
+%{tde_tdelibdir}/kabc_scalix.so
+%{tde_tdelibdir}/kabc_slox.la
+%{tde_tdelibdir}/kabc_slox.so
+%{tde_tdelibdir}/kabc_xmlrpc.la
+%{tde_tdelibdir}/kabc_xmlrpc.so
 
 %post kresources
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 %postun kresources
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 ##########
 
@@ -637,61 +680,61 @@ Obsoletes:	tdepim-kresources-devel < %{version}-%{release}
 %{summary}
 
 %files kresources-devel
-%{_libdir}/libkslox.la
-%{_libdir}/libkslox.so
-%{_libdir}/libkabc_groupdav.la
-%{_libdir}/libkabc_groupdav.so
-%{_libdir}/libkabc_groupwise.la
-%{_libdir}/libkabc_groupwise.so
-%{_libdir}/libgwsoap.la
-%{_libdir}/libgwsoap.so
-%{_libdir}/libkabc_carddav.la
-%{_libdir}/libkabc_carddav.so
-%{_libdir}/libkabc_newexchange.la
-%{_libdir}/libkabc_newexchange.so
-%{_libdir}/libkabc_slox.la
-%{_libdir}/libkabc_slox.so
-%{_libdir}/libkabc_xmlrpc.la
-%{_libdir}/libkabc_xmlrpc.so
-%{_libdir}/libkabckolab.la
-%{_libdir}/libkabckolab.so
-%{_libdir}/libkabcscalix.la
-%{_libdir}/libkabcscalix.so
-%{_libdir}/libkcal_caldav.la
-%{_libdir}/libkcal_caldav.so
-%{_libdir}/libkcal_groupdav.la
-%{_libdir}/libkcal_groupdav.so
-%{_libdir}/libkcal_groupwise.la
-%{_libdir}/libkcal_groupwise.so
-%{_libdir}/libkcal_newexchange.la
-%{_libdir}/libkcal_newexchange.so
-%{_libdir}/libkcal_resourcefeatureplan.la
-%{_libdir}/libkcal_resourcefeatureplan.so
-%{_libdir}/libkcal_slox.la
-%{_libdir}/libkcal_slox.so
-%{_libdir}/libkcal_xmlrpc.la
-%{_libdir}/libkcal_xmlrpc.so
-%{_libdir}/libkcalkolab.la
-%{_libdir}/libkcalkolab.so
-%{_libdir}/libkcalscalix.la
-%{_libdir}/libkcalscalix.so
-%{_libdir}/libkgroupwarebase.la
-%{_libdir}/libkgroupwarebase.so
-%{_libdir}/libkgroupwaredav.la
-%{_libdir}/libkgroupwaredav.so
-%{_libdir}/libknotes_xmlrpc.la
-%{_libdir}/libknotes_xmlrpc.so
-%{_libdir}/libknoteskolab.la
-%{_libdir}/libknoteskolab.so
-%{_libdir}/libknotesscalix.la
-%{_libdir}/libknotesscalix.so
-%{tde_includedir}/kpimprefs.h
+%{tde_libdir}/libkslox.la
+%{tde_libdir}/libkslox.so
+%{tde_libdir}/libkabc_groupdav.la
+%{tde_libdir}/libkabc_groupdav.so
+%{tde_libdir}/libkabc_groupwise.la
+%{tde_libdir}/libkabc_groupwise.so
+%{tde_libdir}/libgwsoap.la
+%{tde_libdir}/libgwsoap.so
+%{tde_libdir}/libkabc_carddav.la
+%{tde_libdir}/libkabc_carddav.so
+%{tde_libdir}/libkabc_newexchange.la
+%{tde_libdir}/libkabc_newexchange.so
+%{tde_libdir}/libkabc_slox.la
+%{tde_libdir}/libkabc_slox.so
+%{tde_libdir}/libkabc_xmlrpc.la
+%{tde_libdir}/libkabc_xmlrpc.so
+%{tde_libdir}/libkabckolab.la
+%{tde_libdir}/libkabckolab.so
+%{tde_libdir}/libkabcscalix.la
+%{tde_libdir}/libkabcscalix.so
+%{tde_libdir}/libkcal_caldav.la
+%{tde_libdir}/libkcal_caldav.so
+%{tde_libdir}/libkcal_groupdav.la
+%{tde_libdir}/libkcal_groupdav.so
+%{tde_libdir}/libkcal_groupwise.la
+%{tde_libdir}/libkcal_groupwise.so
+%{tde_libdir}/libkcal_newexchange.la
+%{tde_libdir}/libkcal_newexchange.so
+%{tde_libdir}/libkcal_resourcefeatureplan.la
+%{tde_libdir}/libkcal_resourcefeatureplan.so
+%{tde_libdir}/libkcal_slox.la
+%{tde_libdir}/libkcal_slox.so
+%{tde_libdir}/libkcal_xmlrpc.la
+%{tde_libdir}/libkcal_xmlrpc.so
+%{tde_libdir}/libkcalkolab.la
+%{tde_libdir}/libkcalkolab.so
+%{tde_libdir}/libkcalscalix.la
+%{tde_libdir}/libkcalscalix.so
+%{tde_libdir}/libkgroupwarebase.la
+%{tde_libdir}/libkgroupwarebase.so
+%{tde_libdir}/libkgroupwaredav.la
+%{tde_libdir}/libkgroupwaredav.so
+%{tde_libdir}/libknotes_xmlrpc.la
+%{tde_libdir}/libknotes_xmlrpc.so
+%{tde_libdir}/libknoteskolab.la
+%{tde_libdir}/libknoteskolab.so
+%{tde_libdir}/libknotesscalix.la
+%{tde_libdir}/libknotesscalix.so
+%{tde_tdeincludedir}/kpimprefs.h
 
 %post kresources-devel
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 %postun kresources-devel
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 ##########
 
@@ -706,38 +749,38 @@ This package contains KDE-based wizards for configuring eGroupware,
 Kolab, and SUSE Linux Openexchange servers.
 
 %files wizards
-%{_bindir}/egroupwarewizard
-%{_bindir}/exchangewizard
-%{_bindir}/groupwarewizard
-%{_bindir}/groupwisewizard
-%{_bindir}/kolabwizard
-%{_bindir}/scalixadmin
-%{_bindir}/scalixwizard
-%{_bindir}/sloxwizard
-%{tde_libdir}/libegroupwarewizard.la
-%{tde_libdir}/libegroupwarewizard.so
-%{tde_libdir}/libexchangewizard.la
-%{tde_libdir}/libexchangewizard.so
-%{tde_libdir}/libgroupwisewizard.la
-%{tde_libdir}/libgroupwisewizard.so
-%{tde_libdir}/libkolabwizard.la
-%{tde_libdir}/libkolabwizard.so
-%{tde_libdir}/libscalixwizard.la
-%{tde_libdir}/libscalixwizard.so
-%{tde_libdir}/libsloxwizard.la
-%{tde_libdir}/libsloxwizard.so
-%{tde_appdir}/groupwarewizard.desktop
-%{_datadir}/config.kcfg/egroupware.kcfg
-%{_datadir}/config.kcfg/groupwise.kcfg
-%{_datadir}/config.kcfg/kolab.kcfg
-%{_datadir}/config.kcfg/scalix.kcfg
-%{_datadir}/config.kcfg/slox.kcfg
+%{tde_bindir}/egroupwarewizard
+%{tde_bindir}/exchangewizard
+%{tde_bindir}/groupwarewizard
+%{tde_bindir}/groupwisewizard
+%{tde_bindir}/kolabwizard
+%{tde_bindir}/scalixadmin
+%{tde_bindir}/scalixwizard
+%{tde_bindir}/sloxwizard
+%{tde_tdelibdir}/libegroupwarewizard.la
+%{tde_tdelibdir}/libegroupwarewizard.so
+%{tde_tdelibdir}/libexchangewizard.la
+%{tde_tdelibdir}/libexchangewizard.so
+%{tde_tdelibdir}/libgroupwisewizard.la
+%{tde_tdelibdir}/libgroupwisewizard.so
+%{tde_tdelibdir}/libkolabwizard.la
+%{tde_tdelibdir}/libkolabwizard.so
+%{tde_tdelibdir}/libscalixwizard.la
+%{tde_tdelibdir}/libscalixwizard.so
+%{tde_tdelibdir}/libsloxwizard.la
+%{tde_tdelibdir}/libsloxwizard.so
+%{tde_tdeappdir}/groupwarewizard.desktop
+%{tde_datadir}/config.kcfg/egroupware.kcfg
+%{tde_datadir}/config.kcfg/groupwise.kcfg
+%{tde_datadir}/config.kcfg/kolab.kcfg
+%{tde_datadir}/config.kcfg/scalix.kcfg
+%{tde_datadir}/config.kcfg/slox.kcfg
 
 %post wizards
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %postun wizards
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 ##########
 
@@ -753,22 +796,22 @@ This package contains a synchronization framework, still under heavy
 development (?).  Kitchensync uses opensync.
 
 %files -n trinity-kitchensync
-%{_bindir}/kitchensync
-%{tde_libdir}/libkitchensyncpart.la
-%{tde_libdir}/libkitchensyncpart.so
-%{_datadir}/apps/kitchensync
-%{_libdir}/libkitchensync.so.*
-%{_libdir}/libqopensync.so.*
-%{tde_appdir}/kitchensync.desktop
-%{_datadir}/icons/hicolor/*/apps/kitchensync.png
+%{tde_bindir}/kitchensync
+%{tde_tdelibdir}/libkitchensyncpart.la
+%{tde_tdelibdir}/libkitchensyncpart.so
+%{tde_datadir}/apps/kitchensync
+%{tde_libdir}/libkitchensync.so.*
+%{tde_libdir}/libqopensync.so.*
+%{tde_tdeappdir}/kitchensync.desktop
+%{tde_datadir}/icons/hicolor/*/apps/kitchensync.png
 
 %post -n trinity-kitchensync
-/sbin/ldconfig
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+/sbin/ldconfig || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %postun -n trinity-kitchensync
-/sbin/ldconfig
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+/sbin/ldconfig || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 %endif
 
 ##########
@@ -785,22 +828,22 @@ Kleopatra is the TDE tool for managing X.509 certificates in the gpgsm
 keybox and for retrieving certificates from LDAP servers.
 
 %files -n trinity-kleopatra
-%{_bindir}/kleopatra
-%{_bindir}/kwatchgnupg
-%{tde_libdir}/kcm_kleopatra.la
-%{tde_libdir}/kcm_kleopatra.so
-%{tde_appdir}/kleopatra_import.desktop
-%{_datadir}/apps/kleopatra
-%{_datadir}/apps/kwatchgnupg
-%{_datadir}/services/kleopatra_config_*.desktop
-%{tde_docdir}/HTML/en/kleopatra
-%{tde_docdir}/HTML/en/kwatchgnupg
+%{tde_bindir}/kleopatra
+%{tde_bindir}/kwatchgnupg
+%{tde_tdelibdir}/kcm_kleopatra.la
+%{tde_tdelibdir}/kcm_kleopatra.so
+%{tde_tdeappdir}/kleopatra_import.desktop
+%{tde_datadir}/apps/kleopatra
+%{tde_datadir}/apps/kwatchgnupg
+%{tde_datadir}/services/kleopatra_config_*.desktop
+%{tde_tdedocdir}/HTML/en/kleopatra/
+%{tde_tdedocdir}/HTML/en/kwatchgnupg/
 
 %post -n trinity-kleopatra
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %postun -n trinity-kleopatra
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 ##########
 
@@ -826,78 +869,95 @@ You need to install %{name}-kio-plugins if you want to use IMAP or
 mbox files, and/or trinity-tdebase-kio-plugins if you want to use POP3.
 
 %files -n trinity-kmail
-%{_datadir}/config/kmail.antispamrc
-%{_datadir}/config/kmail.antivirusrc
-%{_bindir}/kmail
-%{_bindir}/kmail_*.sh
-%{tde_libdir}/kcm_kmail.la
-%{tde_libdir}/kcm_kmail.so
-%{tde_libdir}/libkmail_bodypartformatter_application_octetstream.la
-%{tde_libdir}/libkmail_bodypartformatter_application_octetstream.so
-%{tde_libdir}/libkmail_bodypartformatter_text_calendar.la
-%{tde_libdir}/libkmail_bodypartformatter_text_calendar.so
-%{tde_libdir}/libkmail_bodypartformatter_text_vcard.la
-%{tde_libdir}/libkmail_bodypartformatter_text_vcard.so
-%{tde_libdir}/libkmail_bodypartformatter_text_xdiff.la
-%{tde_libdir}/libkmail_bodypartformatter_text_xdiff.so
-%{tde_libdir}/libkmailpart.la
-%{tde_libdir}/libkmailpart.so
-%{_libdir}/libkmailprivate.la
-%{_libdir}/libkmailprivate.so
-%{tde_appdir}/KMail.desktop
-%{tde_appdir}/kmail_view.desktop
-%{_datadir}/apps/kconf_update/kmail-3.1-update-new-mail-notification-settings.pl
-%{_datadir}/apps/kconf_update/kmail-3.1-use-UOID-for-identities.pl
-%{_datadir}/apps/kconf_update/kmail-3.1.4-dont-use-UOID-0-for-any-identity.pl
-%{_datadir}/apps/kconf_update/kmail-3.2-misc.sh
-%{_datadir}/apps/kconf_update/kmail-3.2-update-loop-on-goto-unread-settings.sh
-%{_datadir}/apps/kconf_update/kmail-3.3-aegypten.pl
-%{_datadir}/apps/kconf_update/kmail-3.3-misc.pl
-%{_datadir}/apps/kconf_update/kmail-3.3-move-identities.pl
-%{_datadir}/apps/kconf_update/kmail-3.3-split-sign-encr-keys.sh
-%{_datadir}/apps/kconf_update/kmail-3.3-use-ID-for-accounts.pl
-%{_datadir}/apps/kconf_update/kmail-3.3b1-misc.pl
-%{_datadir}/apps/kconf_update/kmail-3.4-misc.pl
-%{_datadir}/apps/kconf_update/kmail-3.4.1-update-status-filters.pl
-%{_datadir}/apps/kconf_update/kmail-3.5-trigger-flag-migration.pl
-%{_datadir}/apps/kconf_update/kmail-3.5-filter-icons.pl
-%{_datadir}/apps/kconf_update/kmail-pgpidentity.pl
-%{_datadir}/apps/kconf_update/kmail-upd-identities.pl
-%{_datadir}/apps/kconf_update/kmail.upd
-%{_datadir}/apps/kconf_update/upgrade-signature.pl
-%{_datadir}/apps/kconf_update/upgrade-transport.pl
-%{_datadir}/apps/kmail
-%{_datadir}/config.kcfg/custommimeheader.kcfg
-%{_datadir}/config.kcfg/kmail.kcfg
-%{_datadir}/config.kcfg/customtemplates_kfg.kcfg
-%{_datadir}/config.kcfg/replyphrases.kcfg
-%{_datadir}/config.kcfg/templatesconfiguration_kfg.kcfg
-%{_datadir}/icons/crystalsvg/*/apps/kmaillight.png
-%{_datadir}/icons/hicolor/*/apps/kmail.png
-%{_datadir}/icons/hicolor/scalable/apps/kmail.svgz
-%{_datadir}/services/kmail_config_*.desktop
-%{_datadir}/services/kontact/kmailplugin.desktop
-%{_datadir}/servicetypes/dcopimap.desktop
-%{_datadir}/servicetypes/dcopmail.desktop
-%{tde_docdir}/HTML/en/kmail
-%{tde_includedir}/kmail
-%{tde_includedir}/kmail*.h
+%{tde_datadir}/config/kmail.antispamrc
+%{tde_datadir}/config/kmail.antivirusrc
+%{tde_bindir}/kmail
+%{tde_bindir}/kmail_*.sh
+%{tde_tdelibdir}/kcm_kmail.la
+%{tde_tdelibdir}/kcm_kmail.so
+%{tde_tdelibdir}/libkmail_bodypartformatter_application_octetstream.la
+%{tde_tdelibdir}/libkmail_bodypartformatter_application_octetstream.so
+%{tde_tdelibdir}/libkmail_bodypartformatter_text_calendar.la
+%{tde_tdelibdir}/libkmail_bodypartformatter_text_calendar.so
+%{tde_tdelibdir}/libkmail_bodypartformatter_text_vcard.la
+%{tde_tdelibdir}/libkmail_bodypartformatter_text_vcard.so
+%{tde_tdelibdir}/libkmail_bodypartformatter_text_xdiff.la
+%{tde_tdelibdir}/libkmail_bodypartformatter_text_xdiff.so
+%{tde_tdelibdir}/libkmailpart.la
+%{tde_tdelibdir}/libkmailpart.so
+%{tde_tdeappdir}/KMail.desktop
+%{tde_tdeappdir}/kmail_view.desktop
+%{tde_datadir}/apps/kconf_update/kmail-3.1-update-new-mail-notification-settings.pl
+%{tde_datadir}/apps/kconf_update/kmail-3.1-use-UOID-for-identities.pl
+%{tde_datadir}/apps/kconf_update/kmail-3.1.4-dont-use-UOID-0-for-any-identity.pl
+%{tde_datadir}/apps/kconf_update/kmail-3.2-misc.sh
+%{tde_datadir}/apps/kconf_update/kmail-3.2-update-loop-on-goto-unread-settings.sh
+%{tde_datadir}/apps/kconf_update/kmail-3.3-aegypten.pl
+%{tde_datadir}/apps/kconf_update/kmail-3.3-misc.pl
+%{tde_datadir}/apps/kconf_update/kmail-3.3-move-identities.pl
+%{tde_datadir}/apps/kconf_update/kmail-3.3-split-sign-encr-keys.sh
+%{tde_datadir}/apps/kconf_update/kmail-3.3-use-ID-for-accounts.pl
+%{tde_datadir}/apps/kconf_update/kmail-3.3b1-misc.pl
+%{tde_datadir}/apps/kconf_update/kmail-3.4-misc.pl
+%{tde_datadir}/apps/kconf_update/kmail-3.4.1-update-status-filters.pl
+%{tde_datadir}/apps/kconf_update/kmail-3.5-trigger-flag-migration.pl
+%{tde_datadir}/apps/kconf_update/kmail-3.5-filter-icons.pl
+%{tde_datadir}/apps/kconf_update/kmail-pgpidentity.pl
+%{tde_datadir}/apps/kconf_update/kmail-upd-identities.pl
+%{tde_datadir}/apps/kconf_update/kmail.upd
+%{tde_datadir}/apps/kconf_update/upgrade-signature.pl
+%{tde_datadir}/apps/kconf_update/upgrade-transport.pl
+%{tde_datadir}/apps/kmail
+%{tde_datadir}/config.kcfg/custommimeheader.kcfg
+%{tde_datadir}/config.kcfg/kmail.kcfg
+%{tde_datadir}/config.kcfg/customtemplates_kfg.kcfg
+%{tde_datadir}/config.kcfg/replyphrases.kcfg
+%{tde_datadir}/config.kcfg/templatesconfiguration_kfg.kcfg
+%{tde_datadir}/icons/crystalsvg/*/apps/kmaillight.png
+%{tde_datadir}/icons/hicolor/*/apps/kmail.png
+%{tde_datadir}/icons/hicolor/scalable/apps/kmail.svgz
+%{tde_datadir}/services/kmail_config_*.desktop
+%{tde_datadir}/services/kontact/kmailplugin.desktop
+%{tde_datadir}/servicetypes/dcopimap.desktop
+%{tde_datadir}/servicetypes/dcopmail.desktop
+%{tde_tdedocdir}/HTML/en/kmail/
+%{tde_tdeincludedir}/kmail/
+%{tde_tdeincludedir}/kmail*.h
 
 %post -n trinity-kmail
 for f in crystalsvg hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
 done
-/sbin/ldconfig
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+/sbin/ldconfig || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %postun -n trinity-kmail
 for f in crystalsvg hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
 done
-/sbin/ldconfig
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+/sbin/ldconfig || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kmail-devel
+Summary:	Development files for kmail
+Group:		Development/Libraries
+
+%description -n trinity-kmail-devel
+%{summary}
+
+%files -n trinity-kmail-devel
+%{tde_libdir}/libkmailprivate.la
+%{tde_libdir}/libkmailprivate.so
+
+%post -n trinity-kmail-devel
+/sbin/ldconfig || :
+
+%postun -n trinity-kmail-devel
+/sbin/ldconfig || :
 
 ##########
  
@@ -911,21 +971,21 @@ Converts mail folders to KMail format.  Formats supported for import
 include Outlook Express, Evolution, and plain mbox.
 
 %files -n trinity-kmailcvt
-%{_bindir}/kmailcvt
-%{_datadir}/applnk/Utilities/kmailcvt.desktop
-%{_datadir}/apps/kmailcvt
-%{_datadir}/icons/crystalsvg/*/apps/kmailcvt.png
+%{tde_bindir}/kmailcvt
+%{tde_datadir}/applnk/Utilities/kmailcvt.desktop
+%{tde_datadir}/apps/kmailcvt
+%{tde_datadir}/icons/crystalsvg/*/apps/kmailcvt.png
 
 %post -n trinity-kmailcvt
 for f in crystalsvg ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
 done
 
 %postun -n trinity-kmailcvt
 for f in crystalsvg ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
 done
 
 ##########
@@ -941,39 +1001,56 @@ MIME attachments, article scoring, and creating and verifying GnuPG
 signatures.
 
 %files -n trinity-knode
-%{_bindir}/knode
-%{tde_libdir}/kcm_knode.la
-%{tde_libdir}/kcm_knode.so
-%{tde_libdir}/libknodepart.la
-%{tde_libdir}/libknodepart.so
-%{_libdir}/libknodecommon.la
-%{_libdir}/libknodecommon.so
-%{_libdir}/libknodecommon.so.3
-%{_libdir}/libknodecommon.so.3.0.0
-%{tde_appdir}/KNode.desktop
-%{_datadir}/apps/knode
-%{tde_docdir}/HTML/en/knode
-%{_datadir}/icons/hicolor/*/apps/knode.png
-%{_datadir}/icons/hicolor/*/apps/knode2.png
-%{_datadir}/services/knewsservice.protocol
-%{_datadir}/services/knode_config_*.desktop
-%{_datadir}/services/kontact/knodeplugin.desktop
+%{tde_bindir}/knode
+%{tde_tdelibdir}/kcm_knode.la
+%{tde_tdelibdir}/kcm_knode.so
+%{tde_tdelibdir}/libknodepart.la
+%{tde_tdelibdir}/libknodepart.so
+%{tde_libdir}/libknodecommon.so.*
+%{tde_tdeappdir}/KNode.desktop
+%{tde_datadir}/apps/knode/
+%{tde_datadir}/icons/hicolor/*/apps/knode.png
+%{tde_datadir}/icons/hicolor/*/apps/knode2.png
+%{tde_datadir}/services/knewsservice.protocol
+%{tde_datadir}/services/knode_config_*.desktop
+%{tde_datadir}/services/kontact/knodeplugin.desktop
+%{tde_tdedocdir}/HTML/en/knode/
 
 %post -n trinity-knode
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
 done
-/sbin/ldconfig
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+/sbin/ldconfig || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %postun -n trinity-knode
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
 done
-/sbin/ldconfig
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+/sbin/ldconfig || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-knode-devel
+Summary:	Development files for trinity-knode
+Group:		Development/Libraries
+Requires:	trinity-knode = %{version}-%{release}
+
+%description -n trinity-knode-devel
+%{summary}
+
+%files -n trinity-knode-devel
+%{tde_libdir}/libknodecommon.la
+%{tde_libdir}/libknodecommon.so
+
+%post -n trinity-knode-devel
+/sbin/ldconfig || :
+
+%postun -n trinity-knode-devel
+/sbin/ldconfig || :
 
 ##########
 
@@ -988,36 +1065,36 @@ automatically when you exit the program, and they display when you open the
 program.  The program supports printing and mailing your notes.
 
 %files -n trinity-knotes
-%{_bindir}/knotes
-%{tde_libdir}/knotes_local.la
-%{tde_libdir}/knotes_local.so
-%{_libdir}/libknotes.so.*
-%{tde_appdir}/knotes.desktop
-%{_datadir}/apps/knotes
-%{_datadir}/config.kcfg/knoteconfig.kcfg
-%{_datadir}/config.kcfg/knotesglobalconfig.kcfg
-%{_datadir}/icons/hicolor/*/apps/knotes.png
-%{_datadir}/services/kresources/knotes/imap.desktop
-%{_datadir}/services/kresources/knotes/local.desktop
-%{_datadir}/services/kresources/knotes_manager.desktop
-%{_datadir}/services/kontact/knotesplugin.desktop
-%{tde_docdir}/HTML/en/knotes
+%{tde_bindir}/knotes
+%{tde_tdelibdir}/knotes_local.la
+%{tde_tdelibdir}/knotes_local.so
+%{tde_libdir}/libknotes.so.*
+%{tde_tdeappdir}/knotes.desktop
+%{tde_datadir}/apps/knotes
+%{tde_datadir}/config.kcfg/knoteconfig.kcfg
+%{tde_datadir}/config.kcfg/knotesglobalconfig.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/knotes.png
+%{tde_datadir}/services/kresources/knotes/imap.desktop
+%{tde_datadir}/services/kresources/knotes/local.desktop
+%{tde_datadir}/services/kresources/knotes_manager.desktop
+%{tde_datadir}/services/kontact/knotesplugin.desktop
+%{tde_tdedocdir}/HTML/en/knotes/
 
 %post -n trinity-knotes
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
 done
-/sbin/ldconfig
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+/sbin/ldconfig || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %postun -n trinity-knotes
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
 done
-/sbin/ldconfig
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+/sbin/ldconfig || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 ##########
 
@@ -1031,16 +1108,16 @@ Requires:	%{name}-kresources-devel = %{version}-%{release}
 %{summary}
 
 %files -n trinity-knotes-devel
-%{_libdir}/libknotes.so
-%{_libdir}/libknotes.la
-%{tde_includedir}/KNotesAppIface.h
-%{tde_includedir}/KNotesIface.h
+%{tde_libdir}/libknotes.so
+%{tde_libdir}/libknotes.la
+%{tde_tdeincludedir}/KNotesAppIface.h
+%{tde_tdeincludedir}/KNotesIface.h
 
 %post -n trinity-knotes-devel
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 %postun -n trinity-knotes-devel
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 ##########
 
@@ -1054,17 +1131,35 @@ and kxml_compiler for generation of C++ classes representing XML data
 described by RelaxNG schemes.
 
 %files -n trinity-kode
-%{_bindir}/kode
-%{_bindir}/kxml_compiler
-%{_libdir}/libkode.la
-%{_libdir}/libkode.so
-%{_libdir}/libkode.so.*
+%{tde_bindir}/kode
+%{tde_bindir}/kxml_compiler
+%{tde_libdir}/libkode.so.*
 
 %post -n trinity-kode
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 %postun -n trinity-kode
-/sbin/ldconfig
+/sbin/ldconfig || :
+
+##########
+
+%package -n trinity-kode-devel
+Summary:	Development files for trinity-kode
+Group:		Development/Libraries
+Requires:	trinity-kode = %{version}-%{release}
+
+%description -n trinity-kode-devel
+%{summary}
+
+%files -n trinity-kode-devel
+%{tde_libdir}/libkode.la
+%{tde_libdir}/libkode.so
+
+%post -n trinity-kode-devel
+/sbin/ldconfig || :
+
+%postun -n trinity-kode-devel
+/sbin/ldconfig || :
 
 ##########
 
@@ -1078,24 +1173,24 @@ Konsolekalendar complements the TDE KOrganizer by providing a console
 frontend to manage your calendars.
 
 %files -n trinity-konsolekalendar
-%{_bindir}/konsolekalendar
-%{tde_appdir}/konsolekalendar.desktop
-%{_datadir}/icons/crystalsvg/*/apps/konsolekalendar.png
-%{tde_docdir}/HTML/en/konsolekalendar
+%{tde_bindir}/konsolekalendar
+%{tde_tdeappdir}/konsolekalendar.desktop
+%{tde_datadir}/icons/crystalsvg/*/apps/konsolekalendar.png
+%{tde_tdedocdir}/HTML/en/konsolekalendar/
 
 %post -n trinity-konsolekalendar
 for f in crystalsvg ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %postun -n trinity-konsolekalendar
 for f in crystalsvg ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 ##########
 
@@ -1116,59 +1211,59 @@ KAddressBook into a single interface to provide easy access to mail,
 scheduling, address book and other PIM functionality.
 
 %files -n trinity-kontact
-%{_bindir}/kontact
-%{tde_libdir}/kcm_kmailsummary.la
-%{tde_libdir}/kcm_kmailsummary.so
-%{tde_libdir}/kcm_kontact.la
-%{tde_libdir}/kcm_kontact.so
-%{tde_libdir}/kcm_kontactknt.la
-%{tde_libdir}/kcm_kontactknt.so
-%{tde_libdir}/kcm_kontactsummary.la
-%{tde_libdir}/kcm_kontactsummary.so
-%{tde_libdir}/kcm_korgsummary.la
-%{tde_libdir}/kcm_korgsummary.so
-%{tde_libdir}/kcm_sdsummary.la
-%{tde_libdir}/kcm_sdsummary.so
-%{tde_libdir}/libkontact_*.la
-%{tde_libdir}/libkontact_*.so
-%{_libdir}/libkontact.so.*
-%{_libdir}/libkpinterfaces.so.*
-%{tde_appdir}/Kontact.desktop
-%{tde_appdir}/kontactdcop.desktop
-%{_datadir}/apps/kontact
-%{_datadir}/apps/kontactsummary/kontactsummary_part.rc
-%{_datadir}/config.kcfg/kontact.kcfg
-%{_datadir}/icons/hicolor/*/apps/kontact.png
-%{_datadir}/icons/crystalsvg/*/actions/kontact_*.png
-%{_datadir}/services/kcmkmailsummary.desktop
-%{_datadir}/services/kcmkontactknt.desktop
-%{_datadir}/services/kcmkontactsummary.desktop
-%{_datadir}/services/kcmkorgsummary.desktop
-%{_datadir}/services/kcmsdsummary.desktop
-%{_datadir}/services/kontact/newstickerplugin.desktop
-%{_datadir}/services/kontact/specialdatesplugin.desktop
-%{_datadir}/services/kontact/summaryplugin.desktop
-%{_datadir}/services/kontact/weatherplugin.desktop
-%{_datadir}/services/kontactconfig.desktop
-%{_datadir}/servicetypes/kontactplugin.desktop
-%{tde_docdir}/HTML/en/kontact
-%{tde_docdir}/HTML/en/kpilot
+%{tde_bindir}/kontact
+%{tde_tdelibdir}/kcm_kmailsummary.la
+%{tde_tdelibdir}/kcm_kmailsummary.so
+%{tde_tdelibdir}/kcm_kontact.la
+%{tde_tdelibdir}/kcm_kontact.so
+%{tde_tdelibdir}/kcm_kontactknt.la
+%{tde_tdelibdir}/kcm_kontactknt.so
+%{tde_tdelibdir}/kcm_kontactsummary.la
+%{tde_tdelibdir}/kcm_kontactsummary.so
+%{tde_tdelibdir}/kcm_korgsummary.la
+%{tde_tdelibdir}/kcm_korgsummary.so
+%{tde_tdelibdir}/kcm_sdsummary.la
+%{tde_tdelibdir}/kcm_sdsummary.so
+%{tde_tdelibdir}/libkontact_*.la
+%{tde_tdelibdir}/libkontact_*.so
+%{tde_libdir}/libkontact.so.*
+%{tde_libdir}/libkpinterfaces.so.*
+%{tde_tdeappdir}/Kontact.desktop
+%{tde_tdeappdir}/kontactdcop.desktop
+%{tde_datadir}/apps/kontact
+%{tde_datadir}/apps/kontactsummary/kontactsummary_part.rc
+%{tde_datadir}/config.kcfg/kontact.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/kontact.png
+%{tde_datadir}/icons/crystalsvg/*/actions/kontact_*.png
+%{tde_datadir}/services/kcmkmailsummary.desktop
+%{tde_datadir}/services/kcmkontactknt.desktop
+%{tde_datadir}/services/kcmkontactsummary.desktop
+%{tde_datadir}/services/kcmkorgsummary.desktop
+%{tde_datadir}/services/kcmsdsummary.desktop
+%{tde_datadir}/services/kontact/newstickerplugin.desktop
+%{tde_datadir}/services/kontact/specialdatesplugin.desktop
+%{tde_datadir}/services/kontact/summaryplugin.desktop
+%{tde_datadir}/services/kontact/weatherplugin.desktop
+%{tde_datadir}/services/kontactconfig.desktop
+%{tde_datadir}/servicetypes/kontactplugin.desktop
+%{tde_tdedocdir}/HTML/en/kontact/
+%{tde_tdedocdir}/HTML/en/kpilot/
 
 %post -n trinity-kontact
 for f in crystalsvg hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
 done
-/sbin/ldconfig
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+/sbin/ldconfig || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %postun -n trinity-kontact
 for f in crystalsvg hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
 done
-/sbin/ldconfig
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+/sbin/ldconfig || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 ##########
 
@@ -1181,17 +1276,17 @@ Requires:	trinity-kontact = %{version}-%{release}
 %{summary}
 
 %files -n trinity-kontact-devel
-%{_libdir}/libkontact.la
-%{_libdir}/libkontact.so
-%{_libdir}/libkpinterfaces.la
-%{_libdir}/libkpinterfaces.so
-%{tde_includedir}/kontact
+%{tde_libdir}/libkontact.la
+%{tde_libdir}/libkontact.so
+%{tde_libdir}/libkpinterfaces.la
+%{tde_libdir}/libkpinterfaces.so
+%{tde_tdeincludedir}/kontact/
 
 %post -n trinity-kontact-devel
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 %postun -n trinity-kontact-devel
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 ##########
 
@@ -1201,6 +1296,7 @@ Group:		Applications/Productivity
 Requires:	trinity-libkpimidentities = %{version}-%{release}
 Requires:	trinity-libkpimexchange = %{version}-%{release}
 Requires:	%{name}-kresources = %{version}-%{release}
+Requires:	perl
 
 %description -n trinity-korganizer
 This package contains KOrganizer, a calendar and scheduling program.
@@ -1215,58 +1311,58 @@ KOrganizer offers full synchronization with Palm Pilots, if kpilot is
 installed.
 
 %files -n trinity-korganizer
-%{_bindir}/ical2vcal
-%{_bindir}/korgac
-%{_bindir}/korganizer
-%{tde_libdir}/kcm_korganizer.la
-%{tde_libdir}/kcm_korganizer.so
-%{tde_libdir}/libkorg_*.la
-%{tde_libdir}/libkorg_*.so
-%{tde_libdir}/libkorganizerpart.la
-%{tde_libdir}/libkorganizerpart.so
-%{_libdir}/libkocorehelper.so.*
-%{_libdir}/libkorg_stdprinting.so.*
-%{_libdir}/libkorganizer.so.*
-%{_libdir}/libkorganizer_calendar.so.*
-%{_libdir}/libkorganizer_eventviewer.so.*
-%{tde_appdir}/korganizer.desktop
-%{_datadir}/apps/kconf_update/korganizer.upd
-%{_datadir}/apps/korgac
-%{_datadir}/apps/korganizer
-%{_datadir}/autostart/korgac.desktop
-%{_datadir}/config.kcfg/korganizer.kcfg
-%{_datadir}/icons/hicolor/*/apps/korganizer.png
-%{_datadir}/services/kontact/korganizerplugin.desktop
-%{_datadir}/services/kontact/journalplugin.desktop
-%{_datadir}/services/kontact/todoplugin.desktop
-%{_datadir}/services/korganizer_*.desktop
-%{_datadir}/services/korganizer
-%{_datadir}/services/webcal.protocol
-%{_datadir}/servicetypes/calendardecoration.desktop
-%{_datadir}/servicetypes/calendarplugin.desktop
-%{_datadir}/servicetypes/dcopcalendar.desktop
-%{_datadir}/servicetypes/korganizerpart.desktop
-%{_datadir}/servicetypes/korgprintplugin.desktop
-%{tde_docdir}/HTML/en/korganizer
-%{_includedir}/korganizer
+%{tde_bindir}/ical2vcal
+%{tde_bindir}/korgac
+%{tde_bindir}/korganizer
+%{tde_tdelibdir}/kcm_korganizer.la
+%{tde_tdelibdir}/kcm_korganizer.so
+%{tde_tdelibdir}/libkorg_*.la
+%{tde_tdelibdir}/libkorg_*.so
+%{tde_tdelibdir}/libkorganizerpart.la
+%{tde_tdelibdir}/libkorganizerpart.so
+%{tde_libdir}/libkocorehelper.so.*
+%{tde_libdir}/libkorg_stdprinting.so.*
+%{tde_libdir}/libkorganizer.so.*
+%{tde_libdir}/libkorganizer_calendar.so.*
+%{tde_libdir}/libkorganizer_eventviewer.so.*
+%{tde_tdeappdir}/korganizer.desktop
+%{tde_datadir}/apps/kconf_update/korganizer.upd
+%{tde_datadir}/apps/korgac
+%{tde_datadir}/apps/korganizer
+%{tde_datadir}/autostart/korgac.desktop
+%{tde_datadir}/config.kcfg/korganizer.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/korganizer.png
+%{tde_datadir}/services/kontact/korganizerplugin.desktop
+%{tde_datadir}/services/kontact/journalplugin.desktop
+%{tde_datadir}/services/kontact/todoplugin.desktop
+%{tde_datadir}/services/korganizer_*.desktop
+%{tde_datadir}/services/korganizer
+%{tde_datadir}/services/webcal.protocol
+%{tde_datadir}/servicetypes/calendardecoration.desktop
+%{tde_datadir}/servicetypes/calendarplugin.desktop
+%{tde_datadir}/servicetypes/dcopcalendar.desktop
+%{tde_datadir}/servicetypes/korganizerpart.desktop
+%{tde_datadir}/servicetypes/korgprintplugin.desktop
 %{tde_includedir}/korganizer
-%{tde_includedir}/calendar
+%{tde_tdeincludedir}/korganizer
+%{tde_tdeincludedir}/calendar
+%{tde_tdedocdir}/HTML/en/korganizer/
 
 %post -n trinity-korganizer
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
 done
-/sbin/ldconfig
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+/sbin/ldconfig || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %postun -n trinity-korganizer
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
 done
-/sbin/ldconfig
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+/sbin/ldconfig || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 ##########
 
@@ -1279,22 +1375,22 @@ Requires:	trinity-korganizer = %{version}-%{release}
 %{summary}
 
 %files -n trinity-korganizer-devel
-%{_libdir}/libkocorehelper.la
-%{_libdir}/libkocorehelper.so
-%{_libdir}/libkorg_stdprinting.la
-%{_libdir}/libkorg_stdprinting.so
-%{_libdir}/libkorganizer.la
-%{_libdir}/libkorganizer.so
-%{_libdir}/libkorganizer_calendar.la
-%{_libdir}/libkorganizer_calendar.so
-%{_libdir}/libkorganizer_eventviewer.la
-%{_libdir}/libkorganizer_eventviewer.so
+%{tde_libdir}/libkocorehelper.la
+%{tde_libdir}/libkocorehelper.so
+%{tde_libdir}/libkorg_stdprinting.la
+%{tde_libdir}/libkorg_stdprinting.so
+%{tde_libdir}/libkorganizer.la
+%{tde_libdir}/libkorganizer.so
+%{tde_libdir}/libkorganizer_calendar.la
+%{tde_libdir}/libkorganizer_calendar.so
+%{tde_libdir}/libkorganizer_eventviewer.la
+%{tde_libdir}/libkorganizer_eventviewer.so
 
 %post -n trinity-korganizer-devel
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 %postun -n trinity-korganizer-devel
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 ##########
 
@@ -1313,31 +1409,31 @@ the color/icon of the Kicker display.  In addition to this you can have
 Korn run a program once you click on the docked icon in Kicker.
 
 %files -n trinity-korn
-%{_bindir}/korn
-%{_libdir}/kconf_update_bin/korn-3-4-config_change
-%{tde_appdir}/KOrn.desktop
-%{_datadir}/apps/kconf_update/korn-3-4-config_change.upd
-%{_datadir}/apps/kconf_update/korn-3-5-metadata-update.pl
-%{_datadir}/apps/kconf_update/korn-3-5-ssl-update.pl
-%{_datadir}/apps/kconf_update/korn-3-5-update.upd
-%{_datadir}/icons/hicolor/*/apps/korn.png
-%{tde_docdir}/HTML/en/korn
+%{tde_bindir}/korn
+%{tde_libdir}/kconf_update_bin/korn-3-4-config_change
+%{tde_tdeappdir}/KOrn.desktop
+%{tde_datadir}/apps/kconf_update/korn-3-4-config_change.upd
+%{tde_datadir}/apps/kconf_update/korn-3-5-metadata-update.pl
+%{tde_datadir}/apps/kconf_update/korn-3-5-ssl-update.pl
+%{tde_datadir}/apps/kconf_update/korn-3-5-update.upd
+%{tde_datadir}/icons/hicolor/*/apps/korn.png
+%{tde_tdedocdir}/HTML/en/korn/
 
 %post -n trinity-korn
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
 done
-/sbin/ldconfig
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+/sbin/ldconfig || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %postun -n trinity-korn
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
 done
-/sbin/ldconfig
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+/sbin/ldconfig || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 ##########
 
@@ -1351,27 +1447,27 @@ format. These attachments are usually found in mails coming from Microsoft
 mail servers and embed the mail properties as well as the actual attachments.
 
 %files -n trinity-ktnef
-%{_bindir}/ktnef
-%{tde_appdir}/ktnef.desktop
-%{_datadir}/apps/ktnef
-%{_datadir}/icons/hicolor/*/apps/ktnef.png
-%{_datadir}/icons/locolor/*/apps/ktnef.png
-%{_datadir}/mimelnk/application/ms-tnef.desktop
-%{tde_docdir}/HTML/en/ktnef
+%{tde_bindir}/ktnef
+%{tde_tdeappdir}/ktnef.desktop
+%{tde_datadir}/apps/ktnef
+%{tde_datadir}/icons/hicolor/*/apps/ktnef.png
+%{tde_datadir}/icons/locolor/*/apps/ktnef.png
+%{tde_datadir}/mimelnk/application/ms-tnef.desktop
+%{tde_tdedocdir}/HTML/en/ktnef/
 
 %post -n trinity-ktnef
 for f in hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %postun -n trinity-ktnef
 for f in hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 ##########
 
@@ -1386,13 +1482,13 @@ to implement fast searches in mail bodies.
 This is the runtime package for programs that use the libindex library.
 
 %files -n trinity-libindex
-%{_libdir}/libindex.so.*
+%{tde_libdir}/libindex.so.*
 
 %post -n trinity-libindex
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 %postun -n trinity-libindex
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 ##########
 
@@ -1409,16 +1505,16 @@ This is the development package which contains the headers for the libindex-trin
 library.
 
 %files -n trinity-libindex-devel
-%{_bindir}/indexlib-config
-%{tde_includedir}/index
-%{_libdir}/libindex.la
-%{_libdir}/libindex.so
+%{tde_bindir}/indexlib-config
+%{tde_tdeincludedir}/index
+%{tde_libdir}/libindex.la
+%{tde_libdir}/libindex.so
 
 %post -n trinity-libindex-devel
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 %postun -n trinity-libindex-devel
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 ##########
 
@@ -1434,30 +1530,30 @@ formats.
 This is the runtime package for programs that use the libkcal-trinity library.
 
 %files -n trinity-libkcal
-%{tde_libdir}/kcal_kabc.la
-%{tde_libdir}/kcal_kabc.so
-%{tde_libdir}/kcal_localdir.la
-%{tde_libdir}/kcal_localdir.so
-%{tde_libdir}/kcal_local.la
-%{tde_libdir}/kcal_local.so
-%{tde_libdir}/kcal_remote.la
-%{tde_libdir}/kcal_remote.so
-%{_libdir}/libkcal.so.*
-%{_libdir}/libkcal_resourceremote.so.*
-%{_libdir}/libkholidays.so.*
-%{_datadir}/apps/libkholidays
-%{_datadir}/services/kresources/kcal/imap.desktop
-%{_datadir}/services/kresources/kcal/kabc.desktop
-%{_datadir}/services/kresources/kcal/local.desktop
-%{_datadir}/services/kresources/kcal/localdir.desktop
-%{_datadir}/services/kresources/kcal/remote.desktop
-%{_datadir}/services/kresources/kcal_manager.desktop
+%{tde_tdelibdir}/kcal_kabc.la
+%{tde_tdelibdir}/kcal_kabc.so
+%{tde_tdelibdir}/kcal_localdir.la
+%{tde_tdelibdir}/kcal_localdir.so
+%{tde_tdelibdir}/kcal_local.la
+%{tde_tdelibdir}/kcal_local.so
+%{tde_tdelibdir}/kcal_remote.la
+%{tde_tdelibdir}/kcal_remote.so
+%{tde_libdir}/libkcal.so.*
+%{tde_libdir}/libkcal_resourceremote.so.*
+%{tde_libdir}/libkholidays.so.*
+%{tde_datadir}/apps/libkholidays
+%{tde_datadir}/services/kresources/kcal/imap.desktop
+%{tde_datadir}/services/kresources/kcal/kabc.desktop
+%{tde_datadir}/services/kresources/kcal/local.desktop
+%{tde_datadir}/services/kresources/kcal/localdir.desktop
+%{tde_datadir}/services/kresources/kcal/remote.desktop
+%{tde_datadir}/services/kresources/kcal_manager.desktop
 
 %post -n trinity-libkcal
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 %postun -n trinity-libkcal
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 ##########
 
@@ -1476,21 +1572,21 @@ This is the development package which contains the headers for the libkcal-trini
 library.
 
 %files -n trinity-libkcal-devel
-%{tde_includedir}/libemailfunctions/idmapper.h
+%{tde_tdeincludedir}/libemailfunctions/idmapper.h
+%{tde_tdeincludedir}/libkcal
 %{tde_includedir}/libkcal
-%{_includedir}/libkcal
-%{_libdir}/libkcal.la
-%{_libdir}/libkcal.so
-%{_libdir}/libkcal_resourceremote.la
-%{_libdir}/libkcal_resourceremote.so
-%{_libdir}/libkholidays.la
-%{_libdir}/libkholidays.so
+%{tde_libdir}/libkcal.la
+%{tde_libdir}/libkcal.so
+%{tde_libdir}/libkcal_resourceremote.la
+%{tde_libdir}/libkcal_resourceremote.so
+%{tde_libdir}/libkholidays.la
+%{tde_libdir}/libkholidays.so
 
 %post -n trinity-libkcal-devel
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 %postun -n trinity-libkcal-devel
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 ##########
 
@@ -1506,31 +1602,31 @@ Provides:	libtdepim = %{version}-%{release}
 This is the runtime package for programs that use the libtdepim-trinity library.
 
 %files -n trinity-libtdepim
-%{tde_libdir}/plugins/designer/[kt]depimwidgets.la
-%{tde_libdir}/plugins/designer/[kt]depimwidgets.so
-%{tde_libdir}/plugins/designer/kpartsdesignerplugin.la
-%{tde_libdir}/plugins/designer/kpartsdesignerplugin.so
-%{_libdir}/lib[kt]depim.so.*
-%{_datadir}/apps/[kt]depimwidgets
-%{_datadir}/apps/lib[kt]depim
-%{_datadir}/apps/[kt]depim
-%{_datadir}/config.kcfg/pimemoticons.kcfg
-%{_datadir}/icons/crystalsvg/22x22/actions/button_fewer.png
-%{_datadir}/icons/crystalsvg/22x22/actions/button_more.png
+%{tde_tdelibdir}/plugins/designer/[kt]depimwidgets.la
+%{tde_tdelibdir}/plugins/designer/[kt]depimwidgets.so
+%{tde_tdelibdir}/plugins/designer/kpartsdesignerplugin.la
+%{tde_tdelibdir}/plugins/designer/kpartsdesignerplugin.so
+%{tde_libdir}/lib[kt]depim.so.*
+%{tde_datadir}/apps/[kt]depimwidgets
+%{tde_datadir}/apps/lib[kt]depim
+%{tde_datadir}/apps/[kt]depim
+%{tde_datadir}/config.kcfg/pimemoticons.kcfg
+%{tde_datadir}/icons/crystalsvg/22x22/actions/button_fewer.png
+%{tde_datadir}/icons/crystalsvg/22x22/actions/button_more.png
 
 %post -n trinity-libtdepim
 for f in crystalsvg ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
 done
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 %postun -n trinity-libtdepim
 for f in crystalsvg ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
 done
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 ##########
 
@@ -1548,15 +1644,15 @@ This is the development package which contains the headers for the libtdepim-tri
 library.
 
 %files -n trinity-libtdepim-devel
-%{tde_includedir}/[kt]depimmacros.h
-%{_libdir}/lib[kt]depim.la
-%{_libdir}/lib[kt]depim.so
+%{tde_tdeincludedir}/[kt]depimmacros.h
+%{tde_libdir}/lib[kt]depim.la
+%{tde_libdir}/lib[kt]depim.so
 
 %post -n trinity-libtdepim-devel
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 %postun -n trinity-libtdepim-devel
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 ##########
 
@@ -1568,14 +1664,14 @@ Group:		Environment/Libraries
 This is the runtime package for programs that use the libkgantt-trinity library.
 
 %files -n trinity-libkgantt
-%{_libdir}/libkgantt.so.*
-%{_datadir}/apps/kgantt
+%{tde_libdir}/libkgantt.so.*
+%{tde_datadir}/apps/kgantt
 
 %post -n trinity-libkgantt
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 %postun -n trinity-libkgantt
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 ##########
 
@@ -1590,15 +1686,15 @@ This is the development package which contains the headers for the libkgantt-tri
 library.
 
 %files -n trinity-libkgantt-devel
-%{tde_includedir}/kgantt
-%{_libdir}/libkgantt.la
-%{_libdir}/libkgantt.so
+%{tde_tdeincludedir}/kgantt
+%{tde_libdir}/libkgantt.la
+%{tde_libdir}/libkgantt.so
 
 %post -n trinity-libkgantt-devel
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 %postun -n trinity-libkgantt-devel
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 ##########
 
@@ -1614,30 +1710,30 @@ GnuPG program.
 This is the runtime package for programs that use the libkleopatra-trinity library.
 
 %files -n trinity-libkleopatra
-%{_datadir}/config/libkleopatrarc
-%{_libdir}/libgpgme++.so.*
-%{_libdir}/libkleopatra.so.*
-%{_libdir}/libkpgp.so.*
-%{_libdir}/libqgpgme.so.*
-%{_datadir}/apps/kconf_update/kpgp-3.1-upgrade-address-data.pl
-%{_datadir}/apps/kconf_update/kpgp.upd
-%{_datadir}/apps/libkleopatra/
-%{_datadir}/icons/crystalsvg/*/apps/gpg.png
-%{_datadir}/icons/crystalsvg/*/apps/gpgsm.png
+%{tde_datadir}/config/libkleopatrarc
+%{tde_libdir}/libgpgme++.so.*
+%{tde_libdir}/libkleopatra.so.*
+%{tde_libdir}/libkpgp.so.*
+%{tde_libdir}/libqgpgme.so.*
+%{tde_datadir}/apps/kconf_update/kpgp-3.1-upgrade-address-data.pl
+%{tde_datadir}/apps/kconf_update/kpgp.upd
+%{tde_datadir}/apps/libkleopatra/
+%{tde_datadir}/icons/crystalsvg/*/apps/gpg.png
+%{tde_datadir}/icons/crystalsvg/*/apps/gpgsm.png
 
 %post -n trinity-libkleopatra
 for f in crystalsvg ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
 done
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 %postun -n trinity-libkleopatra
 for f in crystalsvg ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
 done
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 ##########
 
@@ -1655,25 +1751,25 @@ This is the development package which contains the headers for the
 libkleopatra-trinity library.
 
 %files -n trinity-libkleopatra-devel
+%{tde_tdeincludedir}/gpgme++
 %{tde_includedir}/gpgme++
-%{_includedir}/gpgme++
+%{tde_tdeincludedir}/kleo
 %{tde_includedir}/kleo
-%{_includedir}/kleo
-%{tde_includedir}/qgpgme
-%{_libdir}/libgpgme++.la
-%{_libdir}/libgpgme++.so
-%{_libdir}/libkleopatra.la
-%{_libdir}/libkleopatra.so
-%{_libdir}/libkpgp.la
-%{_libdir}/libkpgp.so
-%{_libdir}/libqgpgme.la
-%{_libdir}/libqgpgme.so
+%{tde_tdeincludedir}/qgpgme
+%{tde_libdir}/libgpgme++.la
+%{tde_libdir}/libgpgme++.so
+%{tde_libdir}/libkleopatra.la
+%{tde_libdir}/libkleopatra.so
+%{tde_libdir}/libkpgp.la
+%{tde_libdir}/libkpgp.so
+%{tde_libdir}/libqgpgme.la
+%{tde_libdir}/libqgpgme.so
 
 %post -n trinity-libkleopatra-devel
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 %postun -n trinity-libkleopatra-devel
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 ##########
 
@@ -1687,13 +1783,13 @@ This library provides a C++ interface to MIME messages, parsing them into
 an object tree.
 
 %files -n trinity-libkmime
-%{_libdir}/libkmime.so.*
+%{tde_libdir}/libkmime.so.*
 
 %post -n trinity-libkmime
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 %postun -n trinity-libkmime
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 ##########
 
@@ -1706,14 +1802,14 @@ Requires:	trinity-libkmime = %{version}-%{release}
 %{summary}
 
 %files -n trinity-libkmime-devel
-%{_libdir}/libkmime.la
-%{_libdir}/libkmime.so
+%{tde_libdir}/libkmime.la
+%{tde_libdir}/libkmime.so
 
 %post -n trinity-libkmime-devel
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 %postun -n trinity-libkmime-devel
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 ##########
 
@@ -1726,15 +1822,15 @@ This is the runtime package for programs that use the libkpimexchange-trinity
 library. 
 
 %files -n trinity-libkpimexchange
-%{tde_libdir}/resourcecalendarexchange.la
-%{tde_libdir}/resourcecalendarexchange.so
-%{_libdir}/libkpimexchange.so.*
+%{tde_tdelibdir}/resourcecalendarexchange.la
+%{tde_tdelibdir}/resourcecalendarexchange.so
+%{tde_libdir}/libkpimexchange.so.*
 
 %post -n trinity-libkpimexchange
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 %postun -n trinity-libkpimexchange
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 ##########
 
@@ -1750,16 +1846,16 @@ This is the development package which contains the headers for the
 libkpimexchange-trinity library.
 
 %files -n trinity-libkpimexchange-devel
-%{tde_includedir}/[kt]depim/exchangeaccount.h
-%{tde_includedir}/[kt]depim/exchangeclient.h
-%{_libdir}/libkpimexchange.la
-%{_libdir}/libkpimexchange.so
+%{tde_tdeincludedir}/[kt]depim/exchangeaccount.h
+%{tde_tdeincludedir}/[kt]depim/exchangeclient.h
+%{tde_libdir}/libkpimexchange.la
+%{tde_libdir}/libkpimexchange.so
 
 %post -n trinity-libkpimexchange-devel
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 %postun -n trinity-libkpimexchange-devel
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 ##########
 
@@ -1775,13 +1871,13 @@ This is the runtime package for programs that use the libkpimidentities-trinity
 library.
 
 %files -n trinity-libkpimidentities
-%{_libdir}/libkpimidentities.so.*
+%{tde_libdir}/libkpimidentities.so.*
 
 %post -n trinity-libkpimidentities
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 %postun -n trinity-libkpimidentities
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 ##########
 
@@ -1794,14 +1890,14 @@ Requires:	trinity-libkpimidentities = %{version}-%{release}
 %{summary}
 
 %files -n trinity-libkpimidentities-devel
-%{_libdir}/libkpimidentities.la
-%{_libdir}/libkpimidentities.so
+%{tde_libdir}/libkpimidentities.la
+%{tde_libdir}/libkpimidentities.so
 
 %post -n trinity-libkpimidentities-devel
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 %postun -n trinity-libkpimidentities-devel
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 ##########
 
@@ -1813,13 +1909,13 @@ Group:		Environment/Libraries
 This is the runtime package for programs that use the libksieve-trinity library.
 
 %files -n trinity-libksieve
-%{_libdir}/libksieve.so.*
+%{tde_libdir}/libksieve.so.*
 
 %post -n trinity-libksieve
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 %postun -n trinity-libksieve
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 ##########
 
@@ -1834,15 +1930,15 @@ This is the development package which contains the headers for the libksieve-tri
 library.
 
 %files -n trinity-libksieve-devel
-%{tde_includedir}/ksieve
-%{_libdir}/libksieve.la
-%{_libdir}/libksieve.so
+%{tde_tdeincludedir}/ksieve
+%{tde_libdir}/libksieve.la
+%{tde_libdir}/libksieve.so
 
 %post -n trinity-libksieve-devel
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 %postun -n trinity-libksieve-devel
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 ##########
 
@@ -1859,13 +1955,13 @@ attachments.
 This is the runtime library for packages using the ktnef-trinity library.
 
 %files -n trinity-libktnef
-%{_libdir}/libktnef.so.*
+%{tde_libdir}/libktnef.so.*
 
 %post -n trinity-libktnef
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 %postun -n trinity-libktnef
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 ##########
 
@@ -1885,15 +1981,15 @@ This is the development package which contains the headers for the
 ktnef-trinity library.
 
 %files -n trinity-libktnef-devel
-%{tde_includedir}/ktnef
-%{_libdir}/libktnef.la
-%{_libdir}/libktnef.so
+%{tde_tdeincludedir}/ktnef
+%{tde_libdir}/libktnef.la
+%{tde_libdir}/libktnef.so
 
 %post -n trinity-libktnef-devel
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 %postun -n trinity-libktnef-devel
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 ##########
 
@@ -1907,13 +2003,13 @@ This library is used by several Trinity applications to handle mime types.
 This is the runtime package for programs that use the libmimelib-trinity library.
 
 %files -n trinity-libmimelib
-%{_libdir}/libmimelib.so.*
+%{tde_libdir}/libmimelib.so.*
 
 %post -n trinity-libmimelib
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 %postun -n trinity-libmimelib
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 ##########
 
@@ -1929,15 +2025,15 @@ This is the development package which contains the headers for the
 libmimelib library.
 
 %files -n trinity-libmimelib-devel
-%{tde_includedir}/mimelib
-%{_libdir}/libmimelib.la
-%{_libdir}/libmimelib.so
+%{tde_tdeincludedir}/mimelib
+%{tde_libdir}/libmimelib.la
+%{tde_libdir}/libmimelib.so
 
 %post -n trinity-libmimelib-devel
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 %postun -n trinity-libmimelib-devel
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 ##########
 
@@ -1951,39 +2047,39 @@ and manage mobile phones with your PC. It handles full SMS control,
 dialing calls, phonebook, and phone status monitoring.
 
 %files -n trinity-kmobile
-%{_bindir}/kmobile
-%{_datadir}/icons/default.kde/32x32/devices/mobile_camera.png
-%{_datadir}/icons/default.kde/32x32/devices/mobile_musicplayer.png
-%{_datadir}/icons/default.kde/32x32/devices/mobile_organizer.png
-%{_datadir}/icons/default.kde/32x32/devices/mobile_phone.png
-%{_datadir}/icons/default.kde/32x32/devices/mobile_unknown.png
-%{_datadir}/icons/hicolor/*/apps/kmobile.png
-%{_datadir}/services/libkmobile_digicam.desktop
-%{_datadir}/services/libkmobile_gammu.desktop
-%{_datadir}/services/libkmobile_skeleton.desktop
-%{_datadir}/servicetypes/libkmobile.desktop
-%{_datadir}/apps/kmobile/kmobileui.rc
-%{tde_appdir}/kmobile.desktop
-%{tde_libdir}/libkmobile_skeleton.la
-%{tde_libdir}/libkmobile_skeleton.so
-%{_libdir}/libkmobileclient.la
-%{_libdir}/libkmobileclient.so
-%{_libdir}/libkmobiledevice.la
-%{_libdir}/libkmobiledevice.so
+%{tde_bindir}/kmobile
+%{tde_datadir}/icons/default.kde/32x32/devices/mobile_camera.png
+%{tde_datadir}/icons/default.kde/32x32/devices/mobile_musicplayer.png
+%{tde_datadir}/icons/default.kde/32x32/devices/mobile_organizer.png
+%{tde_datadir}/icons/default.kde/32x32/devices/mobile_phone.png
+%{tde_datadir}/icons/default.kde/32x32/devices/mobile_unknown.png
+%{tde_datadir}/icons/hicolor/*/apps/kmobile.png
+%{tde_datadir}/services/libkmobile_digicam.desktop
+%{tde_datadir}/services/libkmobile_gammu.desktop
+%{tde_datadir}/services/libkmobile_skeleton.desktop
+%{tde_datadir}/servicetypes/libkmobile.desktop
+%{tde_datadir}/apps/kmobile/kmobileui.rc
+%{tde_tdeappdir}/kmobile.desktop
+%{tde_tdelibdir}/libkmobile_skeleton.la
+%{tde_tdelibdir}/libkmobile_skeleton.so
+%{tde_libdir}/libkmobileclient.la
+%{tde_libdir}/libkmobileclient.so
+%{tde_libdir}/libkmobiledevice.la
+%{tde_libdir}/libkmobiledevice.so
 
 %post -n trinity-kmobile
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %postun -n trinity-kmobile
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 ##########
 
@@ -2005,14 +2101,19 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %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}"
 
-%__mkdir build
-cd build
+%{?!mgaversion:%__mkdir build; cd build}
 %cmake \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DINCLUDE_INSTALL_DIR=%{tde_includedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DPKGCONFIG_INSTALL_DIR=%{tde_tdelibdir}/pkgconfig \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  -DCMAKE_SKIP_RPATH="OFF" \
   -DWITH_ARTS=ON \
   -DWITH_SASL=ON \
   -DWITH_NEWDISTRLISTS=ON  \
@@ -2052,6 +2153,10 @@ export PATH="%{_bindir}:${PATH}"
 
 
 %changelog
+* Sun Jul 30 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-8
+- Add more '-devel' packages
+- Add support for Mageia 2
+
 * Sat Jun 30 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-7
 - Rename 'tdepim' to 'trinity-tdepim'
 - Disable unneccesary fsync() in cached IMAP handler [Bug #467] [Commit #82d4a938]
diff --git a/redhat/kdesdk/kdesdk-3.5.13-add_forgotten_cmake_files.patch b/redhat/kdesdk/kdesdk-3.5.13-add_forgotten_cmake_files.patch
new file mode 100644
index 000000000..7571e552c
--- /dev/null
+++ b/redhat/kdesdk/kdesdk-3.5.13-add_forgotten_cmake_files.patch
@@ -0,0 +1,1921 @@
+commit adee843c4d5c8fbce75abd3a768d643392e4ea90
+Author: Serghei Amelian <serghei.amelian@gmail.com>
+Date:   1329245722 +0200
+
+    [tdesdk/cmake] added forgotten files
+
+diff --git a/kdeaccounts-plugin/CMakeLists.txt b/kdeaccounts-plugin/CMakeLists.txt
+new file mode 100644
+index 0000000..2a14486
+--- /dev/null
++++ b/kdeaccounts-plugin/CMakeLists.txt
+@@ -0,0 +1,34 @@
++#################################################
++#
++#  (C) 2012 Serghei Amelian
++#  serghei (DOT) amelian (AT) gmail.com
++#
++#  Improvements and feedback are welcome
++#
++#  This file is released under GPL >= 2
++#
++#################################################
++
++include_directories(
++  ${TDE_INCLUDE_DIR}
++  ${TQT_INCLUDE_DIRS}
++)
++
++link_directories(
++  ${TQT_LIBRARY_DIRS}
++)
++
++
++##### other data ################################
++
++install( FILES kdeaccountsplugin.desktop
++  DESTINATION ${DATA_INSTALL_DIR}/kabc/formats )
++
++
++##### kabcformat_kdeaccounts (module) ###########
++
++tde_add_kpart( kabcformat_kdeaccounts
++  SOURCES kdeaccountsformat.cpp
++  LINK kabc-shared
++  DESTINATION ${PLUGIN_INSTALL_DIR}
++)
+diff --git a/kfile-plugins/CMakeLists.txt b/kfile-plugins/CMakeLists.txt
+new file mode 100644
+index 0000000..6b769e5
+--- /dev/null
++++ b/kfile-plugins/CMakeLists.txt
+@@ -0,0 +1,14 @@
++#################################################
++#
++#  (C) 2012 Serghei Amelian
++#  serghei (DOT) amelian (AT) gmail.com
++#
++#  Improvements and feedback are welcome
++#
++#  This file is released under GPL >= 2
++#
++#################################################
++
++add_subdirectory( diff )
++add_subdirectory( c++ )
++add_subdirectory( ts )
+diff --git a/kfile-plugins/c++/CMakeLists.txt b/kfile-plugins/c++/CMakeLists.txt
+new file mode 100644
+index 0000000..9b56e9d
+--- /dev/null
++++ b/kfile-plugins/c++/CMakeLists.txt
+@@ -0,0 +1,35 @@
++#################################################
++#
++#  (C) 2012 Serghei Amelian
++#  serghei (DOT) amelian (AT) gmail.com
++#
++#  Improvements and feedback are welcome
++#
++#  This file is released under GPL >= 2
++#
++#################################################
++
++include_directories(
++  ${CMAKE_CURRENT_BINARY_DIR}
++  ${TDE_INCLUDE_DIR}
++  ${TQT_INCLUDE_DIRS}
++)
++
++link_directories(
++  ${TQT_LIBRARY_DIRS}
++)
++
++
++##### other data ################################
++
++install( FILES kfile_cpp.desktop kfile_h.desktop
++  DESTINATION ${SERVICES_INSTALL_DIR} )
++
++
++##### kfile_cpp (module) ########################
++
++tde_add_kpart( kfile_cpp AUTOMOC
++  SOURCES kfile_cpp.cpp
++  LINK kio-shared
++  DESTINATION ${PLUGIN_INSTALL_DIR}
++)
+diff --git a/kfile-plugins/diff/CMakeLists.txt b/kfile-plugins/diff/CMakeLists.txt
+new file mode 100644
+index 0000000..292372c
+--- /dev/null
++++ b/kfile-plugins/diff/CMakeLists.txt
+@@ -0,0 +1,34 @@
++#################################################
++#
++#  (C) 2012 Serghei Amelian
++#  serghei (DOT) amelian (AT) gmail.com
++#
++#  Improvements and feedback are welcome
++#
++#  This file is released under GPL >= 2
++#
++#################################################
++
++include_directories(
++  ${CMAKE_CURRENT_BINARY_DIR}
++  ${TDE_INCLUDE_DIR}
++  ${TQT_INCLUDE_DIRS}
++)
++
++link_directories(
++  ${TQT_LIBRARY_DIRS}
++)
++
++
++##### other data ################################
++
++install( FILES kfile_diff.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
++
++
++##### kfile_diff (module) #######################
++
++tde_add_kpart( kfile_diff AUTOMOC
++  SOURCES kfile_diff.cpp
++  LINK kio-shared
++  DESTINATION ${PLUGIN_INSTALL_DIR}
++)
+diff --git a/kfile-plugins/ts/CMakeLists.txt b/kfile-plugins/ts/CMakeLists.txt
+new file mode 100644
+index 0000000..4e68beb
+--- /dev/null
++++ b/kfile-plugins/ts/CMakeLists.txt
+@@ -0,0 +1,35 @@
++#################################################
++#
++#  (C) 2012 Serghei Amelian
++#  serghei (DOT) amelian (AT) gmail.com
++#
++#  Improvements and feedback are welcome
++#
++#  This file is released under GPL >= 2
++#
++#################################################
++
++include_directories(
++  ${CMAKE_CURRENT_BINARY_DIR}
++  ${TDE_INCLUDE_DIR}
++  ${TQT_INCLUDE_DIRS}
++)
++
++link_directories(
++  ${TQT_LIBRARY_DIRS}
++)
++
++
++##### other data ################################
++
++install( FILES kfile_ts.desktop
++  DESTINATION ${SERVICES_INSTALL_DIR} )
++
++
++##### kfile_ts (module) #########################
++
++tde_add_kpart( kfile_ts AUTOMOC
++  SOURCES kfile_ts.cpp
++  LINK kio-shared
++  DESTINATION ${PLUGIN_INSTALL_DIR}
++)
+diff --git a/kioslave/CMakeLists.txt b/kioslave/CMakeLists.txt
+new file mode 100644
+index 0000000..a23a176
+--- /dev/null
++++ b/kioslave/CMakeLists.txt
+@@ -0,0 +1,12 @@
++#################################################
++#
++#  (C) 2012 Serghei Amelian
++#  serghei (DOT) amelian (AT) gmail.com
++#
++#  Improvements and feedback are welcome
++#
++#  This file is released under GPL >= 2
++#
++#################################################
++
++add_subdirectory( svn )
+diff --git a/kioslave/svn/CMakeLists.txt b/kioslave/svn/CMakeLists.txt
+new file mode 100644
+index 0000000..9d3c496
+--- /dev/null
++++ b/kioslave/svn/CMakeLists.txt
+@@ -0,0 +1,46 @@
++#################################################
++#
++#  (C) 2012 Serghei Amelian
++#  serghei (DOT) amelian (AT) gmail.com
++#
++#  Improvements and feedback are welcome
++#
++#  This file is released under GPL >= 2
++#
++#################################################
++
++include( ConfigureChecks.cmake )
++
++add_subdirectory( ksvnd )
++add_subdirectory( svnhelper )
++add_subdirectory( icons )
++
++include_directories(
++  ${TDE_INCLUDE_DIR}
++  ${TQT_INCLUDE_DIRS}
++  ${APR_INCLUDE_DIRS}
++  ${SVN_INCLUDE_DIR}
++)
++
++link_directories(
++  ${TQT_LIBRARY_DIRS}
++  ${APR_LIBRARY_DIRS}
++  ${SVN_LIBRARY_DIR}
++)
++
++
++##### other data ################################
++
++install( FILES
++    svn+http.protocol svn+https.protocol svn+file.protocol
++    svn+ssh.protocol svn.protocol
++  DESTINATION ${SERVICES_INSTALL_DIR} )
++
++
++##### kio_svn (module) ##########################
++
++tde_add_kpart( kio_svn
++  SOURCES svn.cpp
++  LINK kio-shared ${APR_LIBRARIES} ${SVN_LIBRARIES}
++  DESTINATION ${PLUGIN_INSTALL_DIR}
++)
+diff --git a/kioslave/svn/ConfigureChecks.cmake b/kioslave/svn/ConfigureChecks.cmake
+new file mode 100644
+index 0000000..81358c6
+--- /dev/null
++++ b/kioslave/svn/ConfigureChecks.cmake
+@@ -0,0 +1,50 @@
++#################################################
++#
++#  (C) 2010-2011 Serghei Amelian
++#  serghei (DOT) amelian (AT) gmail.com
++#
++#  Improvements and feedback are welcome
++#
++#  This file is released under GPL >= 2
++#
++#################################################
++
++pkg_search_module( APR apr-1 )
++if( APR_FOUND )
++  set( HAVE_APR 1 )
++else( )
++  tde_message_fatal( "apr-1 is required, but was not found on your system" )
++endif( )
++
++
++# check for subversion library
++
++check_library_exists( "svn_client-1" "svn_pool_create_ex" "${SVN_LIBRARY_DIR}" HAVE_SVN_POOL_CREATE_EX )
++
++if( HAVE_SVN_POOL_CREATE_EX )
++  set( SVN_LIBRARIES "svn_client-1;svn_subr-1;svn_ra-1" )
++else( )
++  tde_message_fatal( "svn_client-1 library was not found on your system.\n Subversion is installed?\n Try to set SVN_LIBRARY_DIR to subversion library directory." )
++endif( )
++
++
++# check for subversion headers
++
++set( CMAKE_REQUIRED_FLAGS "-I${APR_INCLUDE_DIRS}" )
++set( CMAKE_REQUIRED_DEFINITIONS "${APR_CFLAGS}" )
++
++if( SVN_INCLUDE_DIR )
++  set( CMAKE_REQUIRED_INCLUDES "${SVN_INCLUDE_DIR}" )
++  check_include_file( "svn_types.h" HAVE_SVN_TYPES_H )
++  tde_restore( CMAKE_REQUIRED_INCLUDES )
++else( )
++  # FIXME must be improved
++  check_include_file( "/usr/include/subversion-1/svn_types.h" HAVE_SVN_TYPES_H )
++  set( SVN_INCLUDE_DIR "/usr/include/subversion-1" )
++endif( )
++
++tde_restore( CMAKE_REQUIRED_FLAGS CMAKE_REQUIRED_DEFINITIONS )
++
++if( NOT HAVE_SVN_TYPES_H )
++  tde_message_fatal( "svn_types.h file was not found on your system.\n Subversion devel files are installed?\n Try to set SVN_INCLUDE_DIR to subversion include directory." )
++endif( )
+diff --git a/kioslave/svn/icons/CMakeLists.txt b/kioslave/svn/icons/CMakeLists.txt
+new file mode 100644
+index 0000000..96bca44
+--- /dev/null
++++ b/kioslave/svn/icons/CMakeLists.txt
+@@ -0,0 +1,12 @@
++#################################################
++#
++#  (C) 2012 Serghei Amelian
++#  serghei (DOT) amelian (AT) gmail.com
++#
++#  Improvements and feedback are welcome
++#
++#  This file is released under GPL >= 2
++#
++#################################################
++
++tde_install_icons( )
+diff --git a/kioslave/svn/ksvnd/CMakeLists.txt b/kioslave/svn/ksvnd/CMakeLists.txt
+new file mode 100644
+index 0000000..d377ee7
+--- /dev/null
++++ b/kioslave/svn/ksvnd/CMakeLists.txt
+@@ -0,0 +1,36 @@
++#################################################
++#
++#  (C) 2012 Serghei Amelian
++#  serghei (DOT) amelian (AT) gmail.com
++#
++#  Improvements and feedback are welcome
++#
++#  This file is released under GPL >= 2
++#
++#################################################
++
++include_directories(
++  ${CMAKE_CURRENT_BINARY_DIR}
++  ${CMAKE_BINARY_DIR}
++  ${TDE_INCLUDE_DIR}
++  ${TQT_INCLUDE_DIRS}
++)
++
++link_directories(
++  ${TQT_LIBRARY_DIRS}
++)
++
++
++##### other data ################################
++
++install( FILES ksvnd.desktop
++  DESTINATION ${SERVICES_INSTALL_DIR}/kded )
++
++
++##### kded_ksvnd (module) #######################
++
++tde_add_kpart( kded_ksvnd AUTOMOC
++  SOURCES commitdlg.ui ksvnd.cpp ksvnd.skel
++  LINK kio-shared kdeinit_kded-shared
++  DESTINATION ${PLUGIN_INSTALL_DIR}
++)
+diff --git a/kioslave/svn/svnhelper/CMakeLists.txt b/kioslave/svn/svnhelper/CMakeLists.txt
+new file mode 100644
+index 0000000..ad82d38
+--- /dev/null
++++ b/kioslave/svn/svnhelper/CMakeLists.txt
+@@ -0,0 +1,38 @@
++#################################################
++#
++#  (C) 2012 Serghei Amelian
++#  serghei (DOT) amelian (AT) gmail.com
++#
++#  Improvements and feedback are welcome
++#
++#  This file is released under GPL >= 2
++#
++#################################################
++
++include_directories(
++  ${CMAKE_CURRENT_BINARY_DIR}
++  ${TDE_INCLUDE_DIR}
++  ${TQT_INCLUDE_DIRS}
++)
++
++link_directories(
++  ${TQT_LIBRARY_DIRS}
++)
++
++
++##### other data ################################
++
++install( FILES
++    subversion.desktop subversion_toplevel.desktop
++  DESTINATION ${DATA_INSTALL_DIR}/konqueror/servicemenus )
++
++
++##### kio_svn_helper (executable) ###############
++
++tde_add_executable( kio_svn_helper AUTOMOC
++  SOURCES
++    kio_svn_helper.cpp subversioncheckout.ui subversionswitch.ui
++    subversionlog.ui subversiondiff.ui
++  LINK kio-shared
++  DESTINATION ${BIN_INSTALL_DIR}
++)
+diff --git a/kmtrace/CMakeLists.txt b/kmtrace/CMakeLists.txt
+new file mode 100644
+index 0000000..600391b
+--- /dev/null
++++ b/kmtrace/CMakeLists.txt
+@@ -0,0 +1,76 @@
++#################################################
++#
++#  (C) 2012 Serghei Amelian
++#  serghei (DOT) amelian (AT) gmail.com
++#
++#  Improvements and feedback are welcome
++#
++#  This file is released under GPL >= 2
++#
++#################################################
++
++include_directories(
++  ${TDE_INCLUDE_DIR}
++  ${TQT_INCLUDE_DIRS}
++)
++
++link_directories(
++  ${TQT_LIBRARY_DIRS}
++)
++
++set( LD_FLAGS "-Wl,-Bstatic -liberty -Wl,-Bdynamic" )
++
++
++##### other data ################################
++
++configure_file( kminspector.cmake kminspector @ONLY )
++
++install( FILES kde.excludes
++  DESTINATION ${DATA_INSTALL_DIR}/kmtrace )
++
++install( PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/kminspector
++  DESTINATION ${BIN_INSTALL_DIR} )
++
++
++##### ktrace_s (static) #########################
++
++tde_add_library( ktrace_s STATIC
++  SOURCES ktrace.c
++  DESTINATION ${LIB_INSTALL_DIR}
++)
++
++
++##### ktrace (shared) ###########################
++
++tde_add_library( ktrace SHARED
++  SOURCES ksotrace.cpp ktrace.c
++  LINK dl
++  DESTINATION ${LIB_INSTALL_DIR}/kmtrace
++)
++
++
++##### kmtrace (executable) ######################
++
++tde_add_executable( kmtrace
++  SOURCES kmtrace.cpp
++  LINK ${LD_FLAGS} kdecore-shared
++  DESTINATION ${BIN_INSTALL_DIR}
++)
++
++
++##### demangle (executable) #####################
++
++tde_add_executable( demangle
++  SOURCES demangle.cpp
++  LINK ${LD_FLAGS} ${TQT_LIBRARIES}
++  DESTINATION ${BIN_INSTALL_DIR}
++)
++
++
++##### kmmatch (executable) ######################
++
++tde_add_executable( kmmatch
++  SOURCES match.cpp
++  LINK ${TQT_LIBRARIES}
++  DESTINATION ${BIN_INSTALL_DIR}
++)
+diff --git a/kmtrace/kminspector.cmake b/kmtrace/kminspector.cmake
+new file mode 100644
+index 0000000..c572ba7
+--- /dev/null
++++ b/kmtrace/kminspector.cmake
+@@ -0,0 +1,9 @@
++#! /bin/sh
++
++export MALLOC_TREE=kminspector.tree
++export MALLOC_THRESHOLD=2000
++export LD_PRELOAD=@LIB_INSTALL_DIR@/kmtrace/libktrace.so
++
++$*
++
++cat kminspector.tree | less
+diff --git a/kompare/CMakeLists.txt b/kompare/CMakeLists.txt
+new file mode 100644
+index 0000000..42d5d45
+--- /dev/null
++++ b/kompare/CMakeLists.txt
+@@ -0,0 +1,55 @@
++#################################################
++#
++#  (C) 2012 Serghei Amelian
++#  serghei (DOT) amelian (AT) gmail.com
++#
++#  Improvements and feedback are welcome
++#
++#  This file is released under GPL >= 2
++#
++#################################################
++
++add_subdirectory( interfaces )
++add_subdirectory( libdiff2 )
++add_subdirectory( libdialogpages )
++add_subdirectory( komparenavtreepart )
++add_subdirectory( komparepart )
++add_subdirectory( pics )
++
++
++include_directories(
++  ${CMAKE_CURRENT_BINARY_DIR}
++  ${CMAKE_CURRENT_SOURCE_DIR}/libdiff2
++  ${CMAKE_CURRENT_SOURCE_DIR}/libdialogpages
++  ${CMAKE_CURRENT_SOURCE_DIR}/komparenavtreepart
++  ${CMAKE_CURRENT_SOURCE_DIR}/komparepart
++  ${CMAKE_CURRENT_SOURCE_DIR}/interfaces
++  ${TDE_INCLUDE_DIR}
++  ${TQT_INCLUDE_DIRS}
++)
++
++link_directories(
++  ${TQT_LIBRARY_DIRS}
++)
++
++
++##### other data ################################
++
++install( FILES kompare.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
++install( FILES kompareui.rc DESTINATION ${DATA_INSTALL_DIR}/kompare )
++
++install( FILES
++    komparenavigationpart.desktop kompareviewpart.desktop
++  DESTINATION ${SERVICETYPES_INSTALL_DIR} )
++
++
++##### kompare (executable) ######################
++
++tde_add_executable( kompare AUTOMOC
++  SOURCES
++    main.cpp kompare_shell.cpp kompareurldialog.cpp
++  LINK
++    dialogpages-static kompareinterface-shared kio-shared
++    kparts-shared ktexteditor-shared
++  DESTINATION ${BIN_INSTALL_DIR}
++)
+diff --git a/kompare/interfaces/CMakeLists.txt b/kompare/interfaces/CMakeLists.txt
+new file mode 100644
+index 0000000..bd6583e
+--- /dev/null
++++ b/kompare/interfaces/CMakeLists.txt
+@@ -0,0 +1,28 @@
++#################################################
++#
++#  (C) 2012 Serghei Amelian
++#  serghei (DOT) amelian (AT) gmail.com
++#
++#  Improvements and feedback are welcome
++#
++#  This file is released under GPL >= 2
++#
++#################################################
++
++include_directories(
++  ${TDE_INCLUDE_DIR}
++  ${TQT_INCLUDE_DIRS}
++)
++
++link_directories(
++  ${TQT_LIBRARY_DIRS}
++)
++
++
++##### kompareinterface (shared) #################
++
++tde_add_library( kompareinterface SHARED
++  SOURCES kompareinterface.cpp
++  LINK ${TQT_LIBRARIES}
++  DESTINATION ${LIB_INSTALL_DIR}
++)
+diff --git a/kompare/komparenavtreepart/CMakeLists.txt b/kompare/komparenavtreepart/CMakeLists.txt
+new file mode 100644
+index 0000000..32af473
+--- /dev/null
++++ b/kompare/komparenavtreepart/CMakeLists.txt
+@@ -0,0 +1,36 @@
++#################################################
++#
++#  (C) 2012 Serghei Amelian
++#  serghei (DOT) amelian (AT) gmail.com
++#
++#  Improvements and feedback are welcome
++#
++#  This file is released under GPL >= 2
++#
++#################################################
++
++include_directories(
++  ${CMAKE_CURRENT_BINARY_DIR}
++  ${CMAKE_CURRENT_SOURCE_DIR}/../libdiff2
++  ${TDE_INCLUDE_DIR}
++  ${TQT_INCLUDE_DIRS}
++)
++
++link_directories(
++  ${TQT_LIBRARY_DIRS}
++)
++
++
++##### other data ################################
++
++install( FILES komparenavtreepart.desktop
++  DESTINATION ${SERVICES_INSTALL_DIR} )
++
++
++##### libkomparenavtreepart (module) ############
++
++tde_add_kpart( libkomparenavtreepart AUTOMOC
++  SOURCES komparenavtreepart.cpp
++  LINK diff2-static kparts-shared
++  DESTINATION ${PLUGIN_INSTALL_DIR}
++)
+diff --git a/kompare/komparepart/CMakeLists.txt b/kompare/komparepart/CMakeLists.txt
+new file mode 100644
+index 0000000..00fe0e0
+--- /dev/null
++++ b/kompare/komparepart/CMakeLists.txt
+@@ -0,0 +1,46 @@
++#################################################
++#
++#  (C) 2012 Serghei Amelian
++#  serghei (DOT) amelian (AT) gmail.com
++#
++#  Improvements and feedback are welcome
++#
++#  This file is released under GPL >= 2
++#
++#################################################
++
++include_directories(
++  ${CMAKE_CURRENT_BINARY_DIR}
++  ${CMAKE_CURRENT_SOURCE_DIR}/../libdiff2
++  ${CMAKE_CURRENT_SOURCE_DIR}/../libdialogpages
++  ${CMAKE_CURRENT_SOURCE_DIR}/../interfaces
++  ${TDE_INCLUDE_DIR}
++  ${TQT_INCLUDE_DIRS}
++)
++
++link_directories(
++  ${TQT_LIBRARY_DIRS}
++)
++
++
++##### other data ################################
++
++install( FILES komparepart.desktop
++  DESTINATION ${SERVICES_INSTALL_DIR} )
++
++install( FILES komparepartui.rc
++  DESTINATION ${DATA_INSTALL_DIR}/kompare )
++
++
++##### libkomparepart (module) ###################
++
++tde_add_kpart( libkomparepart AUTOMOC
++  SOURCES
++    kompare_part.cpp kompareconnectwidget.cpp komparesplitter.cpp
++    komparelistview.cpp kompareprefdlg.cpp komparesaveoptionsbase.ui
++    komparesaveoptionswidget.cpp
++  LINK
++    dialogpages-static diff2-static kompareinterface-shared
++    kparts-shared
++  DESTINATION ${PLUGIN_INSTALL_DIR}
++)
+diff --git a/kompare/libdialogpages/CMakeLists.txt b/kompare/libdialogpages/CMakeLists.txt
+new file mode 100644
+index 0000000..40f61bd
+--- /dev/null
++++ b/kompare/libdialogpages/CMakeLists.txt
+@@ -0,0 +1,26 @@
++#################################################
++#
++#  (C) 2012 Serghei Amelian
++#  serghei (DOT) amelian (AT) gmail.com
++#
++#  Improvements and feedback are welcome
++#
++#  This file is released under GPL >= 2
++#
++#################################################
++
++include_directories(
++  ${CMAKE_CURRENT_BINARY_DIR}
++  ${CMAKE_CURRENT_SOURCE_DIR}/../libdiff2
++  ${TDE_INCLUDE_DIR}
++  ${TQT_INCLUDE_DIRS}
++)
++
++
++##### dialogpages (static) ######################
++
++tde_add_library( dialogpages STATIC_PIC AUTOMOC
++  SOURCES
++    settingsbase.cpp diffsettings.cpp filessettings.cpp viewsettings.cpp
++    pagebase.cpp diffpage.cpp filespage.cpp viewpage.cpp
++)
+diff --git a/kompare/libdiff2/CMakeLists.txt b/kompare/libdiff2/CMakeLists.txt
+new file mode 100644
+index 0000000..65dd77e
+--- /dev/null
++++ b/kompare/libdiff2/CMakeLists.txt
+@@ -0,0 +1,31 @@
++#################################################
++#
++#  (C) 2012 Serghei Amelian
++#  serghei (DOT) amelian (AT) gmail.com
++#
++#  Improvements and feedback are welcome
++#
++#  This file is released under GPL >= 2
++#
++#################################################
++
++include_directories(
++  ${CMAKE_CURRENT_BINARY_DIR}
++  ${CMAKE_CURRENT_SOURCE_DIR}
++  ${CMAKE_CURRENT_SOURCE_DIR}/../libdialogpages
++  ${CMAKE_CURRENT_SOURCE_DIR}/../komparepart
++  ${CMAKE_CURRENT_SOURCE_DIR}/../interfaces
++  ${TDE_INCLUDE_DIR}
++  ${TQT_INCLUDE_DIRS}
++)
++
++
++##### diff2 (static) ############################
++
++tde_add_library( diff2 STATIC_PIC AUTOMOC
++  SOURCES
++    kompareprocess.cpp komparemodellist.cpp diffmodellist.cpp
++    diffmodel.cpp difference.cpp diffhunk.cpp levenshteintable.cpp
++    parser.cpp parserbase.cpp cvsdiffparser.cpp diffparser.cpp
++    perforceparser.cpp
++)
+diff --git a/kompare/pics/CMakeLists.txt b/kompare/pics/CMakeLists.txt
+new file mode 100644
+index 0000000..96bca44
+--- /dev/null
++++ b/kompare/pics/CMakeLists.txt
+@@ -0,0 +1,12 @@
++#################################################
++#
++#  (C) 2012 Serghei Amelian
++#  serghei (DOT) amelian (AT) gmail.com
++#
++#  Improvements and feedback are welcome
++#
++#  This file is released under GPL >= 2
++#
++#################################################
++
++tde_install_icons( )
+diff --git a/kprofilemethod/CMakeLists.txt b/kprofilemethod/CMakeLists.txt
+new file mode 100644
+index 0000000..85ad07e
+--- /dev/null
++++ b/kprofilemethod/CMakeLists.txt
+@@ -0,0 +1,12 @@
++#################################################
++#
++#  (C) 2012 Serghei Amelian
++#  serghei (DOT) amelian (AT) gmail.com
++#
++#  Improvements and feedback are welcome
++#
++#  This file is released under GPL >= 2
++#
++#################################################
++
++install( FILES kprofilemethod.h DESTINATION ${INCLUDE_INSTALL_DIR} )
+diff --git a/kspy/CMakeLists.txt b/kspy/CMakeLists.txt
+new file mode 100644
+index 0000000..2dee53a
+--- /dev/null
++++ b/kspy/CMakeLists.txt
+@@ -0,0 +1,40 @@
++#################################################
++#
++#  (C) 2012 Serghei Amelian
++#  serghei (DOT) amelian (AT) gmail.com
++#
++#  Improvements and feedback are welcome
++#
++#  This file is released under GPL >= 2
++#
++#################################################
++
++include_directories(
++  ${CMAKE_CURRENT_BINARY_DIR}
++  ${CMAKE_BINARY_DIR}
++  ${TDE_INCLUDE_DIR}
++  ${TQT_INCLUDE_DIRS}
++)
++
++link_directories(
++  ${TQT_LIBRARY_DIRS}
++)
++
++
++##### headers ###################################
++
++install( FILES
++    kspy.h
++  DESTINATION ${INCLUDE_INSTALL_DIR} )
++
++
++##### kspy (shared) #############################
++
++tde_add_library( kspy SHARED AUTOMOC
++  SOURCES
++    navviewitem.cpp propsview.cpp navview.cpp spy.cpp sigslotview.cpp
++    receiversview.cpp classinfoview.cpp
++  VERSION 1.2.0
++  LINK kdeui-shared
++  DESTINATION ${LIB_INSTALL_DIR}
++)
+diff --git a/kstartperf/CMakeLists.txt b/kstartperf/CMakeLists.txt
+new file mode 100644
+index 0000000..5d377e7
+--- /dev/null
++++ b/kstartperf/CMakeLists.txt
+@@ -0,0 +1,38 @@
++#################################################
++#
++#  (C) 2012 Serghei Amelian
++#  serghei (DOT) amelian (AT) gmail.com
++#
++#  Improvements and feedback are welcome
++#
++#  This file is released under GPL >= 2
++#
++#################################################
++
++include_directories(
++  ${TDE_INCLUDE_DIR}
++  ${TQT_INCLUDE_DIRS}
++)
++
++link_directories(
++  ${TQT_LIBRARY_DIRS}
++)
++
++
++##### kstartperf (shared) #######################
++
++tde_add_library( kstartperf SHARED AUTOMOC
++  SOURCES libkstartperf.c
++  VERSION 1.0.0
++  LINK ltdl
++  DESTINATION ${LIB_INSTALL_DIR}
++)
++
++
++##### kstartperf (executable) ###################
++
++tde_add_executable( kstartperf
++  SOURCES kstartperf.cpp
++  LINK kdecore-shared
++  DESTINATION ${BIN_INSTALL_DIR}
++)
+diff --git a/kuiviewer/CMakeLists.txt b/kuiviewer/CMakeLists.txt
+new file mode 100644
+index 0000000..0376ea1
+--- /dev/null
++++ b/kuiviewer/CMakeLists.txt
+@@ -0,0 +1,69 @@
++#################################################
++#
++#  (C) 2012 Serghei Amelian
++#  serghei (DOT) amelian (AT) gmail.com
++#
++#  Improvements and feedback are welcome
++#
++#  This file is released under GPL >= 2
++#
++#################################################
++
++include_directories(
++  ${CMAKE_CURRENT_BINARY_DIR}
++  ${CMAKE_BINARY_DIR}
++  ${TDE_INCLUDE_DIR}
++  ${TQT_INCLUDE_DIRS}
++)
++
++link_directories(
++  ${TQT_LIBRARY_DIRS}
++)
++
++
++##### other data ################################
++
++tde_install_icons( kuiviewer )
++
++install( FILES
++    kuiviewerui.rc
++  DESTINATION ${DATA_INSTALL_DIR}/kuiviewer )
++
++install( FILES
++    kuiviewer.desktop
++  DESTINATION ${XDG_APPS_INSTALL_DIR} )
++
++install( FILES
++    kuiviewer_part.desktop designerthumbnail.desktop
++  DESTINATION ${SERVICES_INSTALL_DIR} )
++
++install( FILES
++    kuiviewer_part.rc
++  DESTINATION ${DATA_INSTALL_DIR}/kuiviewerpart )
++
++
++##### libkuiviewerpart (module) #################
++
++tde_add_kpart( libkuiviewerpart AUTOMOC
++  SOURCES kuiviewer_part.cpp
++  LINK ktexteditor-shared qui
++  DESTINATION ${PLUGIN_INSTALL_DIR}
++)
++
++
++##### quithumbnail (module) #####################
++
++tde_add_kpart( quithumbnail
++  SOURCES quicreator.cpp
++  LINK ${TQT_LIBRARIES} qui
++  DESTINATION ${PLUGIN_INSTALL_DIR}
++)
++
++
++##### kuiviewer (executable) ####################
++
++tde_add_executable( kuiviewer AUTOMOC
++  SOURCES main.cpp kuiviewer.cpp
++  LINK ktexteditor-shared
++  DESTINATION ${BIN_INSTALL_DIR}
++)
+diff --git a/kunittest/CMakeLists.txt b/kunittest/CMakeLists.txt
+new file mode 100644
+index 0000000..6b3aefd
+--- /dev/null
++++ b/kunittest/CMakeLists.txt
+@@ -0,0 +1,49 @@
++#################################################
++#
++#  (C) 2012 Serghei Amelian
++#  serghei (DOT) amelian (AT) gmail.com
++#
++#  Improvements and feedback are welcome
++#
++#  This file is released under GPL >= 2
++#
++#################################################
++
++include_directories(
++  ${CMAKE_CURRENT_BINARY_DIR}
++  ${TDE_INCLUDE_DIR}
++  ${TQT_INCLUDE_DIRS}
++)
++
++link_directories(
++  ${TQT_LIBRARY_DIRS}
++)
++
++
++##### headers ###################################
++
++install( FILES
++    runnergui.h
++  DESTINATION ${INCLUDE_INSTALL_DIR}/kunittest )
++
++install( PROGRAMS
++    kunittest kunittestmod kunittest_debughelper
++  DESTINATION ${BIN_INSTALL_DIR} )
++
++
++##### kunittestgui (shared) #####################
++
++tde_add_library( kunittestgui SHARED AUTOMOC
++  SOURCES testerwidget.ui runnergui.cpp dcopinterface.skel
++  LINK kunittest-shared
++  DESTINATION ${LIB_INSTALL_DIR}
++)
++
++
++##### kunittestguimodrunner (executable) ########
++
++tde_add_executable( kunittestguimodrunner
++  SOURCES guimodrunner.cpp
++  LINK kunittestgui-shared
++  DESTINATION ${BIN_INSTALL_DIR}
++)
+diff --git a/poxml/CMakeLists.txt b/poxml/CMakeLists.txt
+new file mode 100644
+index 0000000..ed6c1ae
+--- /dev/null
++++ b/poxml/CMakeLists.txt
+@@ -0,0 +1,70 @@
++#################################################
++#
++#  (C) 2012 Serghei Amelian
++#  serghei (DOT) amelian (AT) gmail.com
++#
++#  Improvements and feedback are welcome
++#
++#  This file is released under GPL >= 2
++#
++#################################################
++
++add_definitions( -fexceptions )
++
++add_subdirectory( antlr )
++
++
++include_directories(
++  ${CMAKE_CURRENT_SOURCE_DIR}/antlr
++  ${TDE_INCLUDE_DIR}
++  ${TQT_INCLUDE_DIRS}
++)
++
++link_directories(
++  ${TQT_LIBRARY_DIRS}
++)
++
++
++##### split2po (executable) #####################
++
++tde_add_executable( split2po
++  SOURCES split.cpp parser.cpp
++  LINK kio-shared
++  DESTINATION ${BIN_INSTALL_DIR}
++)
++
++
++##### xml2pot (executable) ######################
++
++tde_add_executable( xml2pot
++  SOURCES xml2pot.cpp parser.cpp
++  LINK kio-shared
++  DESTINATION ${BIN_INSTALL_DIR}
++)
++
++
++##### po2xml (executable) #######################
++
++tde_add_executable( po2xml
++  SOURCES GettextLexer.cpp GettextParser.cpp po2xml.cpp parser.cpp
++  LINK antlr-static kio-shared
++  DESTINATION ${BIN_INSTALL_DIR}
++)
++
++
++##### swappo (executable) #######################
++
++tde_add_executable( swappo
++  SOURCES GettextLexer.cpp GettextParser.cpp swappo.cpp parser.cpp
++  LINK antlr-static kio-shared
++  DESTINATION ${BIN_INSTALL_DIR}
++)
++
++
++##### transxx (executable) ######################
++
++tde_add_executable( transxx
++  SOURCES GettextLexer.cpp GettextParser.cpp transxx.cpp parser.cpp
++  LINK antlr-static kio-shared
++  DESTINATION ${BIN_INSTALL_DIR}
++)
+diff --git a/poxml/antlr/CMakeLists.txt b/poxml/antlr/CMakeLists.txt
+new file mode 100644
+index 0000000..636d2f7
+--- /dev/null
++++ b/poxml/antlr/CMakeLists.txt
+@@ -0,0 +1,12 @@
++#################################################
++#
++#  (C) 2012 Serghei Amelian
++#  serghei (DOT) amelian (AT) gmail.com
++#
++#  Improvements and feedback are welcome
++#
++#  This file is released under GPL >= 2
++#
++#################################################
++
++add_subdirectory( src )
+diff --git a/poxml/antlr/src/CMakeLists.txt b/poxml/antlr/src/CMakeLists.txt
+new file mode 100644
+index 0000000..cc54d00
+--- /dev/null
++++ b/poxml/antlr/src/CMakeLists.txt
+@@ -0,0 +1,33 @@
++#################################################
++#
++#  (C) 2012 Serghei Amelian
++#  serghei (DOT) amelian (AT) gmail.com
++#
++#  Improvements and feedback are welcome
++#
++#  This file is released under GPL >= 2
++#
++#################################################
++
++string( REPLACE ${TQT_CXX_FLAGS} "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} )
++
++include_directories(
++  ${CMAKE_CURRENT_SOURCE_DIR}/..
++)
++
++
++##### antlr (static) ############################
++
++tde_add_library( antlr STATIC_PIC
++  SOURCES
++    ANTLRException.cpp ASTFactory.cpp ASTRefCount.cpp BaseAST.cpp
++    BitSet.cpp CharBuffer.cpp CharScanner.cpp CommonAST.cpp
++    CommonASTWithHiddenTokens.cpp CommonHiddenStreamToken.cpp
++    CommonToken.cpp InputBuffer.cpp LLkParser.cpp
++    LexerSharedInputState.cpp MismatchedCharException.cpp
++    MismatchedTokenException.cpp NoViableAltException.cpp
++    NoViableAltForCharException.cpp Parser.cpp ParserSharedInputState.cpp
++    RecognitionException.cpp String.cpp Token.cpp TokenBuffer.cpp
++    TokenStreamBasicFilter.cpp TokenStreamHiddenTokenFilter.cpp
++    TokenStreamSelector.cpp TreeParser.cpp TreeParserSharedInputState.cpp
++)
+diff --git a/scheck/CMakeLists.txt b/scheck/CMakeLists.txt
+new file mode 100644
+index 0000000..bef3a46
+--- /dev/null
++++ b/scheck/CMakeLists.txt
+@@ -0,0 +1,34 @@
++#################################################
++#
++#  (C) 2012 Serghei Amelian
++#  serghei (DOT) amelian (AT) gmail.com
++#
++#  Improvements and feedback are welcome
++#
++#  This file is released under GPL >= 2
++#
++#################################################
++
++include_directories(
++  ${CMAKE_CURRENT_BINARY_DIR}
++  ${TDE_INCLUDE_DIR}
++  ${TQT_INCLUDE_DIRS}
++)
++
++link_directories(
++  ${TQT_LIBRARY_DIRS}
++)
++
++
++##### other data ################################
++
++install( FILES scheck.themerc DESTINATION ${DATA_INSTALL_DIR}/kstyle/themes )
++
++
++##### scheck (module) ############################
++
++tde_add_kpart( scheck AUTOMOC
++  SOURCES scheck.cpp
++  LINK kdeui-shared
++  DESTINATION ${PLUGIN_INSTALL_DIR}
++)
+diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
+new file mode 100644
+index 0000000..6ed8ca8
+--- /dev/null
++++ b/scripts/CMakeLists.txt
+@@ -0,0 +1,43 @@
++#################################################
++#
++#  (C) 2012 Serghei Amelian
++#  serghei (DOT) amelian (AT) gmail.com
++#
++#  Improvements and feedback are welcome
++#
++#  This file is released under GPL >= 2
++#
++#################################################
++
++install( PROGRAMS
++    create_makefile create_makefiles adddebug cheatmake makeobj kde-build
++    build-progress.sh pruneemptydirs cvsbackport cvsversion cvscheck
++    cvslastchange cvslastlog cvsrevertlast noncvslist cvs-clean cvs2dist
++    cvsblame cvsforwardport create_cvsignore colorsvn create_svnignore
++    nonsvnlist svn2dist svnaddcurrentdir svnbackport svnforwardport
++    svn-clean svngettags svnlastchange svnlastlog svnrevertlast
++    svnversions svnchangesince findmissingcrystal kdesvn-build
++    kdedoc qtdoc extractrc extractattr zonetab2pot.py licensecheck
++    fixkdeincludes fixuifiles includemocs cxxmetric extend_dmalloc
++    kdekillall kdelnk2desktop.py package_crystalsvg png2mng.pl
++    kdemangen.pl
++  DESTINATION ${BIN_INSTALL_DIR} )
++
++
++install( FILES
++    kdesvn-buildrc.xml
++  DESTINATION ${DATA_INSTALL_DIR}/katepart/syntax )
++
++
++macro( _pod2man )
++  foreach( _pod ${ARGN} )
++    add_custom_command(
++      OUTPUT ${_pod}.1
++      COMMAND pod2man ${CMAKE_CURRENT_SOURCE_DIR}/${_pod} > ${_pod}.1
++      DEPENDS ${_pod} )
++    add_custom_target( "${_pod}-man" ALL DEPENDS ${_pod}.1 )
++    install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${_pod}.1 DESTINATION ${MAN_INSTALL_DIR} )
++  endforeach( )
++endmacro()
++
++_pod2man( kde-build kdesvn-build cvsversion cvscheck noncvslist cvsblame includemocs )
+diff --git a/kcachegrind/CMakeLists.txt b/kcachegrind/CMakeLists.txt
+new file mode 100644
+index 0000000..8c2da80
+--- /dev/null
++++ b/kcachegrind/CMakeLists.txt
+@@ -0,0 +1,21 @@
++#################################################
++#
++#  (C) 2012 Serghei Amelian
++#  serghei (DOT) amelian (AT) gmail.com
++#
++#  Improvements and feedback are welcome
++#
++#  This file is released under GPL >= 2
++#
++#################################################
++
++include( ConfigureChecks.cmake )
++
++set( KCACHEGRIND_VERSION "0.4.6kde" )
++configure_file( version.h.in version.h @ONLY )
++configure_file( kcachegrind.spec.in kcachegrind.spec @ONLY )
++configure_file( kcachegrind.lsm.in kcachegrind.lsm @ONLY )
++
++add_subdirectory( kcachegrind )
++add_subdirectory( pics )
++add_subdirectory( converters )
+diff --git a/kcachegrind/ConfigureChecks.cmake b/kcachegrind/ConfigureChecks.cmake
+new file mode 100644
+index 0000000..e9b5cc2
+--- /dev/null
++++ b/kcachegrind/ConfigureChecks.cmake
+@@ -0,0 +1,12 @@
++#################################################
++#
++#  (C) 2012 Serghei Amelian
++#  serghei (DOT) amelian (AT) gmail.com
++#
++#  Improvements and feedback are welcome
++#
++#  This file is released under GPL >= 2
++#
++#################################################
++
++check_function_exists( mmap HAVE_MMAP )
+diff --git a/kcachegrind/converters/CMakeLists.txt b/kcachegrind/converters/CMakeLists.txt
+new file mode 100644
+index 0000000..03e86bc
+--- /dev/null
++++ b/kcachegrind/converters/CMakeLists.txt
+@@ -0,0 +1,15 @@
++#################################################
++#
++#  (C) 2012 Serghei Amelian
++#  serghei (DOT) amelian (AT) gmail.com
++#
++#  Improvements and feedback are welcome
++#
++#  This file is released under GPL >= 2
++#
++#################################################
++
++install( PROGRAMS
++    hotshot2calltree op2calltree pprof2calltree
++    dprof2calltree memprof2calltree
++  DESTINATION ${BIN_INSTALL_DIR} )
+diff --git a/kcachegrind/pics/CMakeLists.txt b/kcachegrind/pics/CMakeLists.txt
+new file mode 100644
+index 0000000..ee29446
+--- /dev/null
++++ b/kcachegrind/pics/CMakeLists.txt
+@@ -0,0 +1,14 @@
++#################################################
++#
++#  (C) 2012 Serghei Amelian
++#  serghei (DOT) amelian (AT) gmail.com
++#
++#  Improvements and feedback are welcome
++#
++#  This file is released under GPL >= 2
++#
++#################################################
++
++add_subdirectory( hicolor )
++
++tde_install_icons( DESTINATION ${DATA_INSTALL_DIR}/kcachegrind/icons )
+diff --git a/kcachegrind/pics/hicolor/CMakeLists.txt b/kcachegrind/pics/hicolor/CMakeLists.txt
+new file mode 100644
+index 0000000..1c162a1
+--- /dev/null
++++ b/kcachegrind/pics/hicolor/CMakeLists.txt
+@@ -0,0 +1,12 @@
++#################################################
++#
++#  (C) 2012 Serghei Amelian
++#  serghei (DOT) amelian (AT) gmail.com
++#
++#  Improvements and feedback are welcome
++#
++#  This file is released under GPL >= 2
++#
++#################################################
++
++tde_install_icons( DESTINATION ${DATA_INSTALL_DIR}/kcachegrind/icons )
+diff --git a/kcachegrind/kcachegrind/CMakeLists.txt b/kcachegrind/kcachegrind/CMakeLists.txt
+new file mode 100644
+index 0000000..cd284c3
+--- /dev/null
++++ b/kcachegrind/kcachegrind/CMakeLists.txt
+@@ -0,0 +1,50 @@
++#################################################
++#
++#  (C) 2012 Serghei Amelian
++#  serghei (DOT) amelian (AT) gmail.com
++#
++#  Improvements and feedback are welcome
++#
++#  This file is released under GPL >= 2
++#
++#################################################
++
++include_directories(
++  ${CMAKE_CURRENT_BINARY_DIR}
++  ${CMAKE_CURRENT_SOURCE_DIR}
++  ${CMAKE_BINARY_DIR}
++  ${TDE_INCLUDE_DIR}
++  ${TQT_INCLUDE_DIRS}
++)
++
++link_directories(
++  ${TQT_LIBRARY_DIRS}
++)
++
++
++##### other data ################################
++
++tde_install_icons( )
++install( FILES kcachegrind.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
++install( FILES kcachegrindui.rc tips DESTINATION ${DATA_INSTALL_DIR}/kcachegrind )
++install( FILES x-kcachegrind.desktop DESTINATION ${MIME_INSTALL_DIR}/application )
++
++
++##### kcachegrind (executable) ##################
++
++tde_add_executable( kcachegrind AUTOMOC
++  SOURCES
++    functionselectionbase.ui stackselectionbase.ui partselectionbase.ui
++    configdlgbase.ui loader.cpp cachegrindloader.cpp treemap.cpp pool.cpp
++    main.cpp configuration.cpp functionselection.cpp coverage.cpp
++    partgraph.cpp toplevel.cpp stackselection.cpp stackbrowser.cpp
++    subcost.cpp tracedata.cpp partselection.cpp configdlg.cpp
++    utils.cpp fixcost.cpp traceitemview.cpp instrview.cpp tabview.cpp
++    sourceview.cpp callmapview.cpp callview.cpp coverageview.cpp
++    costtypeview.cpp partview.cpp listutils.cpp costtypeitem.cpp
++    multiview.cpp callitem.cpp coverageitem.cpp sourceitem.cpp
++    costlistitem.cpp partlistitem.cpp functionitem.cpp instritem.cpp
++    stackitem.cpp callgraphview.cpp
++  LINK kio-shared
++  DESTINATION ${BIN_INSTALL_DIR}
++)
+diff --git a/umbrello/CMakeLists.txt b/umbrello/CMakeLists.txt
+new file mode 100644
+index 0000000..5429f5a
+--- /dev/null
++++ b/umbrello/CMakeLists.txt
+@@ -0,0 +1,19 @@
++#################################################
++#
++#  (C) 2012 Serghei Amelian
++#  serghei (DOT) amelian (AT) gmail.com
++#
++#  Improvements and feedback are welcome
++#
++#  This file is released under GPL >= 2
++#
++#################################################
++
++include( ConfigureChecks.cmake )
++
++# generate version.h
++file( READ VERSION text )
++string( REGEX REPLACE "\n" "" text "${text}" )
++file( WRITE ${CMAKE_CURRENT_BINARY_DIR}/version.h "#define UMBRELLO_VERSION \"${text}\"\n" )
++
++add_subdirectory( umbrello )
+diff --git a/umbrello/ConfigureChecks.cmake b/umbrello/ConfigureChecks.cmake
+new file mode 100644
+index 0000000..2167ab9
+--- /dev/null
++++ b/umbrello/ConfigureChecks.cmake
+@@ -0,0 +1,20 @@
++#################################################
++#
++#  (C) 2010-2011 Serghei Amelian
++#  serghei (DOT) amelian (AT) gmail.com
++#
++#  Improvements and feedback are welcome
++#
++#  This file is released under GPL >= 2
++#
++#################################################
++
++pkg_search_module( XML2 libxml-2.0 )
++if( NOT XML2_FOUND )
++  tde_message_fatal( "libxml-2.0 is required, but was not found on your system" )
++endif( )
++
++pkg_search_module( XSLT libxslt )
++if( NOT XSLT_FOUND )
++  tde_message_fatal( "libxslt is required, but was not found on your system" )
++endif( )
+diff --git a/umbrello/umbrello/CMakeLists.txt b/umbrello/umbrello/CMakeLists.txt
+new file mode 100644
+index 0000000..f7c299b
+--- /dev/null
++++ b/umbrello/umbrello/CMakeLists.txt
+@@ -0,0 +1,86 @@
++#################################################
++#
++#  (C) 2012 Serghei Amelian
++#  serghei (DOT) amelian (AT) gmail.com
++#
++#  Improvements and feedback are welcome
++#
++#  This file is released under GPL >= 2
++#
++#################################################
++
++add_subdirectory( codeimport )
++add_subdirectory( dialogs )
++add_subdirectory( docgenerators )
++add_subdirectory( clipboard )
++add_subdirectory( pics )
++add_subdirectory( codegenerators )
++add_subdirectory( headings )
++add_subdirectory( refactoring )
++
++include_directories(
++  ${CMAKE_CURRENT_BINARY_DIR}
++  ${CMAKE_CURRENT_BINARY_DIR}/.. # for version.h
++  ${CMAKE_CURRENT_BINARY_DIR}/dialogs
++  ${CMAKE_BINARY_DIR}
++  ${TDE_INCLUDE_DIR}
++  ${TQT_INCLUDE_DIRS}
++)
++
++link_directories(
++  ${TQT_LIBRARY_DIRS}
++)
++
++
++##### other data ################################
++
++tde_install_icons( )
++install( FILES x-umbrello.desktop DESTINATION ${MIME_INSTALL_DIR}/application )
++install( FILES tips umbrelloui.rc DESTINATION ${DATA_INSTALL_DIR}/umbrello )
++install( FILES umbrello.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
++
++
++##### umbrello (executable) #####################
++
++tde_add_executable( umbrello AUTOMOC
++  SOURCES
++    activitywidget.cpp actor.cpp actorwidget.cpp aligntoolbar.cpp
++    artifact.cpp artifactwidget.cpp association.cpp associationwidget.cpp
++    assocrules.cpp attribute.cpp boxwidget.cpp classifier.cpp
++    classifiercodedocument.cpp classifierlistitem.cpp
++    classifierwidget.cpp cmdlineexportallviewsevent.cpp
++    codeaccessormethod.cpp codeblock.cpp codeblockwithcomments.cpp
++    codeclassfield.cpp codeclassfielddeclarationblock.cpp
++    codecomment.cpp codedocument.cpp codegenerationpolicy.cpp
++    codegenerator.cpp codegenobjectwithtextblocks.cpp codemethodblock.cpp
++    codeoperation.cpp codeparameter.cpp component.cpp componentwidget.cpp
++    configurable.cpp datatypewidget.cpp dialog_utils.cpp
++    docwindow.cpp entity.cpp entityattribute.cpp entitywidget.cpp
++    enum.cpp enumliteral.cpp enumwidget.cpp floatingtextwidget.cpp
++    floatingtextwidgetcontroller.cpp folder.cpp forkjoinwidget.cpp
++    kplayerslideraction.cpp hierarchicalcodeblock.cpp import_rose.cpp
++    kstartuplogo.cpp linepath.cpp linkwidget.cpp listpopupmenu.cpp
++    main.cpp messagewidget.cpp messagewidgetcontroller.cpp
++    model_utils.cpp node.cpp nodewidget.cpp notewidget.cpp
++    notewidgetcontroller.cpp objectwidget.cpp objectwidgetcontroller.cpp
++    object_factory.cpp operation.cpp optionstate.cpp ownedcodeblock.cpp
++    ownedhierarchicalcodeblock.cpp package.cpp packagewidget.cpp
++    petalnode.cpp petaltree2uml.cpp plugin.cpp pluginloader.cpp
++    seqlinewidget.cpp statewidget.cpp stereotype.cpp template.cpp
++    textblock.cpp toolbarstate.cpp toolbarstatearrow.cpp
++    toolbarstateassociation.cpp toolbarstatefactory.cpp
++    toolbarstatemessages.cpp toolbarstateother.cpp toolbarstatepool.cpp
++    uml.cpp umlattributelist.cpp umlentityattributelist.cpp
++    umlcanvasobject.cpp umlclassifierlistitemlist.cpp umldoc.cpp
++    umllistview.cpp umllistviewitem.cpp umlnamespace.cpp umlobject.cpp
++    umlobjectlist.cpp umlrole.cpp umlview.cpp umlviewcanvas.cpp
++    umlviewimageexporter.cpp umlviewimageexporterall.cpp
++    umlviewimageexportermodel.cpp umlwidget.cpp umlwidgetcontroller.cpp
++    uniqueid.cpp usecase.cpp usecasewidget.cpp widgetbase.cpp
++    widget_factory.cpp widget_utils.cpp worktoolbar.cpp
++  LINK
++    refactoring-static codeimport-static kdevcppparser-static clipboard-static
++    codegenerator-static docgenerators-static dialogs-static
++    kdeprint-shared kio-shared ${XML2_LIBRARIES} ${XSLT_LIBRARIES}
++  DESTINATION ${BIN_INSTALL_DIR}
++)
+diff --git a/umbrello/umbrello/clipboard/CMakeLists.txt b/umbrello/umbrello/clipboard/CMakeLists.txt
+new file mode 100644
+index 0000000..a2e6113
+--- /dev/null
++++ b/umbrello/umbrello/clipboard/CMakeLists.txt
+@@ -0,0 +1,25 @@
++#################################################
++#
++#  (C) 2012 Serghei Amelian
++#  serghei (DOT) amelian (AT) gmail.com
++#
++#  Improvements and feedback are welcome
++#
++#  This file is released under GPL >= 2
++#
++#################################################
++
++include_directories(
++  ${CMAKE_CURRENT_BINARY_DIR}
++  ${CMAKE_BINARY_DIR}
++  ${TDE_INCLUDE_DIR}
++  ${TQT_INCLUDE_DIRS}
++)
++
++
++##### clipboard (static) ########################
++
++tde_add_library( clipboard STATIC AUTOMOC
++  SOURCES
++    umldrag.cpp umlclipboard.cpp idchangelog.cpp
++)
+diff --git a/umbrello/umbrello/codegenerators/CMakeLists.txt b/umbrello/umbrello/codegenerators/CMakeLists.txt
+new file mode 100644
+index 0000000..7d68333
+--- /dev/null
++++ b/umbrello/umbrello/codegenerators/CMakeLists.txt
+@@ -0,0 +1,54 @@
++#################################################
++#
++#  (C) 2012 Serghei Amelian
++#  serghei (DOT) amelian (AT) gmail.com
++#
++#  Improvements and feedback are welcome
++#
++#  This file is released under GPL >= 2
++#
++#################################################
++
++include_directories(
++  ${CMAKE_CURRENT_BINARY_DIR}
++  ${CMAKE_CURRENT_BINARY_DIR}/../dialogs
++  ${CMAKE_CURRENT_SOURCE_DIR}/../dialogs
++  ${CMAKE_BINARY_DIR}
++  ${TDE_INCLUDE_DIR}
++  ${TQT_INCLUDE_DIRS}
++)
++
++
++##### codegenerator (static) ####################
++
++tde_add_library( codegenerator STATIC AUTOMOC
++  SOURCES
++    codegenfactory.cpp classifierinfo.cpp javacodegenerator.cpp
++    javaantcodedocument.cpp javacodeclassfield.cpp
++    javaclassifiercodedocument.cpp javacodecomment.cpp
++    javacodedocumentation.cpp javacodeoperation.cpp
++    javacodeaccessormethod.cpp javaclassdeclarationblock.cpp
++    javacodeclassfielddeclarationblock.cpp javacodegenerationpolicy.cpp
++    javacodegenerationpolicypage.cpp javacodegenerationformbase.ui
++    cppcodegenerator.cpp cppcodedocumentation.cpp cppcodeclassfield.cpp
++    cppcodecomment.cpp cppmakecodedocument.cpp cppsourcecodedocument.cpp
++    cppsourcecodeoperation.cpp cppsourcecodeaccessormethod.cpp
++    cppsourcecodeclassfielddeclarationblock.cpp
++    cppheadercodedocument.cpp cppheaderclassdeclarationblock.cpp
++    cppheadercodeoperation.cpp cppheadercodeaccessormethod.cpp
++    cppheadercodeclassfielddeclarationblock.cpp
++    cppcodegenerationpolicy.cpp cppcodegenerationpolicypage.cpp
++    cppcodegenerationformbase.ui cppcodegenerationform.cpp
++    rubycodegenerator.cpp rubycodeclassfield.cpp
++    rubyclassifiercodedocument.cpp rubycodecomment.cpp
++    rubycodedocumentation.cpp rubycodeoperation.cpp
++    rubycodeaccessormethod.cpp rubyclassdeclarationblock.cpp
++    rubycodeclassfielddeclarationblock.cpp rubycodegenerationpolicy.cpp
++    rubycodegenerationpolicypage.cpp rubycodegenerationformbase.ui
++    simplecodegenerator.cpp adawriter.cpp aswriter.cpp cppwriter.cpp
++    csharpwriter.cpp dwriter.cpp javawriter.cpp jswriter.cpp
++    idlwriter.cpp pascalwriter.cpp perlwriter.cpp php5writer.cpp
++    phpwriter.cpp pythonwriter.cpp rubywriter.cpp sqlwriter.cpp
++    tclwriter.cpp xmlschemawriter.cpp xmlelementcodeblock.cpp
++    xmlcodecomment.cpp codegen_utils.cpp
++)
+diff --git a/umbrello/umbrello/codeimport/CMakeLists.txt b/umbrello/umbrello/codeimport/CMakeLists.txt
+new file mode 100644
+index 0000000..d616ca6
+--- /dev/null
++++ b/umbrello/umbrello/codeimport/CMakeLists.txt
+@@ -0,0 +1,29 @@
++#################################################
++#
++#  (C) 2012 Serghei Amelian
++#  serghei (DOT) amelian (AT) gmail.com
++#
++#  Improvements and feedback are welcome
++#
++#  This file is released under GPL >= 2
++#
++#################################################
++
++add_subdirectory( kdevcppparser )
++
++
++include_directories(
++  ${CMAKE_BINARY_DIR}
++  ${TDE_INCLUDE_DIR}
++  ${TQT_INCLUDE_DIRS}
++)
++
++
++##### codeimport (static) ########################
++
++tde_add_library( codeimport STATIC
++  SOURCES
++    adaimport.cpp classimport.cpp cppimport.cpp idlimport.cpp
++    import_utils.cpp javaimport.cpp nativeimportbase.cpp pascalimport.cpp
++    pythonimport.cpp
++)
+diff --git a/umbrello/umbrello/codeimport/kdevcppparser/CMakeLists.txt b/umbrello/umbrello/codeimport/kdevcppparser/CMakeLists.txt
+new file mode 100644
+index 0000000..6c16fe3
+--- /dev/null
++++ b/umbrello/umbrello/codeimport/kdevcppparser/CMakeLists.txt
+@@ -0,0 +1,24 @@
++#################################################
++#
++#  (C) 2012 Serghei Amelian
++#  serghei (DOT) amelian (AT) gmail.com
++#
++#  Improvements and feedback are welcome
++#
++#  This file is released under GPL >= 2
++#
++#################################################
++
++include_directories(
++  ${TDE_INCLUDE_DIR}
++  ${TQT_INCLUDE_DIRS}
++)
++
++
++##### kdevcppparser (static) ####################
++
++tde_add_library( kdevcppparser STATIC
++  SOURCES
++    ast.cpp driver.cpp errors.cpp lexer.cpp lookup.cpp parser.cpp
++    tree_parser.cpp urlutil.cpp ast_utils.cpp cpptree2uml.cpp
++)
+diff --git a/umbrello/umbrello/dialogs/CMakeLists.txt b/umbrello/umbrello/dialogs/CMakeLists.txt
+new file mode 100644
+index 0000000..fbe04fa
+--- /dev/null
++++ b/umbrello/umbrello/dialogs/CMakeLists.txt
+@@ -0,0 +1,40 @@
++#################################################
++#
++#  (C) 2012 Serghei Amelian
++#  serghei (DOT) amelian (AT) gmail.com
++#
++#  Improvements and feedback are welcome
++#
++#  This file is released under GPL >= 2
++#
++#################################################
++
++include_directories(
++  ${CMAKE_CURRENT_BINARY_DIR}
++  ${CMAKE_BINARY_DIR}
++  ${TDE_INCLUDE_DIR}
++  ${TQT_INCLUDE_DIRS}
++)
++
++
++##### dialogs (static) ##########################
++
++tde_add_library( dialogs STATIC AUTOMOC
++  SOURCES
++    codegenerationoptionsbase.ui codegenerationpolicybase.ui
++    codegenerationwizardbase.ui codeviewerdialogbase.ui
++    codevieweroptionsbase.ui diagrampropertiespage.ui
++    exportallviewsdialogbase.ui umlrolepropertiesbase.ui
++    activitydialog.cpp activitypage.cpp assocgenpage.cpp
++    assocpage.cpp assocpropdlg.cpp assocrolepage.cpp classgenpage.cpp
++    classifierlistpage.cpp classoptionspage.cpp classpropdlg.cpp
++    classwizard.cpp codeeditor.cpp codegenerationoptionspage.cpp
++    codegenerationpolicypage.cpp codegenerationwizard.cpp
++    codeviewerdialog.cpp codevieweroptionspage.cpp
++    defaultcodegenpolicypage.cpp diagramprintpage.cpp
++    exportallviewsdialog.cpp notedialog.cpp overwritedialogue.cpp
++    pkgcontentspage.cpp parmpropdlg.cpp selectopdlg.cpp settingsdlg.cpp
++    statedialog.cpp umlattributedialog.cpp umlentityattributedialog.cpp
++    umloperationdialog.cpp umltemplatedialog.cpp umlroledialog.cpp
++    umlroleproperties.cpp umlviewdialog.cpp umlwidgetcolorpage.cpp
++)
+diff --git a/umbrello/umbrello/docgenerators/CMakeLists.txt b/umbrello/umbrello/docgenerators/CMakeLists.txt
+new file mode 100644
+index 0000000..7ab19cf
+--- /dev/null
++++ b/umbrello/umbrello/docgenerators/CMakeLists.txt
+@@ -0,0 +1,48 @@
++#################################################
++#
++#  (C) 2012 Serghei Amelian
++#  serghei (DOT) amelian (AT) gmail.com
++#
++#  Improvements and feedback are welcome
++#
++#  This file is released under GPL >= 2
++#
++#################################################
++
++include_directories(
++  ${CMAKE_CURRENT_BINARY_DIR}
++  ${CMAKE_CURRENT_BINARY_DIR}/../.. # for version.h
++  ${CMAKE_CURRENT_SOURCE_DIR}/..
++  ${CMAKE_BINARY_DIR}
++  ${TDE_INCLUDE_DIR}
++  ${TQT_INCLUDE_DIRS}
++  ${XML2_INCLUDE_DIRS}
++)
++
++link_directories(
++  ${TQT_LIBRARY_DIRS}
++)
++
++
++##### other data ################################
++
++install( FILES
++    xmi2docbook.xsl docbook2xhtml.xsl xmi.css common.ent
++  DESTINATION ${DATA_INSTALL_DIR}/umbrello )
++
++
++##### umbodoc (executable) ######################
++
++tde_add_executable( umbodoc
++  SOURCES main.cpp
++  LINK kdecore-shared ${XML2_LIBRARIES} ${XSLT_LIBRARIES}
++  DESTINATION ${BIN_INSTALL_DIR}
++)
++
++
++##### docgenerators (static) ####################
++
++tde_add_library( docgenerators STATIC AUTOMOC
++  SOURCES
++    docbookgenerator.h docbookgenerator.cpp xhtmlgenerator.cpp
++)
+diff --git a/umbrello/umbrello/headings/CMakeLists.txt b/umbrello/umbrello/headings/CMakeLists.txt
+new file mode 100644
+index 0000000..aeac637
+--- /dev/null
++++ b/umbrello/umbrello/headings/CMakeLists.txt
+@@ -0,0 +1,16 @@
++#################################################
++#
++#  (C) 2012 Serghei Amelian
++#  serghei (DOT) amelian (AT) gmail.com
++#
++#  Improvements and feedback are welcome
++#
++#  This file is released under GPL >= 2
++#
++#################################################
++
++install( FILES
++    heading.adb heading.ads heading.as heading.cpp heading.cs heading.d
++    heading.h heading.idl heading.java heading.js heading.php heading.pm
++    heading.py heading.rb heading.sql heading.xsd
++  DESTINATION ${DATA_INSTALL_DIR}/umbrello/headings )
+diff --git a/umbrello/umbrello/pics/CMakeLists.txt b/umbrello/umbrello/pics/CMakeLists.txt
+new file mode 100644
+index 0000000..2d350aa
+--- /dev/null
++++ b/umbrello/umbrello/pics/CMakeLists.txt
+@@ -0,0 +1,53 @@
++#################################################
++#
++#  (C) 2012 Serghei Amelian
++#  serghei (DOT) amelian (AT) gmail.com
++#
++#  Improvements and feedback are welcome
++#
++#  This file is released under GPL >= 2
++#
++#################################################
++
++tde_install_icons(
++  umbrello_diagram_activity umbrello_diagram_class
++  umbrello_diagram_collaboration umbrello_diagram_component
++  umbrello_diagram_deployment umbrello_diagram_sequence
++  umbrello_diagram_state umbrello_diagram_usecase
++  umbrello_diagram_entityrelationship )
++
++
++install( FILES
++    actor.png aggregation.png align_left.png align_right.png
++    align_top.png align_bottom.png align_vert_middle.png
++    align_hori_middle.png align_vert_distribute.png
++    align_hori_distribute.png anchor.png andline.png arrow.png
++    association.png choice-rhomb.png choice-round.png component.png
++    composition.png containment.png CVglobal_meth.png CVglobal_var.png
++    CVimplementation_meth.png CVimplementation_signal.png
++    CVimplementation_slot.png CVimplementation_var.png CVnamespace.png
++    CVprivate_meth.png CVprivate_signal.png CVprivate_slot.png
++    CVprivate_var.png CVprotected_meth.png CVprotected_signal.png
++    CVprotected_slot.png CVprotected_var.png CVpublic_meth.png
++    CVpublic_signal.png CVpublic_slot.png CVpublic_var.png CVstruct.png
++    deep-history.png shallow-history.png dependency.png end_state.png
++    generalisation.png initial_state.png interface.png join.png
++    junction.png datatype.png enum.png message-synchronous.png
++    message-asynchronous.png note.png object.png startlogo.png
++    template.png text.png class.png uniassociation.png usecase.png
++    branch.png fork.png state-fork.png package.png subsystem.png
++    artifact.png box.png node.png entity.png relationship.png
++    cursor-actor.png cursor-andline.png cursor-choice-rhomb.png
++    cursor-choice-round.png cursor-deep-history.png cursor-join.png
++    cursor-junction.png cursor-shallow-history.png cursor-state-fork.png
++    cursor-usecase.png cursor-initial_state.png cursor-package.png
++    cursor-aggregation.png cursor-component.png cursor-containment.png
++    cursor-interface.png cursor-datatype.png cursor-enum.png
++    cursor-text.png cursor-anchor.png cursor-composition.png
++    cursor-message-asynchronous.png cursor-class.png cursor-artifact.png
++    cursor-dependency.png cursor-message-synchronous.png
++    cursor-uniassociation.png cursor-association.png cursor-end_state.png
++    cursor-node.png cursor-box.png cursor-fork.png cursor-note.png
++    cursor-branch.png cursor-generalisation.png cursor-object.png
++    cursor-entity.png cursor-relationship.png
++  DESTINATION ${DATA_INSTALL_DIR}/umbrello/pics )
+diff --git a/umbrello/umbrello/refactoring/CMakeLists.txt b/umbrello/umbrello/refactoring/CMakeLists.txt
+new file mode 100644
+index 0000000..fd20459
+--- /dev/null
++++ b/umbrello/umbrello/refactoring/CMakeLists.txt
+@@ -0,0 +1,24 @@
++#################################################
++#
++#  (C) 2012 Serghei Amelian
++#  serghei (DOT) amelian (AT) gmail.com
++#
++#  Improvements and feedback are welcome
++#
++#  This file is released under GPL >= 2
++#
++#################################################
++
++include_directories(
++  ${CMAKE_CURRENT_BINARY_DIR}
++  ${CMAKE_BINARY_DIR}
++  ${TDE_INCLUDE_DIR}
++  ${TQT_INCLUDE_DIRS}
++)
++
++
++##### refactoring (static) ######################
++
++tde_add_library( refactoring STATIC AUTOMOC
++  SOURCES refactoringassistant.cpp
++)
diff --git a/redhat/kdesdk/kdesdk-3.5.13-cmake_port.patch b/redhat/kdesdk/kdesdk-3.5.13-cmake_port.patch
new file mode 100644
index 000000000..48d239534
--- /dev/null
+++ b/redhat/kdesdk/kdesdk-3.5.13-cmake_port.patch
@@ -0,0 +1,100 @@
+commit bfb0bc00e959ed3cac6cf4e517a24de50446be50
+Author: Serghei Amelian <serghei.amelian@gmail.com>
+Date:   1329176749 +0200
+
+    [tdesdk] cmake port
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 806890a..c6f7d3d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -26,6 +26,7 @@ include( CheckIncludeFile )
+ include( CheckTypeSize )
+ include( CheckCSourceCompiles )
+ include( CheckCXXSourceCompiles )
++include( CheckFunctionExists )
+ include( CheckLibraryExists )
+ 
+ 
+@@ -55,6 +56,21 @@ option( BUILD_DOC "Build documentation" ${BUILD_ALL} )
+ option( BUILD_KAPPTEMPLATE "Build kapptemplate" ${BUILD_ALL} )
+ option( BUILD_KBABEL "Build kbabel" ${BUILD_ALL} )
+ option( BUILD_KBUGBUSTER "Build kbugbuster" ${BUILD_ALL} )
++option( BUILD_KDEACCOUNTS_PLUGIN "Build kdeaccounts-plugin" ${BUILD_ALL} )
++option( BUILD_KFILE_PLUGINS "Build kfile-plugins" ${BUILD_ALL} )
++option( BUILD_KIOSLAVE "Build kioslave" ${BUILD_ALL} )
++option( BUILD_KMTRACE "Build kmtrace" ${BUILD_ALL} )
++option( BUILD_KOMPARE "Build kompare" ${BUILD_ALL} )
++option( BUILD_KPROFILEMETHOD "Build kprofilemethod" ${BUILD_ALL} )
++option( BUILD_KSPY "Build kspy" ${BUILD_ALL} )
++option( BUILD_KSTARTPERF "Build kstartperf" ${BUILD_ALL} )
++option( BUILD_KUIVIEWER "Build kuiviewer" ${BUILD_ALL} )
++option( BUILD_KUNITTEST "Build kunittest" ${BUILD_ALL} )
++option( BUILD_POXML "Build poxml" ${BUILD_ALL} )
++option( BUILD_SCHECK "Build scheck" ${BUILD_ALL} )
++option( BUILD_SCRIPTS "Build scripts" ${BUILD_ALL} )
++option( BUILD_TDECACHEGRIND "Build tdecachegrind" ${BUILD_ALL} )
++option( BUILD_UMBRELLO "Build umbrello" ${BUILD_ALL} )
+ 
+ 
+ ##### configure checks ##########################
+@@ -83,6 +96,21 @@ tde_conditional_add_subdirectory( BUILD_DOC doc )
+ tde_conditional_add_subdirectory( BUILD_KAPPTEMPLATE kapptemplate )
+ tde_conditional_add_subdirectory( BUILD_KBABEL kbabel )
+ tde_conditional_add_subdirectory( BUILD_KBUGBUSTER kbugbuster )
++tde_conditional_add_subdirectory( BUILD_KDEACCOUNTS_PLUGIN kdeaccounts-plugin )
++tde_conditional_add_subdirectory( BUILD_KFILE_PLUGINS kfile-plugins )
++tde_conditional_add_subdirectory( BUILD_KIOSLAVE kioslave )
++tde_conditional_add_subdirectory( BUILD_KMTRACE kmtrace )
++tde_conditional_add_subdirectory( BUILD_KOMPARE kompare )
++tde_conditional_add_subdirectory( BUILD_KPROFILEMETHOD kprofilemethod )
++tde_conditional_add_subdirectory( BUILD_KSPY kspy )
++tde_conditional_add_subdirectory( BUILD_KSTARTPERF kstartperf )
++tde_conditional_add_subdirectory( BUILD_KUIVIEWER kuiviewer )
++tde_conditional_add_subdirectory( BUILD_KUNITTEST kunittest )
++tde_conditional_add_subdirectory( BUILD_POXML poxml )
++tde_conditional_add_subdirectory( BUILD_SCHECK scheck )
++tde_conditional_add_subdirectory( BUILD_SCRIPTS scripts )
++tde_conditional_add_subdirectory( BUILD_TDECACHEGRIND kcachegrind )
++tde_conditional_add_subdirectory( BUILD_UMBRELLO umbrello )
+ 
+ 
+ ##### write configure files #####################
+diff --git a/config.h.cmake b/config.h.cmake
+index 139f3c7..7ab8b07 100644
+--- a/config.h.cmake
++++ b/config.h.cmake
+@@ -1 +1,4 @@
+ #cmakedefine VERSION "@version@"
++
++// kcachegrind
++#cmakedefine HAVE_MMAP 1
+diff --git a/kbabel/kbabel/CMakeLists.txt b/kbabel/kbabel/CMakeLists.txt
+index b5164b4..6b263b5 100644
+--- a/kbabel/kbabel/CMakeLists.txt
++++ b/kbabel/kbabel/CMakeLists.txt
+@@ -62,4 +62,5 @@ tde_add_library( kbabel STATIC AUTOMOC
+     fontpreferences.ui editordiffpreferences.ui editorpreferences.ui
+     searchpreferences.ui colorpreferences.ui kbcataloglistview.cpp
+     kbcataloglistviewitem.cpp errorlistview.cpp
++  DEPENDENCIES kbabelcommon-shared
+ )
+diff --git a/kmtrace/ktrace.c b/kmtrace/ktrace.c
+index 21fca37..8b9eb2f 100644
+--- a/kmtrace/ktrace.c
++++ b/kmtrace/ktrace.c
+@@ -778,12 +778,12 @@ kuntrace()
+ 			"Mallocs:        %8ld   Frees:        %8ld   Leaks:        %8ld\n"
+ 			"Logged Mallocs: %8ld   Logged Frees: %8ld   Logged Leaks: %8ld\n"
+ 			"Avg. Free lookups: %ld  Malloc collisions: %ld  Max offset: %ld\n",
+-			tr_max_mallocs, TR_CACHE_SIZE, tr_flashes,
++			tr_max_mallocs, (long int)TR_CACHE_SIZE, tr_flashes,
+ 			tr_mallocs, tr_frees, tr_current_mallocs,
+ 			tr_logged_mallocs, tr_logged_frees,
+ 			tr_logged_mallocs - tr_logged_frees,
+ 			tr_frees > 0 ? ( tr_failed_free_lookups / tr_frees ) : 0,
+-			tr_malloc_collisions, tr_max_offset);
++			tr_malloc_collisions, (long int)tr_max_offset);
+ #endif
+ 	fclose (mallstream);
+ 	mallstream = NULL;
diff --git a/redhat/kdesdk/kdesdk-3.5.13-fix_ftbfs_on_newer_svn.patch b/redhat/kdesdk/kdesdk-3.5.13-fix_ftbfs_on_newer_svn.patch
new file mode 100644
index 000000000..38db4c083
--- /dev/null
+++ b/redhat/kdesdk/kdesdk-3.5.13-fix_ftbfs_on_newer_svn.patch
@@ -0,0 +1,32 @@
+commit 572169a2e18705e526990c52924a268b218ff52b
+Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Date:   1340737965 -0500
+
+    Fix FTBFS on newer subversion libraries
+    This closes Bug 872
+
+diff --git a/kioslave/svn/ConfigureChecks.cmake b/kioslave/svn/ConfigureChecks.cmake
+index 81358c6..3d46c74 100644
+--- a/kioslave/svn/ConfigureChecks.cmake
++++ b/kioslave/svn/ConfigureChecks.cmake
+@@ -19,12 +19,16 @@ endif( )
+ 
+ # check for subversion library
+ 
+-check_library_exists( "svn_client-1" "svn_pool_create_ex" "${SVN_LIBRARY_DIR}" HAVE_SVN_POOL_CREATE_EX )
+-
+-if( HAVE_SVN_POOL_CREATE_EX )
++check_library_exists( "svn_client-1" "svn_pool_create_ex" "${SVN_LIBRARY_DIR}" HAVE_SVN_POOL_CREATE_EX_SVN_CLIENT )
++if( HAVE_SVN_POOL_CREATE_EX_SVN_CLIENT )
+   set( SVN_LIBRARIES "svn_client-1;svn_subr-1;svn_ra-1" )
+ else( )
+-  tde_message_fatal( "svn_client-1 library was not found on your system.\n Subversion is installed?\n Try to set SVN_LIBRARY_DIR to subversion library directory." )
++  check_library_exists( "svn_subr-1" "svn_pool_create_ex" "${SVN_LIBRARY_DIR}" HAVE_SVN_POOL_CREATE_EX_SUBR )
++  if( HAVE_SVN_POOL_CREATE_EX_SUBR )
++    set( SVN_LIBRARIES "svn_client-1;svn_subr-1;svn_ra-1" )
++  else( )
++    tde_message_fatal( "svn_client-1 or svn_subr-1 library was not found on your system.\n Subversion is installed?\n Try to set SVN_LIBRARY_DIR to subversion library directory." )
++  endif( )
+ endif( )
+ 
+ 
diff --git a/redhat/kdesdk/kdesdk-3.5.13-misc_ftbfs.patch b/redhat/kdesdk/kdesdk-3.5.13-misc_ftbfs.patch
new file mode 100644
index 000000000..38fc4a825
--- /dev/null
+++ b/redhat/kdesdk/kdesdk-3.5.13-misc_ftbfs.patch
@@ -0,0 +1,21 @@
+--- kdesdk/kapptemplate/CMakeLists.txt.ORI	2012-07-30 17:58:45.681535290 +0200
++++ kdesdk/kapptemplate/CMakeLists.txt	2012-07-30 17:58:55.232338294 +0200
+@@ -23,7 +23,7 @@
+ 
+ install( PROGRAMS
+     ${CMAKE_CURRENT_BINARY_DIR}/kapptemplate
+-  DESTINATION ${DATA_INSTALL_DIR}/kapptemplate/bin )
++  DESTINATION ${BIN_INSTALL_DIR}/kapptemplate/bin )
+ 
+ install( FILES
+     kapptemplate.common kapptemplate.module
+--- kdesdk/kbugbuster/kresources/CMakeLists.txt.ORI	2012-07-30 18:00:21.039575551 +0200
++++ kdesdk/kbugbuster/kresources/CMakeLists.txt	2012-07-30 18:00:25.414486000 +0200
+@@ -17,6 +17,7 @@
+   ${CMAKE_CURRENT_BINARY_DIR}
+   ${CMAKE_CURRENT_SOURCE_DIR}/../backend
+   ${TDE_INCLUDE_DIR}
++  ${TDE_INCLUDE_DIR}/kde
+   ${TQT_INCLUDE_DIRS}
+ )
+ 
diff --git a/redhat/kdesdk/trinity-kdesdk-3.5.13.spec b/redhat/kdesdk/trinity-kdesdk-3.5.13.spec
index 0adce1e02..6bb248eb3 100644
--- a/redhat/kdesdk/trinity-kdesdk-3.5.13.spec
+++ b/redhat/kdesdk/trinity-kdesdk-3.5.13.spec
@@ -1,18 +1,26 @@
 # 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
-%define tde_docdir %{_docdir}/kde
-%define tde_libdir %{_libdir}/trinity
+%define tde_bindir %{_prefix}/bin
+%define tde_datadir %{_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{_prefix}/include
+%define tde_libdir %{_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
 
+%define tde_tdeappdir %{tde_datadir}/applications/kde
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
 
-Name:    trinity-kdesdk
-Summary: The KDE Software Development Kit (SDK)
-Version: 3.5.13
-Release: 1%{?dist}%{?_variant}
+
+Name:			trinity-tdesdk
+Summary:		The KDE Software Development Kit (SDK)
+Version:		3.5.13
+Release:		2%{?dist}%{?_variant}
 
 License:		GPLv2
 Group:			User Interface/Desktops
@@ -20,44 +28,72 @@ URL:			http://www.trinitydesktop.org/
 Vendor:			Trinity Project
 Packager:		Francois Andriot <francois.andriot@free.fr>
 
-Prefix:		%{_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source: kdesdk-%{version}.tar.gz
+Source: 		kdesdk-%{version}.tar.gz
 
 # RedHat Legacy patches
-Patch1: kdesdk-3.5.7-subversion.patch
-
-Provides: kdesdk3 = %{version}-%{release}
-
-Requires: %{name}-libs = %{version}-%{release}
+Patch1:		kdesdk-3.5.7-subversion.patch
+# [tdesdk] cmake port [Commit #bfb0bc00]
+Patch2:		kdesdk-3.5.13-cmake_port.patch
+# [tdesdk/cmake] added forgotten files [Commit #adee843c]
+Patch3:		kdesdk-3.5.13-add_forgotten_cmake_files.patch
+# [tdesdk] fixes for RHEL/Fedora/MGA2 after previous patch
+Patch4:		kdesdk-3.5.13-misc_ftbfs.patch
+# [tdesdk] Fix FTBFS on newer subversion libraries [Bug #872] [Commit #572169a2]
+Patch5:		kdesdk-3.5.13-fix_ftbfs_on_newer_svn.patch
 
 BuildRequires: cmake >= 2.8
 BuildRequires: libtool
 BuildRequires: tqtinterface-devel
 BuildRequires: pcre-devel
-BuildRequires: trinity-kdelibs-devel
+BuildRequires: trinity-tdelibs-devel
 # for kbugbuster/libkcal
-BuildRequires: trinity-kdepim-devel
+BuildRequires: trinity-tdepim-devel
 BuildRequires: db4-devel
 BuildRequires: desktop-file-utils
 # kbabel,  F-7+: flex >= 2.5.33-9
 BuildRequires: flex
 # umbrello
 BuildRequires: libxslt-devel libxml2-devel
+BuildRequires:	perl
+BuildRequires:	subversion-devel neon-devel
+
+%if 0%{?mgaversion}
+BuildRequires:	%{_lib}ltdl-devel
+BuildRequires:	%{_lib}binutils-devel
+%else
+BuildRequires:	libtool-ltdl-devel
 %if 0%{?fedora} > 5 || 0%{?rhel} > 4
 BuildRequires: binutils-devel
 %endif
-BuildRequires: perl
-BuildRequires: subversion-devel neon-devel
+%endif
 
-# Obsoletes/Provides
-%define cervisia_ver 2.4.7
-Provides: cervisia = %{cervisia_ver}-%{release}
+Obsoletes:		trinity-kdesdk < %{version}-%{release}
+Provides:		trinity-kdesdk = %{version}-%{release}
+Obsoletes:		trinity-kdesdk-libs < %{version}-%{release}
+Provides:		trinity-kdesdk-libs = %{version}-%{release}
 
-%define umbrello_ver 1.5.7
-Obsoletes: umbrello < %{umbrello_ver}-%{release}
-Provides:  umbrello = %{umbrello_ver}-%{release}
+Requires: trinity-cervisia = %{version}-%{release}
+Requires: trinity-kapptemplate = %{version}-%{release}
+Requires: trinity-kbabel = %{version}-%{release}
+Requires: trinity-kbugbuster = %{version}-%{release}
+Requires: trinity-tdecachegrind = %{version}-%{release}
+Requires: trinity-tdecachegrind-converters = %{version}-%{release}
+Requires: %{name}-kfile-plugins = %{version}-%{release}
+Requires: %{name}-misc = %{version}-%{release}
+Requires: %{name}-scripts = %{version}-%{release}
+Requires: trinity-kmtrace = %{version}-%{release}
+Requires: trinity-kompare = %{version}-%{release}
+Requires: trinity-kspy = %{version}-%{release}
+Requires: trinity-kuiviewer = %{version}-%{release}
+Requires: trinity-libcvsservice0 = %{version}-%{release}
+Requires: trinity-libcvsservice-devel = %{version}-%{release}
+Requires: trinity-poxml = %{version}-%{release}
+Requires: trinity-umbrello = %{version}-%{release}
+Requires: %{name}-kio-plugins = %{version}-%{release}
+Requires: trinity-kunittest = %{version}-%{release}
 
 
 %description
@@ -70,43 +106,953 @@ A collection of applications and tools used by developers, including:
 * kuiviewer: displays designer's UI files
 * umbrello: UML modeller and UML diagram tool
 
+%files
+
+##########
+
+%package -n trinity-cervisia
+Summary:	A graphical CVS front end for Trinity
+Group:		Development/Utilities
+
+%description -n trinity-cervisia
+Cervisia is a TDE-based graphical front end for the CVS client.
+
+As well as providing both common and advanced CVS operations, it offers
+a variety of methods for graphically viewing information about the CVS
+repository, your own sandbox and the relationships between different
+versions of files.  A Changelog editor is also included and is coupled
+with the commit dialog.
+
+This package is part of Trinity, and a component of the TDE SDK module.
+
+%files -n trinity-cervisia
+%{tde_bindir}/cervisia
+%{tde_libdir}/lib[kt]deinit_cervisia.la
+%{tde_libdir}/lib[kt]deinit_cervisia.so
+%{tde_tdelibdir}/cervisia.la
+%{tde_tdelibdir}/cervisia.so
+%{tde_tdelibdir}/libcervisiapart.la
+%{tde_tdelibdir}/libcervisiapart.so
+%{tde_tdeappdir}/cervisia.desktop
+%{tde_datadir}/apps/cervisia/
+%{tde_datadir}/apps/cervisiapart/cervisiaui.rc
+%{tde_datadir}/apps/kconf_update/cervisia.upd
+%{tde_datadir}/apps/kconf_update/cervisia-change_repos_list.pl
+%{tde_datadir}/apps/kconf_update/cervisia-normalize_cvsroot.pl
+%{tde_datadir}/apps/kconf_update/move_repositories.pl
+%{tde_datadir}/apps/kconf_update/change_colors.pl
+%{tde_datadir}/config.kcfg/cervisiapart.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/cervisia.png
+%{tde_datadir}/icons/crystalsvg/*/actions/vcs_*.png
+%{tde_datadir}/icons/crystalsvg/scalable/actions/vcs_*.svgz
+#%{tde_mandir}/man1/cervisia.1*
+%{tde_tdedocdir}/HTML/en/cervisia/
+
+%post -n trinity-cervisia
+/sbin/ldconfig || :
+for f in crystalsvg hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-cervisia
+/sbin/ldconfig || :
+for f in crystalsvg hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kapptemplate
+Summary:	Creates a framework to develop a Trinity application
+Group:		Development/Utilities
+
+%description -n trinity-kapptemplate
+KAppTemplate is a shell script that will create the necessary
+framework to develop various TDE applications.  It takes care of the
+autoconf/automake code as well as providing a skeleton and example of
+what the code typically looks like.
+
+This package is part of Trinity, and a component of the TDE SDK module.
+
+%files -n trinity-kapptemplate
+%{tde_bindir}/kapptemplate
+%{tde_datadir}/apps/kapptemplate/
+
+##########
+
+%package -n trinity-kbabel
+Summary:	PO-file editing suite for Trinity
+Group:		Development/Utilities
+
+%description -n trinity-kbabel
+This is a suite of programs for editing gettext message files (PO-files).
+It is designed to help you translate fast and consistently.
+
+This suite includes KBabel, CatalogManager and KBabelDict.  KBabel is an
+advanced and easy to use PO-file editor with full navigational and editing
+capabilities, syntax checking and statistics.  CatalogManager is a multi
+functional catalog manager which allows you to keep track of many
+PO-files at once.  KBabelDict is a dictionary to assist with searching
+for common translations.
+
+This package is part of Trinity, and a component of the TDE SDK module.
+See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
+
+%files -n trinity-kbabel
+%{tde_bindir}/catalogmanager
+%{tde_bindir}/kbabel
+%{tde_bindir}/kbabeldict
+%{tde_libdir}/libkbabelcommon.so.*
+%{tde_libdir}/libkbabeldictplugin.so.*
+%{tde_tdelibdir}/kfile_po.la
+%{tde_tdelibdir}/kfile_po.so
+%{tde_tdelibdir}/pothumbnail.la
+%{tde_tdelibdir}/pothumbnail.so
+%{tde_tdelibdir}/kbabel_accelstool.la
+%{tde_tdelibdir}/kbabel_accelstool.so
+%{tde_tdelibdir}/kbabel_argstool.la
+%{tde_tdelibdir}/kbabel_argstool.so
+%{tde_tdelibdir}/kbabel_contexttool.la
+%{tde_tdelibdir}/kbabel_contexttool.so
+%{tde_tdelibdir}/kbabel_equationstool.la
+%{tde_tdelibdir}/kbabel_equationstool.so
+%{tde_tdelibdir}/kbabel_gettextexport.la
+%{tde_tdelibdir}/kbabel_gettextexport.so
+%{tde_tdelibdir}/kbabel_gettextimport.la
+%{tde_tdelibdir}/kbabel_gettextimport.so
+%{tde_tdelibdir}/kbabel_lengthtool.la
+%{tde_tdelibdir}/kbabel_lengthtool.so
+%{tde_tdelibdir}/kbabel_linguistexport.la
+%{tde_tdelibdir}/kbabel_linguistexport.so
+%{tde_tdelibdir}/kbabel_linguistimport.la
+%{tde_tdelibdir}/kbabel_linguistimport.so
+%{tde_tdelibdir}/kbabel_nottranslatedtool.la
+%{tde_tdelibdir}/kbabel_nottranslatedtool.so
+%{tde_tdelibdir}/kbabel_pluraltool.la
+%{tde_tdelibdir}/kbabel_pluraltool.so
+%{tde_tdelibdir}/kbabel_punctuationtool.la
+%{tde_tdelibdir}/kbabel_punctuationtool.so
+%{tde_tdelibdir}/kbabel_regexptool.la
+%{tde_tdelibdir}/kbabel_regexptool.so
+%{tde_tdelibdir}/kbabel_setfuzzytool.la
+%{tde_tdelibdir}/kbabel_setfuzzytool.so
+%{tde_tdelibdir}/kbabel_whitespacetool.la
+%{tde_tdelibdir}/kbabel_whitespacetool.so
+%{tde_tdelibdir}/kbabel_xliffexport.la
+%{tde_tdelibdir}/kbabel_xliffexport.so
+%{tde_tdelibdir}/kbabel_xliffimport.la
+%{tde_tdelibdir}/kbabel_xliffimport.so
+%{tde_tdelibdir}/kbabel_xmltool.la
+%{tde_tdelibdir}/kbabel_xmltool.so
+%{tde_tdelibdir}/kbabeldict_dbsearchengine.la
+%{tde_tdelibdir}/kbabeldict_dbsearchengine.so
+%{tde_tdelibdir}/kbabeldict_poauxiliary.la
+%{tde_tdelibdir}/kbabeldict_poauxiliary.so
+%{tde_tdelibdir}/kbabeldict_pocompendium.la
+%{tde_tdelibdir}/kbabeldict_pocompendium.so
+%{tde_tdelibdir}/kbabeldict_tmxcompendium.la
+%{tde_tdelibdir}/kbabeldict_tmxcompendium.so
+%{tde_tdeappdir}/catalogmanager.desktop
+%{tde_tdeappdir}/kbabel.desktop
+%{tde_tdeappdir}/kbabeldict.desktop
+%{tde_datadir}/apps/catalogmanager/catalogmanagerui.rc
+%{tde_datadir}/apps/kbabel/
+%{tde_datadir}/apps/kconf_update/kbabel-difftoproject.upd
+%{tde_datadir}/apps/kconf_update/kbabel-project.upd
+%{tde_datadir}/apps/kconf_update/kbabel-projectrename.upd
+%{tde_datadir}/config.kcfg/kbabel.kcfg
+%{tde_datadir}/config.kcfg/kbprojectsettings.kcfg
+%{tde_tdedocdir}/HTML/en/kbabel/
+%{tde_datadir}/icons/hicolor/*/apps/catalogmanager.png
+%{tde_datadir}/icons/hicolor/*/apps/kbabel.png
+%{tde_datadir}/icons/hicolor/*/apps/kbabeldict.png
+%{tde_datadir}/icons/locolor/*/apps/catalogmanager.png
+%{tde_datadir}/icons/locolor/*/apps/kbabel.png
+%{tde_datadir}/icons/locolor/*/apps/kbabeldict.png
+%{tde_datadir}/services/dbsearchengine.desktop
+%{tde_datadir}/services/kfile_po.desktop
+%{tde_datadir}/services/pothumbnail.desktop
+%{tde_datadir}/services/kbabel_accelstool.desktop
+%{tde_datadir}/services/kbabel_argstool.desktop
+%{tde_datadir}/services/kbabel_contexttool.desktop
+%{tde_datadir}/services/kbabel_equationstool.desktop
+%{tde_datadir}/services/kbabel_gettext_export.desktop
+%{tde_datadir}/services/kbabel_gettext_import.desktop
+%{tde_datadir}/services/kbabel_lengthtool.desktop
+%{tde_datadir}/services/kbabel_linguist_export.desktop
+%{tde_datadir}/services/kbabel_linguist_import.desktop
+%{tde_datadir}/services/kbabel_nottranslatedtool.desktop
+%{tde_datadir}/services/kbabel_pluralformstool.desktop
+%{tde_datadir}/services/kbabel_punctuationtool.desktop
+%{tde_datadir}/services/kbabel_regexptool.desktop
+%{tde_datadir}/services/kbabel_setfuzzytool.desktop
+%{tde_datadir}/services/kbabel_whitespacetool.desktop
+%{tde_datadir}/services/kbabel_xliff_export.desktop
+%{tde_datadir}/services/kbabel_xliff_import.desktop
+%{tde_datadir}/services/kbabel_xmltool.desktop
+%{tde_datadir}/services/pocompendium.desktop
+%{tde_datadir}/services/poauxiliary.desktop
+%{tde_datadir}/services/tmxcompendium.desktop
+%{tde_datadir}/servicetypes/kbabel_tool.desktop
+%{tde_datadir}/servicetypes/kbabel_validator.desktop
+%{tde_datadir}/servicetypes/kbabeldict_module.desktop
+%{tde_datadir}/servicetypes/kbabelfilter.desktop
+
+%post -n trinity-kbabel
+/sbin/ldconfig || :
+for f in hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kbabel
+/sbin/ldconfig || :
+for f in hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kbabel-devel
+Summary:	PO-file editing suite for Trinity (development files)
+Group:		Development/Libraries
+Requires:	trinity-kbabel = %{version}-%{release}
+
+%description -n trinity-kbabel-devel
+This is a suite of programs for editing gettext message files (PO-files).
+It is designed to help you translate fast and consistently.
+
+This suite includes KBabel, CatalogManager and KBabelDict.  KBabel is an
+advanced and easy to use PO-file editor with full navigational and editing
+capabilities, syntax checking and statistics.  CatalogManager is a multi
+functional catalog manager which allows you to keep track of many
+PO-files at once.  KBabelDict is a dictionary to assist with searching
+for common translations.
+
+This package contains the KBabel development files.
+
+This package is part of Trinity, and a component of the TDE SDK module.
+
+%files -n trinity-kbabel-devel
+%{tde_includedir}/kbabel/
+%{tde_libdir}/libkbabelcommon.la
+%{tde_libdir}/libkbabelcommon.so
+%{tde_libdir}/libkbabeldictplugin.la
+%{tde_libdir}/libkbabeldictplugin.so
+
+%post -n trinity-kbabel-devel
+/sbin/ldconfig || :
+
+%postun -n trinity-kbabel-devel
+/sbin/ldconfig || :
+
+##########
+
+%package -n trinity-kbugbuster
+Summary:	a front end for the Trinity bug tracking system
+Group:		Development/Utilities
+
+%description -n trinity-kbugbuster
+KBugBuster is a GUI front end for the TDE bug tracking system.
+It allows the user to view and manipulate bug reports and provides a
+variety of options for searching through reports.
+
+This package is part of Trinity, and a component of the TDE SDK module.
+
+%files -n trinity-kbugbuster
+%{tde_bindir}/kbugbuster
+%{tde_tdelibdir}/kcal_bugzilla.la
+%{tde_tdelibdir}/kcal_bugzilla.so
+%{tde_tdeappdir}/kbugbuster.desktop
+%{tde_datadir}/apps/kbugbuster/
+%{tde_datadir}/icons/hicolor/*/apps/kbugbuster.png
+%{tde_datadir}/icons/locolor/*/apps/kbugbuster.png
+%{tde_datadir}/services/kresources/kcal/bugzilla.desktop
+%{tde_tdedocdir}/HTML/en/kbugbuster/
+
+%post -n trinity-kbugbuster
+for f in hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kbugbuster
+for f in hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-tdecachegrind
+Summary:	visualisation tool for valgrind profiling output
+Group:		Development/Utilities
+
+%description -n trinity-tdecachegrind
+KCachegrind is a visualisation tool for the profiling data generated
+by calltree, a profiling skin for valgrind.  Applications can be
+profiled using calltree without being recompiled, and shared libraries
+and plugin architectures are supported.
+
+For visualising the output from other profiling tools, several converters
+can be found in the tdecachegrind-converters package.
+
+This package is part of Trinity, and a component of the TDE SDK module.
+
+%files -n trinity-tdecachegrind
+%{tde_bindir}/kcachegrind
+%{tde_tdeappdir}/kcachegrind.desktop
+%{tde_datadir}/apps/kcachegrind/
+%{tde_datadir}/icons/locolor/*/apps/kcachegrind.png
+%{tde_datadir}/icons/hicolor/*/apps/kcachegrind.png
+%{tde_datadir}/mimelnk/application/x-kcachegrind.desktop
+%{tde_tdedocdir}/HTML/en/kcachegrind/
+
+%post -n trinity-tdecachegrind
+for f in hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-tdecachegrind
+for f in hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-tdecachegrind-converters
+Summary:	format converters for KCachegrind profiling visualisation tool
+Group:		Development/Utilities
+Requires:	php-cli
+Requires:	python
+
+%description -n trinity-tdecachegrind-converters
+This is a collection of scripts for converting the output from
+different profiling tools into a format that KCachegrind can use.
+
+KCachegrind is a visualisation tool for the profiling data generated
+by calltree, a profiling skin for valgrind.  Applications can be
+profiled using calltree without being recompiled, and shared libraries
+and plugin architectures are supported.
+
+This package is part of Trinity, and a component of the TDE SDK module.
+
+%files -n trinity-tdecachegrind-converters
+%{tde_bindir}/dprof2calltree
+%{tde_bindir}/hotshot2calltree
+%{tde_bindir}/memprof2calltree
+%{tde_bindir}/op2calltree
+%{tde_bindir}/pprof2calltree
+
+##########
+
+%package kfile-plugins
+Summary:	Trinity file dialog plugins for software development files
+Group:		Environment/Libraries
+
+%description kfile-plugins
+This is a collection of plugins for the TDE file dialog.  These plugins
+extend the file dialog to offer advanced meta-information for source files,
+patch files and Qt Linguist data.
+
+This package is part of Trinity, and a component of the TDE SDK module.
+
+%files kfile-plugins
+%{tde_tdelibdir}/kfile_cpp.so
+%{tde_tdelibdir}/kfile_cpp.la
+%{tde_tdelibdir}/kfile_diff.so
+%{tde_tdelibdir}/kfile_diff.la
+%{tde_tdelibdir}/kfile_ts.so
+%{tde_tdelibdir}/kfile_ts.la
+%{tde_datadir}/services/kfile_cpp.desktop
+%{tde_datadir}/services/kfile_diff.desktop
+%{tde_datadir}/services/kfile_h.desktop
+%{tde_datadir}/services/kfile_ts.desktop
+
+##########
+
+%package misc
+Summary:	various goodies from the Trinity Software Development Kit
+Group:		Development/Libraries
+
+%description misc
+This package contains miscellaneous goodies provided with the official
+TDE release to assist with TDE software development.
+
+Included are:
+- headers to assist with profiling TDE code;
+- a widget style for checking conformity with the TDE/Qt style guide;
+- palettes that match the KDE standard colour palette;
+- a TDE address book plugin that reads the list of TDE CVS accounts.
+
+This package is part of Trinity, and a component of the TDE SDK module.
+
+%files misc
+%{tde_includedir}/kprofilemethod.h
+%{tde_tdelibdir}/kabcformat_kdeaccounts.la
+%{tde_tdelibdir}/kabcformat_kdeaccounts.so
+%{tde_tdelibdir}/scheck.so
+%{tde_tdelibdir}/scheck.la
+%{tde_datadir}/apps/kabc/formats/kdeaccountsplugin.desktop
+%{tde_datadir}/apps/kstyle/themes/scheck.themerc
+%{tde_datadir}/kdepalettes/
+
+%{tde_libdir}/libkstartperf.so.*
+%{tde_libdir}/libkstartperf.so
+%{tde_libdir}/libkstartperf.la
+%{tde_bindir}/kstartperf
+
+%post misc
+/sbin/ldconfig || :
+
+%postun misc
+/sbin/ldconfig || :
+
+##########
+
+%package scripts
+Summary:	a set of useful development scripts for Trinity
+Group:		Development/Utilities
+Requires:	python
+
+%description scripts
+This package contains a number of scripts which can be used to help in
+developing TDE-based applications.  Many of these scripts however are
+not specific to TDE, and in particular there are several general-use
+scripts to help users in working with SVN and CVS repositories.
+
+In addition to these scripts, this package provides:
+- gdb macros for Qt/TDE programming;
+- vim and emacs helper files for Qt/TDE programming;
+- bash and zsh completion controls for TDE apps;
+- valgrind error suppressions for TDE apps.
+
+This package is part of Trinity, and a component of the TDE SDK module.
+
+%files scripts
+%{tde_bindir}/adddebug
+%{tde_bindir}/build-progress.sh
+%{tde_bindir}/cheatmake
+%{tde_bindir}/create_cvsignore
+%{tde_bindir}/create_makefile
+%{tde_bindir}/create_makefiles
+%{tde_bindir}/cvs-clean
+%{tde_bindir}/cvs2dist
+%{tde_bindir}/cvsbackport
+%{tde_bindir}/cvsblame
+%{tde_bindir}/cvscheck
+%{tde_bindir}/cvsforwardport
+%{tde_bindir}/cvslastchange
+%{tde_bindir}/cvslastlog
+%{tde_bindir}/cvsrevertlast
+%{tde_bindir}/cvsversion
+%{tde_bindir}/cxxmetric
+%{tde_bindir}/extend_dmalloc
+%{tde_bindir}/extractattr
+%{tde_bindir}/extractrc
+%{tde_bindir}/findmissingcrystal
+%{tde_bindir}/fixkdeincludes
+%{tde_bindir}/fixuifiles
+%{tde_bindir}/includemocs
+%{tde_bindir}/kde-build
+%{tde_bindir}/kdedoc
+%{tde_bindir}/kdekillall
+%{tde_bindir}/kdelnk2desktop.py*
+%{tde_bindir}/kdemangen.pl
+%{tde_bindir}/makeobj
+%{tde_bindir}/noncvslist
+%{tde_bindir}/package_crystalsvg
+%{tde_bindir}/png2mng.pl
+%{tde_bindir}/pruneemptydirs
+%{tde_bindir}/qtdoc
+%{tde_bindir}/zonetab2pot.py*
+%{tde_bindir}/svn2dist
+%{tde_bindir}/svnrevertlast
+%{tde_bindir}/svnforwardport
+%{tde_bindir}/nonsvnlist
+%{tde_bindir}/[kt]desvn-build
+%{tde_bindir}/svnlastlog
+%{tde_bindir}/svnversions
+%{tde_bindir}/create_svnignore
+%{tde_bindir}/svnlastchange
+%{tde_bindir}/colorsvn
+%{tde_bindir}/svnaddcurrentdir
+%{tde_bindir}/svnbackport
+%{tde_bindir}/svngettags
+%{tde_bindir}/svnchangesince
+%{tde_bindir}/svn-clean
+%{tde_datadir}/apps/katepart/syntax/[kt]desvn-buildrc.xml
+%{tde_mandir}/man1/cvsblame.1
+%{tde_mandir}/man1/cvscheck.1
+%{tde_mandir}/man1/cvsversion.1
+%{tde_mandir}/man1/kde-build.1
+%{tde_mandir}/man1/includemocs.1
+%{tde_mandir}/man1/noncvslist.1
+%{tde_mandir}/man1/[kt]desvn-build.1
+%{tde_tdedocdir}/HTML/en/[kt]desvn-build/
+#scripts/kde-devel-gdb /opt/trinity/share/tdesdk-scripts
+#scripts/kde-devel-vim.vim /opt/trinity/share/tdesdk-scripts
+#scripts/kde-emacs/*.el /opt/trinity/share/emacs/site-lisp/tdesdk-scripts
+#scripts/kde.supp /opt/trinity/lib/valgrind
+#scripts/completions /opt/trinity/share/tdesdk-scripts
+
+#debian/desktop-i18n/createdesktop.pl /opt/trinity/lib/kubuntu-desktop-i18n/
+#debian/desktop-i18n/findfiles /opt/trinity/lib/kubuntu-desktop-i18n/
+#debian/desktop-i18n/msgsplit /opt/trinity/lib/kubuntu-desktop-i18n/
+
+%if "%{?_prefix}" != "/usr"
+%{tde_bindir}/licensecheck
+%else
+%exclude %{tde_bindir}/licensecheck
+%endif
+
+##########
+
+%package -n trinity-kmtrace
+Summary:	a Trinity memory leak tracer
+Group:		Development/Utilities
+Requires:	less
+
+%description -n trinity-kmtrace
+KMtrace is a TDE tool to assist with malloc debugging using glibc's
+"mtrace" functionality.
+
+This package is part of Trinity, and a component of the TDE SDK module.
+
+%files -n trinity-kmtrace
+%{tde_bindir}/demangle
+%{tde_bindir}/kminspector
+%{tde_bindir}/kmmatch
+%{tde_bindir}/kmtrace
+#%{tde_tdeincludedir}/ktrace.h
+%{tde_libdir}/kmtrace/libktrace.la
+%{tde_libdir}/kmtrace/libktrace.so
+%{tde_libdir}/libktrace_s.a
+%{tde_datadir}/apps/kmtrace/kde.excludes
+
+##########
+
+%package -n trinity-kompare
+Summary:	a Trinity GUI for viewing differences between files
+Group:		Development/Utilities
+
+%description -n trinity-kompare
+Kompare is a graphical user interface for viewing the differences between
+files.  It can compare two documents, create a diff file, display a diff
+file and/or blend a diff file back into the original documents.
+
+This package is part of Trinity, and a component of the TDE SDK module.
+
+%files -n trinity-kompare
+%{tde_bindir}/kompare
+%{tde_libdir}/libkompareinterface.la
+%{tde_libdir}/libkompareinterface.so
+#%{tde_libdir}/libkompareinterface.so.*
+%{tde_tdelibdir}/libkomparenavtreepart.la
+%{tde_tdelibdir}/libkomparenavtreepart.so
+%{tde_tdelibdir}/libkomparepart.la
+%{tde_tdelibdir}/libkomparepart.so
+%{tde_tdeappdir}/kompare.desktop
+%{tde_datadir}/apps/kompare/komparepartui.rc
+%{tde_datadir}/apps/kompare/kompareui.rc
+%{tde_datadir}/services/komparenavtreepart.desktop
+%{tde_datadir}/services/komparepart.desktop
+%{tde_datadir}/servicetypes/komparenavigationpart.desktop
+%{tde_datadir}/servicetypes/kompareviewpart.desktop
+%{tde_datadir}/icons/hicolor/*/apps/kompare.png
+%{tde_datadir}/icons/hicolor/scalable/apps/kompare.svgz
+%{tde_tdedocdir}/HTML/en/kompare/
+
+%post -n trinity-kompare
+/sbin/ldconfig || :
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kompare
+/sbin/ldconfig || :
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kspy
+Summary:	examines the internal state of a Qt/TDE app
+Group:		Environment/Libraries
+Requires:	trinity-tdelibs-devel
+
+%description -n trinity-kspy
+KSpy is a tiny library which can be used to graphically display
+the QObjects in use by a Qt/TDE app.  In addition to the object tree,
+you can also view the properties, signals and slots of any QObject.
+
+Basically it provides much the same info as QObject::dumpObjectTree() and
+QObject::dumpObjectInfo(), but in a much more convenient form.  KSpy has
+minimal overhead for the application, because the kspy library is
+loaded dynamically using KLibLoader.
+
+This package is part of Trinity, and a component of the TDE SDK module.
+
+%files -n trinity-kspy
+%{tde_includedir}/kspy.h
+%{tde_libdir}/libkspy.la
+%{tde_libdir}/libkspy.so
+%{tde_libdir}/libkspy.so.*
+
+%post -n trinity-kspy
+/sbin/ldconfig || :
+
+%postun -n trinity-kspy
+/sbin/ldconfig || :
+
+##########
+
+%package -n trinity-kuiviewer
+Summary:	viewer for Qt Designer user interface files
+Group:		Development/Utilities
+
+%description -n trinity-kuiviewer
+KUIViewer is a utility to display and test the user interface (.ui) files
+generated by Qt Designer.  The interfaces can be displayed in a variety of
+different widget styles.
+
+The Qt Designer itself is in the package qt3-designer.
+
+This package is part of Trinity, and a component of the TDE SDK module.
+
+%files -n trinity-kuiviewer
+%{tde_bindir}/kuiviewer
+%{tde_tdelibdir}/libkuiviewerpart.so
+%{tde_tdelibdir}/libkuiviewerpart.la
+%{tde_tdelibdir}/quithumbnail.so
+%{tde_tdelibdir}/quithumbnail.la
+%{tde_tdeappdir}/kuiviewer.desktop
+%{tde_datadir}/apps/kuiviewer/kuiviewerui.rc
+%{tde_datadir}/apps/kuiviewerpart/kuiviewer_part.rc
+%{tde_datadir}/icons/hicolor/*/apps/kuiviewer.png
+%{tde_datadir}/icons/locolor/*/apps/kuiviewer.png
+%{tde_datadir}/services/designerthumbnail.desktop
+%{tde_datadir}/services/kuiviewer_part.desktop
+
+%post -n trinity-kuiviewer
+for f in hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+
+%postun -n trinity-kuiviewer
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+
+##########
+
+%package -n trinity-libcvsservice0
+Summary:	DCOP service for accessing CVS repositories
+Group:		Environment/Libraries
+Requires:	cvs
+
+%description -n trinity-libcvsservice0
+This library provides a DCOP service for accessing and working with
+remote CVS repositories.  Applications may link with this library to
+access the DCOP service directly from C++.  Alternatively, scripts may
+access the service using the standard "dcop" command-line tool.
+
+DCOP is the Desktop Communication Protocol used throughout TDE.
+
+This package is part of Trinity, and a component of the TDE SDK module.
+
+%files -n trinity-libcvsservice0
+%{tde_bindir}/cvsaskpass
+%{tde_bindir}/cvsservice
+%{tde_libdir}/libcvsservice.so.*
+%{tde_libdir}/lib[kt]deinit_cvsaskpass.so
+%{tde_libdir}/lib[kt]deinit_cvsservice.so
+%{tde_tdelibdir}/cvsaskpass.la
+%{tde_tdelibdir}/cvsaskpass.so
+%{tde_tdelibdir}/cvsservice.la
+%{tde_tdelibdir}/cvsservice.so
+%{tde_datadir}/services/cvsservice.desktop
+
+%post -n trinity-libcvsservice0
+/sbin/ldconfig || :
+
+%postun -n trinity-libcvsservice0
+/sbin/ldconfig || :
+
+##########
+
+%package -n trinity-libcvsservice-devel
+Summary:	development files for CVS DCOP service
+Group:		Development/Libraries
+Requires:	trinity-libcvsservice0 = %{version}-%{release}
+
+%description -n trinity-libcvsservice-devel
+The library libcvsservice provides a DCOP service for accessing and
+working with remote CVS repositories.  Applications may link with this
+library to access the DCOP service directly from C++.  Alternatively,
+scripts may access the service using the standard "dcop" command-line
+tool.
+
+Development files for libcvsservice are included in this package.
+
+This package is part of Trinity, and a component of the TDE SDK module.
+
+%files -n trinity-libcvsservice-devel
+%{tde_includedir}/cvsjob_stub.h
+%{tde_includedir}/cvsservice_stub.h
+%{tde_includedir}/repository_stub.h
+%{tde_libdir}/libcvsservice.la
+%{tde_libdir}/libcvsservice.so
+%{tde_libdir}/lib[kt]deinit_cvsaskpass.la
+%{tde_libdir}/lib[kt]deinit_cvsservice.la
+%{tde_datadir}/cmake/cervisia.cmake
+
+%post -n trinity-libcvsservice-devel
+/sbin/ldconfig || :
+
+%postun -n trinity-libcvsservice-devel
+/sbin/ldconfig || :
+
+##########
+
+%package -n trinity-poxml
+Summary:	tools for using PO-files to translate DocBook XML files
+Group:		Development/Utilities
+
+%description -n trinity-poxml
+This is a collection of tools that facilitate translating DocBook XML
+files using gettext message files (PO-files).
+
+Also included are some miscellaneous command-line utilities for
+manipulating DocBook XML files, PO-files and PO-template files.
+
+This package is part of Trinity, and a component of the TDE SDK module.
+
+%files -n trinity-poxml
+%{tde_bindir}/po2xml
+%{tde_bindir}/split2po
+%{tde_bindir}/swappo
+%{tde_bindir}/transxx
+%{tde_bindir}/xml2pot
+
+##########
+
+%package -n trinity-umbrello
+Summary:	UML modelling tool and code generator
+Group:		Development/Utilities
+
+%description -n trinity-umbrello
+Umbrello UML Modeller is a Unified Modelling Language editor for TDE.
+With UML you can create diagrams of software and other systems in an
+industry standard format.  Umbrello can also generate code from your
+UML diagrams in a number of programming languages.
+
+The program supports class diagrams, sequence diagrams, collaboration
+diagrams, use case diagrams, state diagrams, activity diagrams, component
+diagrams and deployment diagrams.
+
+This package is part of Trinity, and a component of the TDE SDK module.
+
+%files -n trinity-umbrello
+%{tde_bindir}/umbodoc
+%{tde_bindir}/umbrello
+%{tde_tdeappdir}/umbrello.desktop
+%{tde_datadir}/apps/umbrello/
+%{tde_datadir}/icons/crystalsvg/*/actions/umbrello_*.png
+%{tde_datadir}/icons/crystalsvg/*/mimetypes/umbrellofile.png
+%{tde_datadir}/icons/crystalsvg/scalable/mimetypes/umbrellofile.svgz
+%{tde_datadir}/icons/hicolor/*/apps/umbrello.png
+%{tde_datadir}/icons/hicolor/scalable/apps/umbrello.svgz
+%{tde_datadir}/icons/hicolor/*/mimetypes/umbrellofile.png
+%{tde_datadir}/mimelnk/application/x-umbrello.desktop
+%{tde_tdedocdir}/HTML/en/umbrello/
+
+%post -n trinity-umbrello
+for f in crystalsvg hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-umbrello
+for f in crystalsvg hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package kio-plugins
+Summary:	subversion ioslave for Trinity
+Group:		Environment/Libraries
+Requires:	subversion
+
+%description kio-plugins
+This package provides easy access to remote SVN repositories from within
+Konqueror, and TDE generally, by browsing them as if they were a
+filesystem, using URLs like svn://hostname/path, or svn+ssh://, etc.
+
+This package is part of Trinity, and a component of the TDE SDK module.
+
+%files kio-plugins
+%{tde_bindir}/kio_svn_helper
+%{tde_tdelibdir}/kded_ksvnd.la
+%{tde_tdelibdir}/kded_ksvnd.so
+%{tde_tdelibdir}/kio_svn.la
+%{tde_tdelibdir}/kio_svn.so
+%{tde_datadir}/apps/konqueror/servicemenus/subversion_toplevel.desktop
+%{tde_datadir}/apps/konqueror/servicemenus/subversion.desktop
+%{tde_datadir}/services/kded/ksvnd.desktop
+%{tde_datadir}/services/svn+file.protocol_tdesdk
+%{tde_datadir}/services/svn+http.protocol_tdesdk
+%{tde_datadir}/services/svn+https.protocol_tdesdk
+%{tde_datadir}/services/svn+ssh.protocol_tdesdk
+%{tde_datadir}/services/svn.protocol_tdesdk
+%{tde_datadir}/services/svn+file.protocol
+%{tde_datadir}/services/svn+http.protocol
+%{tde_datadir}/services/svn+https.protocol
+%{tde_datadir}/services/svn+ssh.protocol
+%{tde_datadir}/services/svn.protocol
+%{tde_datadir}/icons/crystalsvg/*/actions/svn_switch.png
+%{tde_datadir}/icons/crystalsvg/*/actions/svn_merge.png
+%{tde_datadir}/icons/crystalsvg/*/actions/svn_branch.png
+%{tde_datadir}/icons/crystalsvg/*/actions/svn_remove.png
+%{tde_datadir}/icons/crystalsvg/*/actions/svn_add.png
+%{tde_datadir}/icons/crystalsvg/*/actions/svn_status.png
+%{tde_datadir}/icons/crystalsvg/scalable/actions/svn_add.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/actions/svn_status.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/actions/svn_remove.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/actions/svn_switch.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/actions/svn_branch.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/actions/svn_merge.svgz
+
+%post kio-plugins
+for f in crystalsvg ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+
+for proto in svn+file svn+http svn+https svn+ssh svn; do
+  alternatives --install \
+    %{tde_datadir}/services/${proto}.protocol \
+    ${proto}.protocol \
+    %{tde_datadir}/services/${proto}.protocol_tdesdk \
+    10
+done
+
+%postun kio-plugins
+for f in crystalsvg ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+
+%preun kio-plugins
+if [ $1 -eq 0 ]; then
+  for proto in svn+file svn+http svn+https svn+ssh svn; do
+    alternatives --remove \
+      ${proto}.protocol \
+      %{tde_datadir}/services/${proto}.protocol_tdesdk
+  done
+fi
+
+##########
+
+%package -n trinity-kunittest
+Summary:	unit testing library for Trinity
+Group:		Development/Utilities
+
+%description -n trinity-kunittest
+KUnitTest is a small library that facilitates the writing of tests for
+TDE developers. There are two ways to use the KUnitTest library. One is
+to create dynamically loadable modules and use the kunittestmodrunner or
+kunittestguimodrunner programs to run the tests. The other is to use the
+libraries to create your own testing application.
+
+This package is part of Trinity, and a component of the TDE SDK module.
+
+%files -n trinity-kunittest
+%{tde_bindir}/kunittest
+%{tde_bindir}/kunittest_debughelper
+%{tde_bindir}/kunittestmod
+%{tde_bindir}/kunittestguimodrunner
+%{tde_libdir}/libkunittestgui.la
+%{tde_libdir}/libkunittestgui.so
+#%{tde_libdir}/libkunittestgui.so.*
+%{tde_includedir}/kunittest/runnergui.h
+
+%post -n trinity-kunittest
+/sbin/ldconfig || :
+
+%postun -n trinity-kunittest
+/sbin/ldconfig || :
+
+##########
+
 %package devel
-Summary: Development files for %{name}
-Group: Development/Libraries
-Provides: trinity-kdesdk-devel = %{version}-%{release}
-Requires: %{name}-libs = %{version}-%{release}
-Requires: trinity-kdelibs-devel
+Summary:	Development files for %{name}
+Group:		Development/Libraries
+
+Requires:	%{name} = %{version}-%{release}
+Requires:	trinity-kbabel-devel = %{version}-%{release}
+
+Obsoletes:	trinity-kdesdk-devel < %{version}-%{release}
+Provides:	trinity-kdesdk-devel = %{version}-%{release}
+
 %description devel
 %{summary}.
 
-%package libs
-Summary: %{name} runtime libraries
-Group:   System Environment/Libraries
-Requires: trinity-kdelibs
-# helps multilib upgrades
-Obsoletes: %{name} < %{version}-%{release}
-# include to be paranoid, installing libs-only is still mostly untested -- Rex
-Requires: %{name} = %{version}-%{release}
-%description libs
-%{summary}.
+%files devel
+
+##########
 
 
 %prep
 %setup -q -n kdesdk
 %patch1 -p1 -b .subversion
-
+%patch2 -p1 -b .cmake
+%patch3 -p1 -b .cmake
+%patch4 -p1 -b .ftbfs
+%patch5 -p1 -b .svn
 
 %build
 unset QTDIR || :; . /etc/profile.d/qt.sh
-export PATH="%{_bindir}:${PATH}"
-export LD_LIBRARY_PATH="%{_libdir}"
-export PKG_CONFIG_PATH="%{_libdir}/pkgconfig"
-export CMAKE_INCLUDE_PATH="%{_includedir}:%{_includedir}/tqt"
+export PATH="%{tde_bindir}:${PATH}"
+export LD_LIBRARY_PATH="%{tde_libdir}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
 
-%__mkdir build
-cd build
+%{?!mgaversion:%__mkdir build; cd build}
 %cmake \
-  -DWITH_DBSEARCHENGINE=OFF \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DINCLUDE_INSTALL_DIR=%{tde_includedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DMAN_INSTALL_DIR=%{tde_mandir}/man1 \
+  -DPKGCONFIG_INSTALL_DIR=%{tde_tdelibdir}/pkgconfig \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  -DCMAKE_SKIP_RPATH="OFF" \
+  -DWITH_DBSEARCHENGINE=ON \
+  -DWITH_KCAL=ON \
   -DBUILD_ALL=ON \
   ..
 
@@ -114,18 +1060,14 @@ cd build
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot} 
 
 %__make install DESTDIR=%{?buildroot} -C build
 
-desktop-file-install --vendor "" \
-  --dir %{buildroot}%{_datadir}/applications/kde \
-  %{buildroot}%{_datadir}/applications/kde/*.desktop \
-
 # make symlinks relative
-if [ -d %{buildroot}%{tde_docdir}/HTML/en ]; then
-  pushd %{buildroot}%{tde_docdir}/HTML/en
+if [ -d %{buildroot}%{tde_tdedocdir}/HTML/en ]; then
+  pushd %{buildroot}%{tde_tdedocdir}/HTML/en
   for i in *; do
      if [ -d $i -a -L $i/common ]; then
         rm -f $i/common
@@ -135,9 +1077,22 @@ if [ -d %{buildroot}%{tde_docdir}/HTML/en ]; then
   popd
 fi
 
-%__rm -f %{buildroot}/%{_datadir}/apps/kapptemplate/admin/Makefile \
-      %{buildroot}/%{_datadir}/apps/kapptemplate/admin/Makefile.in
+# Installs kdepalettes
+%__install -D -m 644 kdepalettes/kde_xpaintrc %{?buildroot}%{tde_datadir}/kdepalettes
+%__install -D -m 644 kdepalettes/KDE_Gimp %{?buildroot}%{tde_datadir}/kdepalettes
+%__install -D -m 644 kdepalettes/README %{?buildroot}%{tde_datadir}/kdepalettes
 
+# Installs SVN protocols as alternatives
+%__mv -f %{?buildroot}%{tde_datadir}/services/svn+file.protocol %{?buildroot}%{tde_datadir}/services/svn+file.protocol_tdesdk
+%__mv -f %{?buildroot}%{tde_datadir}/services/svn+http.protocol %{?buildroot}%{tde_datadir}/services/svn+http.protocol_tdesdk
+%__mv -f %{?buildroot}%{tde_datadir}/services/svn+https.protocol %{?buildroot}%{tde_datadir}/services/svn+https.protocol_tdesdk
+%__mv -f %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol_tdesdk
+%__mv -f %{?buildroot}%{tde_datadir}/services/svn.protocol %{?buildroot}%{tde_datadir}/services/svn.protocol_tdesdk
+%__ln_s /etc/alternatives/svn+file.protocol %{?buildroot}%{tde_datadir}/services/svn+file.protocol
+%__ln_s /etc/alternatives/svn+http.protocol %{?buildroot}%{tde_datadir}/services/svn+http.protocol
+%__ln_s /etc/alternatives/svn+https.protocol %{?buildroot}%{tde_datadir}/services/svn+https.protocol
+%__ln_s /etc/alternatives/svn+ssh.protocol %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol
+%__ln_s /etc/alternatives/svn.protocol %{?buildroot}%{tde_datadir}/services/svn.protocol
 
 %clean
 %__rm -rf %{buildroot}
@@ -146,66 +1101,20 @@ fi
 # trick to replace a dir by a symlink -- Rex
 %pre
 if [ $1 -gt 0 -a ! -L  %{_docdir}/HTML/en/cervisia/common ]; then 
-  rm -rf %{tde_docdir}/HTML/en/cervisia/common ||:
+  rm -rf %{tde_tdedocdir}/HTML/en/cervisia/common ||:
 fi
 
-%post
-for f in crystalsvg hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-
-%postun
-for f in crystalsvg hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
-
-
-%files
-%defattr(-,root,root,-)
-%{_bindir}/*
-%{tde_docdir}/HTML/en/*
-%{_datadir}/apps/*
-#%{_datadir}/mimelnk/application/*
-%{_datadir}/services/*
-%{_datadir}/servicetypes/*
-%{_datadir}/icons/crystalsvg/*/*/*
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/icons/locolor/*/*/*
-%{_datadir}/applications/kde/*
-%{_datadir}/config.kcfg/*
-%{tde_libdir}/*
-%{_libdir}/libkdeinit_*.so
-#%{_mandir}/man1/*
-
-# Removes conflict with package 'rpmdevtool' on RHEL 6
-%if "%{_prefix}" == "/usr"
-%exclude %{_bindir}/licensecheck
-%endif
-
-%files libs
-%defattr(-,root,root,-)
-%{_libdir}/lib*.so.*
-%{_libdir}/lib*.la
-
-%files devel
-%defattr(-,root,root,-)
-%{_includedir}/*.h
-%{_includedir}/kbabel
-%{_libdir}/lib*.so
-%exclude %{_libdir}/libkdeinit_*.so
-#%{_libdir}/kmtrace/*
-%{_datadir}/cmake/*.cmake
 
 
 %changelog
+* Sun Jul 30 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
+- Split into several packages
+- Renames to 'trinity-tdesdk'
+- Add Mageia 2 support
+- cmake port [Commit #bfb0bc00]
+- added forgotten files [Commit #adee843c]
+- installs SVN protocols as alternative to avoid conflict with kdesvn
+
 * Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
 - Initial release for RHEL 6, RHEL 5 and Fedora 15
 
diff --git a/redhat/kdetoys/kdetoys-3.5.13-missing_ldflags.patch b/redhat/kdetoys/kdetoys-3.5.13-missing_ldflags.patch
new file mode 100644
index 000000000..fa659992b
--- /dev/null
+++ b/redhat/kdetoys/kdetoys-3.5.13-missing_ldflags.patch
@@ -0,0 +1,21 @@
+--- kdetoys/kweather/Makefile.am.ORI	2012-08-01 10:42:11.015544034 +0200
++++ kdetoys/kweather/Makefile.am	2012-08-01 10:44:37.144904650 +0200
+@@ -26,7 +26,8 @@
+                                  weatherIface.skel weatherservice.stub \
+                                  weatherbutton.cpp
+ weather_panelapplet_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries)
+-weather_panelapplet_la_LIBADD = $(LIB_KHTML)
++weather_panelapplet_la_LIBADD = $(LIB_KHTML) -lqt-mt -lDCOP
++
+ 
+ appletdir = $(kde_datadir)/kicker/applets
+ applet_DATA = kweather.desktop
+@@ -67,7 +68,7 @@
+ kde_services_DATA = kcmweather.desktop kcmweatherservice.desktop
+ 
+ kweatherreport_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
+-kweatherreport_la_LIBADD = $(LIB_KHTML) reportview.lo
++kweatherreport_la_LIBADD = $(LIB_KHTML) reportview.lo -lqt-mt -lDCOP -lkdecore -lkdeui
+ kweatherreport_la_SOURCES = reportmain.cpp weatherservice.stub
+ 
+ KDE_ICON = kweather
diff --git a/redhat/kdetoys/trinity-kdetoys-3.5.13.spec b/redhat/kdetoys/trinity-kdetoys-3.5.13.spec
index 5d94b4637..e50ffbbb2 100644
--- a/redhat/kdetoys/trinity-kdetoys-3.5.13.spec
+++ b/redhat/kdetoys/trinity-kdetoys-3.5.13.spec
@@ -1,24 +1,35 @@
 # 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
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%define tde_bindir %{_prefix}/bin
+%define tde_datadir %{_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{_prefix}/include
+%define tde_libdir %{_prefix}/%{_lib}
 
+%define tde_tdeappdir %{tde_datadir}/applications/kde
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
 
-Summary: K Desktop Environment - Toys and Amusements
-Name: 	 trinity-kdetoys
-Group:	 Amusements/Graphics
-Version: 3.5.13
-Release: 2%{?dist}%{?_variant}
+%define _docdir %{tde_docdir}
+
+
+Summary:		Trinity Desktop Environment - Toys and Amusements
+Name:			trinity-tdetoys
+Group:			Amusements/Graphics
+Version:		3.5.13
+Release:		3%{?dist}%{?_variant}
 
 License: GPLv2+
 Source0: kdetoys-%{version}.tar.gz
 
+# [kdetoys] Missing LDFLAGS cause FTBFS on Mageia 2
+Patch1:		kdetoys-3.5.13-missing_ldflags.patch
+
 Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org/
@@ -32,6 +43,20 @@ BuildRequires: tqtinterface-devel
 BuildRequires: trinity-kdelibs-devel
 BuildRequires: gettext
 
+Obsoletes:		trinity-kdetoys < %{version}-%{release}
+Provides:		trinity-kdetoys = %{version}-%{release}
+
+# Metapackage
+Requires: trinity-amor = %{version}-%{release}
+Requires: trinity-eyesapplet = %{version}-%{release}
+Requires: trinity-fifteenapplet = %{version}-%{release}
+Requires: trinity-kmoon = %{version}-%{release}
+Requires: trinity-kodo = %{version}-%{release}
+Requires: trinity-kteatime = %{version}-%{release}
+Requires: trinity-ktux = %{version}-%{release}
+Requires: trinity-kweather = %{version}-%{release}
+Requires: trinity-kworldclock = %{version}-%{release}
+
 
 %description
 Includes: 
@@ -47,17 +72,315 @@ Includes:
                globe
 
 NOTE: kicker applets and screen savers require kdebase to be installed, 
-and user to be logged-in to KDE.
+and user to be logged-in to TDE.
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING README
+
+##########
+
+%package -n trinity-amor
+Summary:	a Trinity creature for your desktop
+Group:		Amusements/Graphics
+
+%description -n trinity-amor
+AMOR stands for Amusing Misuse Of Resources. It provides several different
+characters who prance around your X screen doing tricks and giving you tips.
+
+Note that AMOR will only work with some window managers. Both KWin (the
+KDE window manager) and Metacity (a GTK2 window manager) are supported.
+
+This package is part of Trinity, and a component of the TDE toys module.
+
+%files -n trinity-amor
+%defattr(-,root,root,-)
+%{tde_bindir}/amor
+%exclude %{tde_tdeincludedir}/AmorIface.h
+%{tde_datadir}/apps/amor/
+%{tde_tdeappdir}/amor.desktop
+%{tde_datadir}/icons/hicolor/*/apps/amor.png
+%{tde_tdedocdir}/HTML/en/amor/
+%doc AUTHORS COPYING README
+
+%post -n trinity-amor
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-amor
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-eyesapplet
+Summary:	eyes applet for Trinity
+Group:		Amusements/Graphics
+
+%description -n trinity-eyesapplet
+An applet for the KDE panel containing a pair of eyes that follow your mouse
+around the screen.
+
+This package is part of Trinity, and a component of the TDE toys module.
+
+%files -n trinity-eyesapplet
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/eyes_panelapplet.la
+%{tde_tdelibdir}/eyes_panelapplet.so
+%{tde_datadir}/apps/kicker/applets/eyesapplet.desktop
+%doc AUTHORS COPYING README
+
+##########
+
+%package -n trinity-fifteenapplet
+Summary:	fifteen pieces puzzle for Trinity
+Group:		Amusements/Graphics
+
+%description -n trinity-fifteenapplet
+An applet for the KDE panel that lets you play the Fifteen Pieces
+sliding block puzzle. You have to order 15 pieces in a 4x4 square by
+moving them around.
+
+This package is part of Trinity, and a component of the TDE toys module.
+
+%files -n trinity-fifteenapplet
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/fifteen_panelapplet.la
+%{tde_tdelibdir}/fifteen_panelapplet.so
+%{tde_datadir}/apps/kicker/applets/kfifteenapplet.desktop
+%doc AUTHORS COPYING README
+
+##########
+
+%package -n trinity-kmoon
+Summary:	moon phase indicator for Trinity
+Group:		Amusements/Graphics
+
+%description -n trinity-kmoon
+An applet for the KDE panel that displays the current phase of the moon.
+
+This package is part of Trinity, and a component of the TDE toys module.
+
+%files -n trinity-kmoon
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/kmoon_panelapplet.la
+%{tde_tdelibdir}/kmoon_panelapplet.so
+%{tde_datadir}/apps/kicker/applets/kmoonapplet.desktop
+%{tde_datadir}/apps/kmoon/
+%{tde_datadir}/icons/hicolor/*/apps/kmoon.png
+%{tde_tdedocdir}/HTML/en/kmoon/
+%doc AUTHORS COPYING README
+
+%post -n trinity-kmoon
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+
+##########
+
+%package -n trinity-kodo
+Summary:	mouse odometer for Trinity
+Group:		Amusements/Graphics
+
+%description -n trinity-kodo
+KOdometer measures your desktop mileage. It tracks the movement of your mouse
+pointer across your desktop and renders it in inches/feet/miles! It can
+do cm/metres/km too. Its most exciting feature is the tripometer.
+
+This package is part of Trinity, and a component of the TDE toys module.
+
+%files -n trinity-kodo
+%defattr(-,root,root,-)
+%{tde_bindir}/kodo
+%{tde_tdeappdir}/kodo.desktop
+%{tde_datadir}/apps/kodo/numbers.png
+%{tde_datadir}/icons/hicolor/*/apps/kodo.png
+%{tde_tdedocdir}/HTML/en/kodo/
+%doc AUTHORS COPYING README
+
+%post -n trinity-kodo
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kodo
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kteatime
+Summary:	Trinity utility for making a fine cup of tea
+Group:		Amusements/Graphics
+
+%description -n trinity-kteatime
+KTeaTime is a handy timer for steeping tea. No longer will you have to
+guess at how long it takes for your tea to be ready. Simply select the
+type of tea you have, and it will alert you when the tea is ready to
+drink.
+
+KTeaTime sits in the Trinity system tray.
 
+Please note that KTeaTime is written explicitly for Trinity. If you are
+using a non-KDE window manager or desktop environment then it is quite
+possible that KTeaTime will not work on your system.
+
+This package is part of Trinity, and a component of the TDE toys module.
+
+%files -n trinity-kteatime
+%defattr(-,root,root,-)
+%{tde_bindir}/kteatime
+%{tde_tdeappdir}/kteatime.desktop
+%{tde_datadir}/apps/kteatime/
+%{tde_datadir}/icons/hicolor/*/apps/kteatime.png
+%{tde_tdedocdir}/HTML/en/kteatime/
+%doc AUTHORS COPYING README
+
+%post -n trinity-kteatime
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kteatime
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-ktux
+Summary:	Tux screensaver for Trinity
+Group:		Amusements/Graphics
+
+%description -n trinity-ktux
+A neat Tux-in-a-spaceship screensaver for the K Desktop Environment (KDE).
+
+This package is part of Trinity, and a component of the TDE toys module.
+
+%files -n trinity-ktux
+%defattr(-,root,root,-)
+%{tde_bindir}/ktux
+%{tde_datadir}/apps/ktux/
+%{tde_datadir}/applnk/System/ScreenSavers/ktux.desktop
+%{tde_datadir}/icons/hicolor/*/apps/ktux.png
+%doc AUTHORS COPYING README
+
+%post -n trinity-ktux
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+
+%postun -n trinity-ktux
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+
+##########
+
+%package -n trinity-kweather
+Summary:	weather display applet for Trinity
+Group:		Amusements/Graphics
+
+%description -n trinity-kweather
+An applet for the KDE panel that displays your area's current weather.
+Information shown includes the temperature, wind speed, air pressure
+and more. By pressing a button a full weather report can be obtained.
+
+KWeather also provides a weather service that can track multiple weather
+stations and provide this information to other applications, including
+Konqueror's sidebar and Kontact's summary page.
+
+This package is part of Trinity, and a component of the TDE toys module.
+
+%files -n trinity-kweather
+%defattr(-,root,root,-)
+%{tde_bindir}/kweatherservice
+%{tde_bindir}/kweatherreport
+%{tde_libdir}/lib[kt]deinit_kweatherreport.so
+%{tde_libdir}/lib[kt]deinit_kweatherreport.la
+%{tde_tdelibdir}/kcm_weather.so
+%{tde_tdelibdir}/kcm_weather.la
+%{tde_tdelibdir}/kcm_weatherservice.so
+%{tde_tdelibdir}/kcm_weatherservice.la
+%{tde_tdelibdir}/kweatherreport.so
+%{tde_tdelibdir}/kweatherreport.la
+%{tde_tdelibdir}/weather_panelapplet.la
+%{tde_tdelibdir}/weather_panelapplet.so
+%{tde_datadir}/apps/kicker/applets/kweather.desktop
+%{tde_datadir}/apps/kweather/
+%{tde_datadir}/apps/kweatherservice/stations.dat
+%{tde_datadir}/apps/kweatherservice/weather_stations.desktop
+%{tde_datadir}/icons/hicolor/*/apps/kweather.png
+%{tde_datadir}/services/kweatherservice.desktop
+%{tde_datadir}/services/kcmweather.desktop
+%{tde_datadir}/services/kcmweatherservice.desktop
+%{tde_tdedocdir}/HTML/en/kweather/
+%doc AUTHORS COPYING README
+
+%post -n trinity-kweather
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kweather
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kworldclock
+Summary:	earth watcher for Trinity
+Group:		Amusements/Graphics
+
+%description -n trinity-kworldclock
+Displays where in the world it is light and dark depending on time, as
+well as offering the time in all of the major cities of the world.
+This can be run standalone, as an applet in the KDE panel or as a
+desktop background.
+
+Additional kworldclock themes are available in the tdeartwork-misc package.
+
+This package is part of Trinity, and a component of the TDE toys module.
+
+%files -n trinity-kworldclock
+%defattr(-,root,root,-)
+%{tde_bindir}/kworldclock
+%{tde_tdelibdir}/ww_panelapplet.la
+%{tde_tdelibdir}/ww_panelapplet.so
+%{tde_tdeappdir}/kworldclock.desktop
+%{tde_datadir}/apps/kdesktop/programs/kdeworld.desktop
+%{tde_datadir}/apps/kicker/applets/kwwapplet.desktop
+%{tde_datadir}/apps/kworldclock/
+%{tde_datadir}/icons/hicolor/*/apps/kworldclock.png
+%{tde_tdedocdir}/HTML/en/kworldclock/
+%doc AUTHORS COPYING README
+
+%post -n trinity-kworldclock
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kworldclock
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
 
 %prep
 %setup -q -n kdetoys
+%patch1 -p1 -b .ftbfs
 
 # Ugly hack to modify TQT include directory inside autoconf files.
 # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
 %__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{_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,42 +389,34 @@ and user to be logged-in to KDE.
 
 %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 \
-  --includedir=%{_includedir}/kde \
-  --disable-rpath \
-  --enable-new-ldflags \
-  --enable-closure \
-  --disable-debug --disable-warnings \
-  --disable-dependency-tracking --enable-final \
-  --with-extra-includes=%{_includedir}/tqt
+   --exec-prefix=%{_prefix} \
+   --bindir=%{tde_bindir} \
+   --libdir=%{tde_libdir} \
+   --datadir=%{tde_datadir} \
+   --includedir=%{tde_tdeincludedir} \
+   --disable-rpath \
+   --enable-new-ldflags \
+   --enable-closure \
+   --disable-debug --disable-warnings \
+   --disable-dependency-tracking --enable-final \
+   --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}
 
-desktop-file-install \
-  --dir=%{buildroot}%{_datadir}/applnk/System/ScreenSavers \
-  --vendor="" \
-  %{buildroot}%{_datadir}/applnk/System/ScreenSavers/*.desktop ||:
-
-desktop-file-install \
-  --dir=%{buildroot}%{_datadir}/applications/kde \
-  --vendor="" \
-  %{buildroot}%{_datadir}/applications/kde/*.desktop ||:
-
 # replace absolute symlink with relative
-ln -nfs tips-en %{buildroot}%{_datadir}/apps/amor/tips
+ln -nfs tips-en %{buildroot}%{tde_datadir}/apps/amor/tips
 
 ## File lists
-# locale's
-%find_lang %{name} || touch %{name}.lang
 # HTML (1.0)
 HTML_DIR=$(kde-config --expandvars --install html)
 if [ -d %{buildroot}$HTML_DIR ]; then
@@ -119,38 +434,17 @@ for lang_dir in %{buildroot}$HTML_DIR/* ; do
 done
 fi
 
-## Unpackaged files
-# not sure the point of just one header file 'AmorIface.h', omit (for now).
-%__rm -rf %{buildroot}%{_includedir}
-
-
-%post
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-
-%postun
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-
-
-%files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING README
-%{_bindir}/*
-%{_libdir}/libkdeinit_*.*
-%{tde_libdir}/*
-%{_datadir}/applications/kde/*.desktop
-%{_datadir}/applnk/System/ScreenSavers/*.desktop
-%{_datadir}/apps/*
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/service*/*.desktop
-%doc %lang(en) %{tde_docdir}/HTML/en/*
 
 %clean
 %__rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
+- Split into several packages
+- Renames to 'trinity-tdetoys'
+- Add support for Mageia 2
+
 * Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
 - Fix HTML directory location
 
diff --git a/redhat/kdeutils/kdeutils-3.5.13-ark_fix_utf8.patch b/redhat/kdeutils/kdeutils-3.5.13-ark_fix_utf8.patch
new file mode 100644
index 000000000..0fdb61aa6
--- /dev/null
+++ b/redhat/kdeutils/kdeutils-3.5.13-ark_fix_utf8.patch
@@ -0,0 +1,63 @@
+--- kdeutils/ark/arch.cpp~	2011-08-13 09:25:08.000000000 +0300
++++ kdeutils/ark/arch.cpp	2012-06-14 16:58:52.417875615 +0300
+@@ -33,6 +33,7 @@
+ // QT includes
+ #include <tqapplication.h>
+ #include <tqfile.h>
++#include <tqtextcodec.h>
+ 
+ // KDE includes
+ #include <kdebug.h>
+@@ -288,7 +290,7 @@
+ 
+     data[ lfChar ] = '\0';
+ 
+-    m_buffer.append( TQString::fromUtf8(data + startChar).latin1() );
++    m_buffer.append( data + startChar );
+ 
+     data[ lfChar ] = '\n';
+     startChar = lfChar + 1;
+@@ -333,12 +335,15 @@
+   unsigned int pos = 0;
+   int strpos, len;
+ 
++  TQTextCodec *codec = TQTextCodec::codecForLocale();
++  TQString tqunicode_line = codec->toUnicode( line );
++
+   // Go through our columns, try to pick out data, return silently on failure
+   for ( TQPtrListIterator <ArchColumns>col( m_archCols ); col.current(); ++col )
+   {
+     ArchColumns *curCol = *col;
+ 
+-    strpos = curCol->pattern.search( line, pos );
++    strpos = curCol->pattern.search( tqunicode_line, pos );
+     len = curCol->pattern.matchedLength();
+ 
+     if ( ( strpos == -1 ) || ( len > curCol->maxLength ) )
+@@ -354,7 +359,7 @@
+ 
+     pos = strpos + len;
+ 
+-    columns[curCol->colRef] = TQString::fromLocal8Bit( line.mid(strpos, len) );
++    columns[curCol->colRef] = tqunicode_line.mid(strpos, len).utf8();
+   }
+ 
+ 
+--- kdeutils-3.5.1/ark/arkapp.cpp~	2006-01-19 19:49:29 +0300
++++ kdeutils-3.5.1/ark/arkapp.cpp	2006-02-20 19:28:23 +0300
+@@ -32,6 +32,7 @@
+ #include <unistd.h>
+ #include <tqfile.h>
+ #include <errno.h>
++#include <qtextcodec.h>
+ 
+ 
+ #include "arkapp.h"
+@@ -110,6 +111,7 @@ ArkApplication::ArkApplication()
+ {
+ 	m_mainwidget = new TQWidget;
+ 	setMainWidget(m_mainwidget);
++	QTextCodec::setCodecForCStrings(QTextCodec::codecForLocale());
+ }
+ 
+ int
diff --git a/redhat/kdeutils/kdeutils-3.5.13-missing_ldflags.patch b/redhat/kdeutils/kdeutils-3.5.13-missing_ldflags.patch
new file mode 100644
index 000000000..0abaa228a
--- /dev/null
+++ b/redhat/kdeutils/kdeutils-3.5.13-missing_ldflags.patch
@@ -0,0 +1,61 @@
+--- kdeutils/kcalc/Makefile.am.ORI	2012-08-01 22:22:16.274750161 +0200
++++ kdeutils/kcalc/Makefile.am	2012-08-01 22:23:10.181783997 +0200
+@@ -19,7 +19,7 @@
+ 			kcalctype.h dlabel.h stats.h
+ 
+ kcalc_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-kcalc_la_LIBADD = $(LIB_KDEUI) knumber/libknumber.la
++kcalc_la_LIBADD = $(LIB_KDEUI) knumber/libknumber.la $(LIB_QT) $(LIB_KDECORE)
+ 
+ KDE_ICON = kcalc
+ 
+--- kdeutils/kedit/Makefile.am.ORI	2012-08-01 22:26:20.127379647 +0200
++++ kdeutils/kedit/Makefile.am	2012-08-01 22:26:38.144056739 +0200
+@@ -12,7 +12,7 @@
+ kdeinit_LTLIBRARIES = kedit.la
+ 
+ kedit_la_SOURCES = kedit.cpp ktextfiledlg.cpp misc.ui color.ui prefs.kcfgc
+-kedit_la_LIBADD = -lkdeprint $(LIB_KFILE)
++kedit_la_LIBADD = -lkdeprint $(LIB_KFILE) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+ kedit_la_LDFLAGS = -module -avoid-version $(KDE_PLUGIN) $(all_libraries)
+ 
+ noinst_HEADERS = kedit.h ktextfiledlg.h\
+--- kdeutils/khexedit/lib/Makefile.am.ORI	2012-08-01 22:28:26.956106523 +0200
++++ kdeutils/khexedit/lib/Makefile.am	2012-08-01 22:28:33.941981315 +0200
+@@ -7,7 +7,7 @@
+ # this library is used by the kbytesedit part and the khepart part
+ lib_LTLIBRARIES =  libkhexeditcommon.la
+ libkhexeditcommon_la_LDFLAGS = $(all_libraries) -no-undefined
+-libkhexeditcommon_la_LIBADD =  controller/libkcontroller.la codecs/libkhecodecs.la $(LIB_KDECORE)
++libkhexeditcommon_la_LIBADD =  controller/libkcontroller.la codecs/libkhecodecs.la $(LIB_KDECORE) $(LIB_QT)
+ libkhexeditcommon_la_SOURCES = kcolumn.cpp kbordercolumn.cpp koffsetcolumn.cpp \
+                                kbuffercolumn.cpp kvaluecolumn.cpp kcharcolumn.cpp \
+                                kcolumnsview.cpp khexedit.cpp kbytesedit.cpp \
+--- kdeutils/kregexpeditor/Makefile.am.ORI	2012-08-01 22:31:33.556720026 +0200
++++ kdeutils/kregexpeditor/Makefile.am	2012-08-01 22:31:48.203381087 +0200
+@@ -29,7 +29,7 @@
+ 
+ libkregexpeditorcommon_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined
+ libkregexpeditorcommon_la_LIBADD = KMultiFormListBox/libkmultiformlistbox.la \
+-	KWidgetStreamer/libkwidgetstreamer.la $(LIB_KIO)
++	KWidgetStreamer/libkwidgetstreamer.la $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+ 
+ METASOURCES = AUTO
+ 
+--- kdeutils/ksim/library/Makefile.am.ORI	2012-08-01 22:35:30.852281916 +0200
++++ kdeutils/ksim/library/Makefile.am	2012-08-01 22:35:39.599384576 +0200
+@@ -1,4 +1,4 @@
+-lib_LTLIBRARIES = libksimcore.la
++lib_LTLIBRARIES = libksimcore.la 
+ 
+ libksimcore_la_SOURCES = common.cpp themeloader.cpp \
+                                         chart.cpp label.cpp \
+@@ -7,7 +7,7 @@
+                                         pluginmodule.cpp ksimconfig.cpp
+ 
+ libksimcore_la_LDFLAGS = $(all_libraries) -version-info 1:0 -no-undefined
+-libksimcore_la_LIBADD = $(LIB_KDEUI)
++libksimcore_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) -lkdefx
+ 
+ ksiminclude_HEADERS = common.h themeloader.h \
+                                         chart.h label.h \
diff --git a/redhat/kdeutils/trinity-kdeutils-3.5.13.spec b/redhat/kdeutils/trinity-kdeutils-3.5.13.spec
index 5f3a394d0..bd99c4d25 100755
--- a/redhat/kdeutils/trinity-kdeutils-3.5.13.spec
+++ b/redhat/kdeutils/trinity-kdeutils-3.5.13.spec
@@ -1,19 +1,27 @@
 # 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
+%define _docdir %{tde_datadir}/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-%define tde_appdir %{_datadir}/applications/kde
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%define tde_bindir %{_prefix}/bin
+%define tde_datadir %{_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{_prefix}/include
+%define tde_libdir %{_prefix}/%{_lib}
+%define tde_sbindir %{_prefix}/sbin
 
+%define tde_tdeappdir %{tde_datadir}/applications/kde
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
 
-Name:		tdeutils
+%define _docdir %{tde_docdir}
+
+Name:		trinity-tdeutils
 Version:	3.5.13
-Release:	6%{?dist}%{?_variant}
+Release:	7%{?dist}%{?_variant}
 License:	GPL
 Summary:	TDE Utilities
 Group:		Applications/System
@@ -34,12 +42,14 @@ Obsoletes:	trinity-kdeutils < %{version}-%{release}
 Provides:	trinity-kdeutils = %{version}-%{release}
 Obsoletes:	trinity-kdeutils-extras < %{version}-%{release}
 Provides:	trinity-kdeutils-extras = %{version}-%{release}
+Obsoletes:	tdeutils < %{version}-%{release}
+Provides:	tdeutils = %{version}-%{release}
 
 # RedHat / Fedora legacy patches
 Patch1:		kdf-3.0.2-label.patch
 
 # TDE 3.5.13 RHEL/Fedora patches
-## [kdeutils/klaptodaemon] removes dpkg commands
+## [kdeutils/klaptodaemon] removes dpkg commands [Commit #1e1a776f]
 Patch2:		kdeutils-3.5.13-klaptopdaemon_dpkg_command.patch
 ## [tdeutils] Allow ark embedding [Bug #670] [Commit #2a1d4a67]
 Patch3:		kdeutils-3.5.13-fix_ark_embedding.patch
@@ -57,10 +67,12 @@ Patch6:		kdeutils-3.5.13-further_organise_menu.patch
 ##  Added support for password processing
 ##  Fix show broken filenames into real UTF-8
 Patch7:		kdeutils-3.5.13-ark_repairs_and_extensions.patch
+# [kdeutils] Missing LDFLAGS cause FTBFS on Mageia 2
+Patch8:		kdeutils-3.5.13-missing_ldflags.patch
 
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-arts-devel
-BuildRequires:	tdelibs-devel
+BuildRequires:	tqtinterface-devel >= 3.5.13
+BuildRequires:	trinity-arts-devel >= 3.5.13
+BuildRequires:	trinity-tdelibs-devel >= 3.5.13
 BuildRequires:	autoconf automake libtool m4
 BuildRequires:	gettext
 BuildRequires:	net-snmp-devel
@@ -68,7 +80,8 @@ BuildRequires:	python-devel
 BuildRequires:	gmp-devel
 
 %if 0%{?fedora} > 4 || 0%{?rhel} > 4
-BuildRequires:	libXScrnSaver-devel libXtst-devel
+BuildRequires:	libXScrnSaver-devel
+BuildRequires:	libXtst-devel
 %endif
 
 %if 0%{?fedora}
@@ -95,9 +108,6 @@ Requires: trinity-ktimer = %{version}-%{release}
 Requires: trinity-kwalletmanager = %{version}-%{release}
 Requires: trinity-superkaramba = %{version}-%{release}
 
-Requires(post):		/sbin/ldconfig
-Requires(postun):	/sbin/ldconfig
-
 %files
 
 
@@ -127,7 +137,8 @@ Utilities for the Trinity Desktop Environment, including:
 Summary:	graphical archiving tool for Trinity
 Group:		Applications/Utilities
 #Requires:	ncompress
-Requires:	unzip, zip
+Requires:	unzip
+Requires:	zip
 #Requires:	zoo
 Requires:	bzip2
 #Requires:	p7zip
@@ -149,35 +160,35 @@ package.
 
 %files -n trinity-ark
 %defattr(-,root,root,-)
-%{_bindir}/ark
-%{tde_libdir}/ark.la
-%{tde_libdir}/ark.so
-%{tde_libdir}/libarkpart.la
-%{tde_libdir}/libarkpart.so
-%{_libdir}/lib[kt]deinit_ark.so
-%{tde_appdir}/ark.desktop
-%{_datadir}/apps/ark/
-%{_datadir}/config.kcfg/ark.kcfg
-%{_datadir}/icons/hicolor/*/apps/ark.png
-%{_datadir}/icons/hicolor/scalable/apps/ark.svgz
-%{_datadir}/services/ark_part.desktop
-%{tde_docdir}/HTML/en/ark/
+%{tde_bindir}/ark
+%{tde_tdelibdir}/ark.la
+%{tde_tdelibdir}/ark.so
+%{tde_tdelibdir}/libarkpart.la
+%{tde_tdelibdir}/libarkpart.so
+%{tde_libdir}/lib[kt]deinit_ark.so
+%{tde_tdeappdir}/ark.desktop
+%{tde_datadir}/apps/ark/
+%{tde_datadir}/config.kcfg/ark.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/ark.png
+%{tde_datadir}/icons/hicolor/scalable/apps/ark.svgz
+%{tde_datadir}/services/ark_part.desktop
+%{tde_tdedocdir}/HTML/en/ark/
 
 %post -n trinity-ark
 /sbin/ldconfig
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %postun -n trinity-ark
 /sbin/ldconfig
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 ##########
 
@@ -196,33 +207,33 @@ It provides:
 
 %files -n trinity-kcalc
 %defattr(-,root,root,-)
-%{_bindir}/kcalc
-%{tde_libdir}/kcalc.la
-%{tde_libdir}/kcalc.so
-%{_libdir}/lib[kt]deinit_kcalc.so
-%{tde_appdir}/kcalc.desktop
-%{_datadir}/apps/kcalc/
-%{_datadir}/apps/kconf_update/kcalcrc.upd
-%{_datadir}/config.kcfg/kcalc.kcfg
-%{_datadir}/icons/hicolor/*/apps/kcalc.png
-%{_datadir}/icons/hicolor/scalable/apps/kcalc.svgz
-%{tde_docdir}/HTML/en/kcalc/
+%{tde_bindir}/kcalc
+%{tde_tdelibdir}/kcalc.la
+%{tde_tdelibdir}/kcalc.so
+%{tde_libdir}/lib[kt]deinit_kcalc.so
+%{tde_tdeappdir}/kcalc.desktop
+%{tde_datadir}/apps/kcalc/
+%{tde_datadir}/apps/kconf_update/kcalcrc.upd
+%{tde_datadir}/config.kcfg/kcalc.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/kcalc.png
+%{tde_datadir}/icons/hicolor/scalable/apps/kcalc.svgz
+%{tde_tdedocdir}/HTML/en/kcalc/
 
 %post -n trinity-kcalc
 /sbin/ldconfig
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %postun -n trinity-kcalc
 /sbin/ldconfig
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 ##########
 
@@ -235,29 +246,29 @@ A character set selector for TDE.
 
 %files -n trinity-kcharselect
 %defattr(-,root,root,-)
-%{_bindir}/kcharselect
-%{tde_libdir}/kcharselect_panelapplet.la
-%{tde_libdir}/kcharselect_panelapplet.so
-%{tde_appdir}/KCharSelect.desktop
-%{_datadir}/apps/kcharselect/
-%{_datadir}/apps/kconf_update/kcharselect.upd
-%{_datadir}/apps/kicker/applets/kcharselectapplet.desktop
-%{_datadir}/icons/hicolor/*/apps/kcharselect.png
-%{tde_docdir}/HTML/en/kcharselect/
+%{tde_bindir}/kcharselect
+%{tde_tdelibdir}/kcharselect_panelapplet.la
+%{tde_tdelibdir}/kcharselect_panelapplet.so
+%{tde_tdeappdir}/KCharSelect.desktop
+%{tde_datadir}/apps/kcharselect/
+%{tde_datadir}/apps/kconf_update/kcharselect.upd
+%{tde_datadir}/apps/kicker/applets/kcharselectapplet.desktop
+%{tde_datadir}/icons/hicolor/*/apps/kcharselect.png
+%{tde_tdedocdir}/HTML/en/kcharselect/
 
 %post -n trinity-kcharselect
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %postun -n trinity-kcharselect
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null  ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null  ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 ##########
 
@@ -270,46 +281,46 @@ This is a frontend for the LIRC suite to use infrared devices with TDE.
 
 %files -n trinity-kdelirc
 %defattr(-,root,root,-)
-%{_bindir}/irkick
-%{tde_libdir}/irkick.la
-%{tde_libdir}/irkick.so
-%{tde_libdir}/kcm_kcmlirc.la
-%{tde_libdir}/kcm_kcmlirc.so
-%{_libdir}/lib[kt]deinit_irkick.so
-%{tde_appdir}/irkick.desktop
-%{tde_appdir}/kcmlirc.desktop
-%{_datadir}/apps/irkick/
-%{_datadir}/apps/profiles/klauncher.profile.xml
-%{_datadir}/apps/profiles/konqueror.profile.xml
-%{_datadir}/apps/profiles/noatun.profile.xml
-%{_datadir}/apps/profiles/profile.dtd
-%{_datadir}/apps/remotes/RM-0010.remote.xml
-%{_datadir}/apps/remotes/cimr100.remote.xml
-%{_datadir}/apps/remotes/hauppauge.remote.xml
-%{_datadir}/apps/remotes/remote.dtd
-%{_datadir}/apps/remotes/sherwood.remote.xml
-%{_datadir}/apps/remotes/sonytv.remote.xml
-%{_datadir}/autostart/irkick.desktop
-%{_datadir}/icons/hicolor/*/apps/irkick.png
-%{_datadir}/icons/locolor/*/apps/irkick.png
-%{tde_docdir}/HTML/en/irkick/
-%{tde_docdir}/HTML/en/kcmlirc/
+%{tde_bindir}/irkick
+%{tde_tdelibdir}/irkick.la
+%{tde_tdelibdir}/irkick.so
+%{tde_tdelibdir}/kcm_kcmlirc.la
+%{tde_tdelibdir}/kcm_kcmlirc.so
+%{tde_libdir}/lib[kt]deinit_irkick.so
+%{tde_tdeappdir}/irkick.desktop
+%{tde_tdeappdir}/kcmlirc.desktop
+%{tde_datadir}/apps/irkick/
+%{tde_datadir}/apps/profiles/klauncher.profile.xml
+%{tde_datadir}/apps/profiles/konqueror.profile.xml
+%{tde_datadir}/apps/profiles/noatun.profile.xml
+%{tde_datadir}/apps/profiles/profile.dtd
+%{tde_datadir}/apps/remotes/RM-0010.remote.xml
+%{tde_datadir}/apps/remotes/cimr100.remote.xml
+%{tde_datadir}/apps/remotes/hauppauge.remote.xml
+%{tde_datadir}/apps/remotes/remote.dtd
+%{tde_datadir}/apps/remotes/sherwood.remote.xml
+%{tde_datadir}/apps/remotes/sonytv.remote.xml
+%{tde_datadir}/autostart/irkick.desktop
+%{tde_datadir}/icons/hicolor/*/apps/irkick.png
+%{tde_datadir}/icons/locolor/*/apps/irkick.png
+%{tde_tdedocdir}/HTML/en/irkick/
+%{tde_tdedocdir}/HTML/en/kcmlirc/
 
 %post -n trinity-kdelirc
 /sbin/ldconfig
 for f in hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %postun -n trinity-kdelirc
 /sbin/ldconfig
 for f in hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null  ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null  ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 ##########
 
@@ -323,7 +334,7 @@ This package contains TDE's frontend for ssh.
 
 %files -n trinity-kdessh
 %defattr(-,root,root,-)
-%{_bindir}/kdessh
+%{tde_bindir}/kdessh
 
 ##########
 
@@ -339,33 +350,33 @@ in a file manager.
 
 %files -n trinity-kdf
 %defattr(-,root,root,-)
-%{_bindir}/kdf
-%{_bindir}/kwikdisk
-%{tde_libdir}/kcm_kdf.la
-%{tde_libdir}/kcm_kdf.so
-%{tde_appdir}/kcmdf.desktop
-%{tde_appdir}/kdf.desktop
-%{tde_appdir}/kwikdisk.desktop
-%{_datadir}/apps/kdf/
-%{_datadir}/icons/crystalsvg/*/apps/kcmdf.png
-%{_datadir}/icons/hicolor/*/apps/kdf.png
-%{_datadir}/icons/hicolor/*/apps/kwikdisk.png
-%{tde_docdir}/HTML/en/kdf/
-%{tde_docdir}/HTML/en/kinfocenter/blockdevices/
+%{tde_bindir}/kdf
+%{tde_bindir}/kwikdisk
+%{tde_tdelibdir}/kcm_kdf.la
+%{tde_tdelibdir}/kcm_kdf.so
+%{tde_tdeappdir}/kcmdf.desktop
+%{tde_tdeappdir}/kdf.desktop
+%{tde_tdeappdir}/kwikdisk.desktop
+%{tde_datadir}/apps/kdf/
+%{tde_datadir}/icons/crystalsvg/*/apps/kcmdf.png
+%{tde_datadir}/icons/hicolor/*/apps/kdf.png
+%{tde_datadir}/icons/hicolor/*/apps/kwikdisk.png
+%{tde_tdedocdir}/HTML/en/kdf/
+%{tde_tdedocdir}/HTML/en/kinfocenter/blockdevices/
 
 %post -n trinity-kdf
 for f in crystalsvg hicolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %postun -n trinity-kdf
 for f in crystalsvg hicolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null  ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null  ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 ##########
 
@@ -383,31 +394,31 @@ reasonably fast start.
 
 %files -n trinity-kedit
 %defattr(-,root,root,-)
-%{_bindir}/kedit
-%{tde_libdir}/kedit.la
-%{tde_libdir}/kedit.so
-%{_libdir}/lib[kt]deinit_kedit.so
-%{tde_appdir}/KEdit.desktop
-%{_datadir}/apps/kedit/keditui.rc
-%{_datadir}/config.kcfg/kedit.kcfg
-%{_datadir}/icons/hicolor/*/apps/kedit.png
-%{tde_docdir}/HTML/en/kedit/
+%{tde_bindir}/kedit
+%{tde_tdelibdir}/kedit.la
+%{tde_tdelibdir}/kedit.so
+%{tde_libdir}/lib[kt]deinit_kedit.so
+%{tde_tdeappdir}/KEdit.desktop
+%{tde_datadir}/apps/kedit/keditui.rc
+%{tde_datadir}/config.kcfg/kedit.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/kedit.png
+%{tde_tdedocdir}/HTML/en/kedit/
 
 %post -n trinity-kedit
 /sbin/ldconfig
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %postun -n trinity-kedit
 /sbin/ldconfig
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null  ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null  ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 ##########
 
@@ -422,25 +433,25 @@ to format 3.5" and 5.25" floppy disks.
 
 %files -n trinity-kfloppy
 %defattr(-,root,root,-)
-%{_bindir}/kfloppy
-%{tde_appdir}/KFloppy.desktop
-%{_datadir}/apps/konqueror/servicemenus/floppy_format.desktop
-%{_datadir}/icons/hicolor/*/apps/kfloppy.png
-%{tde_docdir}/HTML/en/kfloppy/
+%{tde_bindir}/kfloppy
+%{tde_tdeappdir}/KFloppy.desktop
+%{tde_datadir}/apps/konqueror/servicemenus/floppy_format.desktop
+%{tde_datadir}/icons/hicolor/*/apps/kfloppy.png
+%{tde_tdedocdir}/HTML/en/kfloppy/
 
 %post -n trinity-kfloppy
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %postun -n trinity-kfloppy
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null  ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null  ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 ##########
 
@@ -467,29 +478,29 @@ Features:
 
 %files -n trinity-kgpg
 %defattr(-,root,root,-)
-%{_bindir}/kgpg
-%{tde_appdir}/kgpg.desktop
-%{_datadir}/apps/kgpg/
-%{_datadir}/apps/konqueror/servicemenus/encryptfile.desktop
-%{_datadir}/apps/konqueror/servicemenus/encryptfolder.desktop
-%{_datadir}/autostart/kgpg.desktop
-%{_datadir}/config.kcfg/kgpg.kcfg
-%{_datadir}/icons/hicolor/*/apps/kgpg.png
-%{tde_docdir}/HTML/en/kgpg/
+%{tde_bindir}/kgpg
+%{tde_tdeappdir}/kgpg.desktop
+%{tde_datadir}/apps/kgpg/
+%{tde_datadir}/apps/konqueror/servicemenus/encryptfile.desktop
+%{tde_datadir}/apps/konqueror/servicemenus/encryptfolder.desktop
+%{tde_datadir}/autostart/kgpg.desktop
+%{tde_datadir}/config.kcfg/kgpg.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/kgpg.png
+%{tde_tdedocdir}/HTML/en/kgpg/
 
 %post -n trinity-kgpg
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %postun -n trinity-kgpg
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null  ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null  ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 ##########
 
@@ -504,35 +515,35 @@ support and other powerful features.
 
 %files -n trinity-khexedit
 %defattr(-,root,root,-)
-%{_bindir}/khexedit
-%{tde_libdir}/libkbyteseditwidget.la
-%{tde_libdir}/libkbyteseditwidget.so
-%{tde_libdir}/libkhexedit2part.la
-%{tde_libdir}/libkhexedit2part.so
-%{_libdir}/libkhexeditcommon.so.*
-%{tde_appdir}/khexedit.desktop
-%{_datadir}/apps/khexedit/
-%{_datadir}/apps/khexedit2part/khexedit2partui.rc
-%{_datadir}/icons/hicolor/*/apps/khexedit.png
-%{_datadir}/services/kbyteseditwidget.desktop
-%{_datadir}/services/khexedit2part.desktop
-%{tde_docdir}/HTML/en/khexedit/
+%{tde_bindir}/khexedit
+%{tde_tdelibdir}/libkbyteseditwidget.la
+%{tde_tdelibdir}/libkbyteseditwidget.so
+%{tde_tdelibdir}/libkhexedit2part.la
+%{tde_tdelibdir}/libkhexedit2part.so
+%{tde_libdir}/libkhexeditcommon.so.*
+%{tde_tdeappdir}/khexedit.desktop
+%{tde_datadir}/apps/khexedit/
+%{tde_datadir}/apps/khexedit2part/khexedit2partui.rc
+%{tde_datadir}/icons/hicolor/*/apps/khexedit.png
+%{tde_datadir}/services/kbyteseditwidget.desktop
+%{tde_datadir}/services/khexedit2part.desktop
+%{tde_tdedocdir}/HTML/en/khexedit/
 
 %post -n trinity-khexedit
 /sbin/ldconfig
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %postun -n trinity-khexedit
 /sbin/ldconfig
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null  ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null  ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 ##########
 
@@ -546,26 +557,26 @@ program included in the tkgoodstuff package.
 
 %files -n trinity-kjots
 %defattr(-,root,root,-)
-%{_bindir}/kjots
-%{tde_appdir}/Kjots.desktop
-%{_datadir}/apps/kjots/
-%{_datadir}/config.kcfg/kjots.kcfg
-%{_datadir}/icons/hicolor/*/apps/kjots.png
-%{tde_docdir}/HTML/en/kjots/
+%{tde_bindir}/kjots
+%{tde_tdeappdir}/Kjots.desktop
+%{tde_datadir}/apps/kjots/
+%{tde_datadir}/config.kcfg/kjots.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/kjots.png
+%{tde_tdedocdir}/HTML/en/kjots/
 
 %post -n trinity-kjots
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %postun -n trinity-kjots
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null  ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null  ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 ##########
 
@@ -581,46 +592,46 @@ power management, for laptops, from within TDE.
 
 %files -n trinity-klaptopdaemon
 %defattr(-,root,root,-)
-%{_bindir}/klaptop_acpi_helper
-%{_bindir}/klaptop_check
-%{tde_libdir}/kcm_laptop.la
-%{tde_libdir}/kcm_laptop.so
-%{tde_libdir}/kded_klaptopdaemon.la
-%{tde_libdir}/kded_klaptopdaemon.so
-%{_libdir}/libkcmlaptop.so.*
-%{tde_appdir}/laptop.desktop
-%{tde_appdir}/pcmcia.desktop
-%{_datadir}/apps/klaptopdaemon/
-%{_datadir}/icons/crystalsvg/*/apps/laptop_battery.png
-%{_datadir}/icons/crystalsvg/*/apps/laptop_pcmcia.png
-%{_datadir}/icons/crystalsvg/scalable/apps/laptop_battery.svgz
-%{_datadir}/services/kded/klaptopdaemon.desktop
-%{tde_docdir}/HTML/en/kcontrol/kcmlowbatcrit/
-%{tde_docdir}/HTML/en/kcontrol/kcmlowbatwarn/
-%{tde_docdir}/HTML/en/kcontrol/laptop/
-%{tde_docdir}/HTML/en/kcontrol/powerctrl/
+%{tde_bindir}/klaptop_acpi_helper
+%{tde_bindir}/klaptop_check
+%{tde_tdelibdir}/kcm_laptop.la
+%{tde_tdelibdir}/kcm_laptop.so
+%{tde_tdelibdir}/kded_klaptopdaemon.la
+%{tde_tdelibdir}/kded_klaptopdaemon.so
+%{tde_libdir}/libkcmlaptop.so.*
+%{tde_tdeappdir}/laptop.desktop
+%{tde_tdeappdir}/pcmcia.desktop
+%{tde_datadir}/apps/klaptopdaemon/
+%{tde_datadir}/icons/crystalsvg/*/apps/laptop_battery.png
+%{tde_datadir}/icons/crystalsvg/*/apps/laptop_pcmcia.png
+%{tde_datadir}/icons/crystalsvg/scalable/apps/laptop_battery.svgz
+%{tde_datadir}/services/kded/klaptopdaemon.desktop
+%{tde_tdedocdir}/HTML/en/kcontrol/kcmlowbatcrit/
+%{tde_tdedocdir}/HTML/en/kcontrol/kcmlowbatwarn/
+%{tde_tdedocdir}/HTML/en/kcontrol/laptop/
+%{tde_tdedocdir}/HTML/en/kcontrol/powerctrl/
 
 # RHEL/Fedora specific
 %{_sysconfdir}/pam.d/klaptop_acpi_helper
 %attr(644,root,root) %{_sysconfdir}/security/console.apps/klaptop_acpi_helper
-%{_sbindir}/klaptop_acpi_helper
-%config %{_datadir}/config/kcmlaptoprc
+%{tde_sbindir}/klaptop_acpi_helper
+%config %{tde_datadir}/config/kcmlaptoprc
 
 %post -n trinity-klaptopdaemon
 /sbin/ldconfig
 for f in crystalsvg ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %postun -n trinity-klaptopdaemon
 /sbin/ldconfig
 for f in crystalsvg ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null  ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null  ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 ##########
 
@@ -637,14 +648,14 @@ with special keys.
 
 %files -n trinity-kmilo
 %defattr(-,root,root,-)
-%{tde_libdir}/kded_kmilod.la
-%{tde_libdir}/kded_kmilod.so
-%{tde_libdir}/kmilo_generic.la
-%{tde_libdir}/kmilo_generic.so
-%{_libdir}/libkmilo.so.*
-%{_datadir}/services/kded/kmilod.desktop
-%{_datadir}/services/kmilo/kmilo_generic.desktop
-%{_datadir}/servicetypes/kmilo/kmilopluginsvc.desktop
+%{tde_tdelibdir}/kded_kmilod.la
+%{tde_tdelibdir}/kded_kmilod.so
+%{tde_tdelibdir}/kmilo_generic.la
+%{tde_tdelibdir}/kmilo_generic.so
+%{tde_libdir}/libkmilo.so.*
+%{tde_datadir}/services/kded/kmilod.desktop
+%{tde_datadir}/services/kmilo/kmilo_generic.desktop
+%{tde_datadir}/servicetypes/kmilo/kmilopluginsvc.desktop
 
 %post -n trinity-kmilo
 /sbin/ldconfig
@@ -670,24 +681,24 @@ plugin, if you need this package please file a bug.
 
 %files -n trinity-kmilo-legacy
 %defattr(-,root,root,-)
-%{tde_libdir}/kcm_kvaio.la
-%{tde_libdir}/kcm_kvaio.so
-%{tde_libdir}/kcm_thinkpad.la
-%{tde_libdir}/kcm_thinkpad.so
-%{tde_libdir}/kmilo_asus.la
-%{tde_libdir}/kmilo_asus.so
-%{tde_libdir}/kmilo_delli8k.la
-%{tde_libdir}/kmilo_delli8k.so
-%{tde_libdir}/kmilo_kvaio.la
-%{tde_libdir}/kmilo_kvaio.so
-%{tde_libdir}/kmilo_thinkpad.la
-%{tde_libdir}/kmilo_thinkpad.so
-%{tde_appdir}/kvaio.desktop
-%{tde_appdir}/thinkpad.desktop
-%{_datadir}/services/kmilo/kmilo_asus.desktop
-%{_datadir}/services/kmilo/kmilo_delli8k.desktop
-%{_datadir}/services/kmilo/kmilo_kvaio.desktop
-%{_datadir}/services/kmilo/kmilo_thinkpad.desktop
+%{tde_tdelibdir}/kcm_kvaio.la
+%{tde_tdelibdir}/kcm_kvaio.so
+%{tde_tdelibdir}/kcm_thinkpad.la
+%{tde_tdelibdir}/kcm_thinkpad.so
+%{tde_tdelibdir}/kmilo_asus.la
+%{tde_tdelibdir}/kmilo_asus.so
+%{tde_tdelibdir}/kmilo_delli8k.la
+%{tde_tdelibdir}/kmilo_delli8k.so
+%{tde_tdelibdir}/kmilo_kvaio.la
+%{tde_tdelibdir}/kmilo_kvaio.so
+%{tde_tdelibdir}/kmilo_thinkpad.la
+%{tde_tdelibdir}/kmilo_thinkpad.so
+%{tde_tdeappdir}/kvaio.desktop
+%{tde_tdeappdir}/thinkpad.desktop
+%{tde_datadir}/services/kmilo/kmilo_asus.desktop
+%{tde_datadir}/services/kmilo/kmilo_delli8k.desktop
+%{tde_datadir}/services/kmilo/kmilo_kvaio.desktop
+%{tde_datadir}/services/kmilo/kmilo_thinkpad.desktop
 
 ##########
 
@@ -701,31 +712,31 @@ with TDE. It let you draw your regular expression in an unambiguous way.
 
 %files -n trinity-kregexpeditor
 %defattr(-,root,root,-)
-%{_bindir}/kregexpeditor
-%{tde_libdir}/libkregexpeditorgui.la
-%{tde_libdir}/libkregexpeditorgui.so
-%{_libdir}/libkregexpeditorcommon.so.*
-%{tde_appdir}/kregexpeditor.desktop
-%{_datadir}/apps/kregexpeditor/
-%{_datadir}/icons/hicolor/*/apps/kregexpeditor.png
-%{_datadir}/services/kregexpeditorgui.desktop
-%{tde_docdir}/HTML/en/KRegExpEditor/
+%{tde_bindir}/kregexpeditor
+%{tde_tdelibdir}/libkregexpeditorgui.la
+%{tde_tdelibdir}/libkregexpeditorgui.so
+%{tde_libdir}/libkregexpeditorcommon.so.*
+%{tde_tdeappdir}/kregexpeditor.desktop
+%{tde_datadir}/apps/kregexpeditor/
+%{tde_datadir}/icons/hicolor/*/apps/kregexpeditor.png
+%{tde_datadir}/services/kregexpeditorgui.desktop
+%{tde_tdedocdir}/HTML/en/KRegExpEditor/
 
 %post -n trinity-kregexpeditor
 /sbin/ldconfig
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %postun -n trinity-kregexpeditor
 /sbin/ldconfig
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null  ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null  ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 ##########
 
@@ -740,28 +751,28 @@ connections, power, etc.
 
 %files -n trinity-ksim
 %defattr(-,root,root,-)
-%config %{_datadir}/config/ksim_panelextensionrc
-%{tde_libdir}/ksim_*.la
-%{tde_libdir}/ksim_*.so
-%{_libdir}/libksimcore.so.*
-%{_datadir}/apps/kicker/extensions/ksim.desktop
-%{_datadir}/apps/ksim/
-%{tde_docdir}/HTML/en/ksim/
-%{_datadir}/icons/crystalsvg/*/apps/ksim.png
-%{_datadir}/icons/crystalsvg/*/devices/ksim_cpu.png
+%config %{tde_datadir}/config/ksim_panelextensionrc
+%{tde_tdelibdir}/ksim_*.la
+%{tde_tdelibdir}/ksim_*.so
+%{tde_libdir}/libksimcore.so.*
+%{tde_datadir}/apps/kicker/extensions/ksim.desktop
+%{tde_datadir}/apps/ksim/
+%{tde_tdedocdir}/HTML/en/ksim/
+%{tde_datadir}/icons/crystalsvg/*/apps/ksim.png
+%{tde_datadir}/icons/crystalsvg/*/devices/ksim_cpu.png
 
 %post -n trinity-ksim
 /sbin/ldconfig
 for f in crystalsvg ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
 done
 
 %postun -n trinity-ksim
 /sbin/ldconfig
 for f in crystalsvg ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null  ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null  ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
 done
 
 ##########
@@ -777,24 +788,24 @@ command execution.
 
 %files -n trinity-ktimer
 %defattr(-,root,root,-)
-%{_bindir}/ktimer
-%{tde_appdir}/ktimer.desktop
-%{_datadir}/icons/hicolor/*/apps/ktimer.png
-%{tde_docdir}/HTML/en/ktimer/
+%{tde_bindir}/ktimer
+%{tde_tdeappdir}/ktimer.desktop
+%{tde_datadir}/icons/hicolor/*/apps/ktimer.png
+%{tde_tdedocdir}/HTML/en/ktimer/
 
 %post -n trinity-ktimer
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %postun -n trinity-ktimer
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 ##########
 
@@ -809,31 +820,31 @@ keeps a master password to all wallets.
 
 %files -n trinity-kwalletmanager
 %defattr(-,root,root,-)
-%{_bindir}/kwalletmanager
-%{tde_libdir}/kcm_kwallet.la
-%{tde_libdir}/kcm_kwallet.so
-%{tde_appdir}/kwalletconfig.desktop
-%{tde_appdir}/kwalletmanager.desktop
-%{tde_appdir}/kwalletmanager-kwalletd.desktop
-%{_datadir}/apps/kwalletmanager/
-%{_datadir}/icons/hicolor/*/apps/kwalletmanager.png
-%{_datadir}/services/kwallet_config.desktop
-%{_datadir}/services/kwalletmanager_show.desktop
-%{tde_docdir}/HTML/en/kwallet/
+%{tde_bindir}/kwalletmanager
+%{tde_tdelibdir}/kcm_kwallet.la
+%{tde_tdelibdir}/kcm_kwallet.so
+%{tde_tdeappdir}/kwalletconfig.desktop
+%{tde_tdeappdir}/kwalletmanager.desktop
+%{tde_tdeappdir}/kwalletmanager-kwalletd.desktop
+%{tde_datadir}/apps/kwalletmanager/
+%{tde_datadir}/icons/hicolor/*/apps/kwalletmanager.png
+%{tde_datadir}/services/kwallet_config.desktop
+%{tde_datadir}/services/kwalletmanager_show.desktop
+%{tde_tdedocdir}/HTML/en/kwallet/
 
 %post -n trinity-kwalletmanager
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %postun -n trinity-kwalletmanager
 for f in hicolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
 done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 ##########
 
@@ -855,26 +866,26 @@ Here are just some examples of the things that can be done:
 
 %files -n trinity-superkaramba
 %defattr(-,root,root,-)
-%{_bindir}/superkaramba
-%{_datadir}/applnk/Utilities/superkaramba.desktop
-%{_datadir}/apps/superkaramba/superkarambaui.rc
-%{_datadir}/icons/crystalsvg/*/apps/superkaramba.png
-%{_datadir}/icons/crystalsvg/*/mimetypes/superkaramba_theme.png
-%{_datadir}/icons/crystalsvg/scalable/apps/superkaramba.svgz
-%{_datadir}/icons/crystalsvg/scalable/mimetypes/superkaramba_theme.svgz
-%{_datadir}/mimelnk/application/x-superkaramba.desktop
-%{tde_docdir}/HTML/en/superkaramba/
+%{tde_bindir}/superkaramba
+%{tde_datadir}/applnk/Utilities/superkaramba.desktop
+%{tde_datadir}/apps/superkaramba/superkarambaui.rc
+%{tde_datadir}/icons/crystalsvg/*/apps/superkaramba.png
+%{tde_datadir}/icons/crystalsvg/*/mimetypes/superkaramba_theme.png
+%{tde_datadir}/icons/crystalsvg/scalable/apps/superkaramba.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/mimetypes/superkaramba_theme.svgz
+%{tde_datadir}/mimelnk/application/x-superkaramba.desktop
+%{tde_tdedocdir}/HTML/en/superkaramba/
 
 %post -n trinity-superkaramba
 for f in crystalsvg ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
 done
 
 %postun -n trinity-superkaramba
 for f in crystalsvg ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
 done
 
 ##########
@@ -884,31 +895,33 @@ done
 Summary:	Development files for %{name} 
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	tdelibs-devel
+Requires:	trinity-tdelibs-devel
 
 Obsoletes:	trinity-kdeutils-devel < %{version}-%{release}
 Provides:	trinity-kdeutils-devel = %{version}-%{release}
+Obsoletes:	tdeutils-devel < %{version}-%{release}
+Provides:	tdeutils-devel = %{version}-%{release}
 
 %description devel
 Development files for %{name}.
 
 %files devel
 %defattr(-,root,root,-)
-%{tde_includedir}/*
-%{_libdir}/libkcmlaptop.la
-%{_libdir}/libkcmlaptop.so
-%{_libdir}/lib[kt]deinit_ark.la
-%{_libdir}/lib[kt]deinit_irkick.la
-%{_libdir}/lib[kt]deinit_kcalc.la
-%{_libdir}/lib[kt]deinit_kedit.la
-%{_libdir}/libkmilo.la
-%{_libdir}/libkmilo.so
-%{_libdir}/libkregexpeditorcommon.la
-%{_libdir}/libkregexpeditorcommon.so
-%{_libdir}/libksimcore.la
-%{_libdir}/libksimcore.so
-%{_libdir}/libkhexeditcommon.la
-%{_libdir}/libkhexeditcommon.so
+%{tde_tdeincludedir}/*
+%{tde_libdir}/libkcmlaptop.la
+%{tde_libdir}/libkcmlaptop.so
+%{tde_libdir}/lib[kt]deinit_ark.la
+%{tde_libdir}/lib[kt]deinit_irkick.la
+%{tde_libdir}/lib[kt]deinit_kcalc.la
+%{tde_libdir}/lib[kt]deinit_kedit.la
+%{tde_libdir}/libkmilo.la
+%{tde_libdir}/libkmilo.so
+%{tde_libdir}/libkregexpeditorcommon.la
+%{tde_libdir}/libkregexpeditorcommon.so
+%{tde_libdir}/libksimcore.la
+%{tde_libdir}/libksimcore.so
+%{tde_libdir}/libkhexeditcommon.la
+%{tde_libdir}/libkhexeditcommon.so
 
 %post devel
 /sbin/ldconfig
@@ -928,12 +941,13 @@ Development files for %{name}.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1 -b .ftbfs
 
 # Ugly hack to modify TQT include directory inside autoconf files.
 # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+%__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"
@@ -941,25 +955,35 @@ Development files for %{name}.
 
 %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 \
+   --exec-prefix=%{_prefix} \
+   --bindir=%{tde_bindir} \
+   --libdir=%{tde_libdir} \
+   --datadir=%{tde_datadir} \
+   --includedir=%{tde_tdeincludedir} \
    --enable-new-ldflags \
    --disable-dependency-tracking \
    --disable-rpath \
    --disable-debug --disable-warnings \
    --enable-final \
-   --includedir=%{tde_includedir} \
+   --includedir=%{tde_tdeincludedir} \
    --with-snmp \
+%if 0%{?fedora}
+   --with-xmms \
+%else
+   --without-xmms \
+%endif
    --with-xscreensaver \
-   --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 DESTDIR=%{?buildroot}
 
@@ -967,8 +991,8 @@ export PATH="%{_bindir}:${PATH}"
 for i in kcalc kregexpeditor Kjots ktimer kdf kcmdf ksim KFloppy KEdit \
   KCharSelect ark kwalletmanager kwalletconfig \
  irkick kcmlirc laptop pcmcia kvaio thinkpad kwikdisk; do
- if [ -f %{buildroot}%{_datadir}/applications/kde/$i.desktop ] ; then
-   echo "OnlyShowIn=KDE;" >> %{buildroot}%{_datadir}/applications/kde/$i.desktop
+ if [ -f %{buildroot}%{tde_datadir}/applications/kde/$i.desktop ] ; then
+   echo "OnlyShowIn=KDE;" >> %{buildroot}%{tde_datadir}/applications/kde/$i.desktop
  fi
 done
 
@@ -999,14 +1023,14 @@ fi
 %__install -p -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pam.d/klaptop_acpi_helper
 %__install -p -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/security/console.apps/klaptop_acpi_helper
 
-pushd %{buildroot}%{_bindir}
-  %__mkdir_p %{buildroot}%{_sbindir}
+pushd %{buildroot}%{tde_bindir}
+  %__mkdir_p %{buildroot}%{tde_sbindir}
   %__mv klaptop_acpi_helper ../sbin
   %__ln_s /usr/bin/consolehelper klaptop_acpi_helper
 popd
 
 # klaptop setting
-%__install -p -D -m 644 %{SOURCE3} %{buildroot}%{_datadir}/config/kcmlaptoprc
+%__install -p -D -m 644 %{SOURCE3} %{buildroot}%{tde_datadir}/config/kcmlaptoprc
 
 
 %clean
@@ -1015,6 +1039,9 @@ popd
 
 
 %changelog
+* Fri Jul 20 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-7
+- Renames 'tdeutils' to 'trinity-tdeutils'
+
 * Fri Jun 22 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-6
 - Split in several packages
 - Allow ark embedding [Bug #670] [Commit #2a1d4a67]
diff --git a/redhat/kdevelop/trinity-kdevelop-3.5.13.spec b/redhat/kdevelop/trinity-kdevelop-3.5.13.spec
index 4bfba610e..2f1381a8f 100644
--- a/redhat/kdevelop/trinity-kdevelop-3.5.13.spec
+++ b/redhat/kdevelop/trinity-kdevelop-3.5.13.spec
@@ -1,23 +1,29 @@
 # 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 variables
-%define tde_appdir %{_datadir}/applications/kde
-%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 %{_prefix}/bin
+%define tde_datadir %{_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{_prefix}/include
+%define tde_libdir %{_prefix}/%{_lib}
 
-Name:    trinity-kdevelop
+%define tde_tdeappdir %{tde_datadir}/applications/kde
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_docdir}
+
+Name:    trinity-tdevelop
 Summary: Integrated Development Environment for C++/C
 Version: 3.5.13
-Release: 4%{?dist}%{?_variant}
+Release: 5%{?dist}%{?_variant}
 
-
-License: GPLv2
-Group: Development/Tools
+License:	GPLv2
+Group:		Development/Tools
 
 Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
@@ -47,29 +53,37 @@ Requires: %{name}-libs = %{version}-%{release}
 Requires: make
 Requires: perl
 Requires: flex >= 2.5.4
-Requires: qt3-designer
+%if 0%{?rhel} || 0%{?fedora}
+Requires:	qt3-designer >= 3.3.8.d
+%else
+Requires:	%{_lib}qt3-devel >= 3.3.8.d
+%endif
 Requires: gettext
 Requires: ctags
 
 BuildRequires: cmake >= 2.8
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-arts-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: qt3-devel-docs
+BuildRequires: tqtinterface-devel >= 3.5.13
+BuildRequires: trinity-arts-devel >= 3.5.13
+BuildRequires: trinity-tdelibs-devel >= 3.5.13
+#BuildRequires: qt3-devel-docs >= 3.3.8.d
 BuildRequires: db4-devel
 BuildRequires: flex
 # FIXME: No CVS support in KDevelop? This is going to suck...
 # Requires kdesdk3.
-BuildRequires: trinity-kdesdk-devel
-BuildRequires: subversion-devel neon-devel
+BuildRequires:	trinity-tdesdk-devel >= 3.5.13
+BuildRequires:	subversion-devel
+BuildRequires:	neon-devel
 # looks like this is dragged in by apr-devel (dep of subversion-devel), but not
 # a dependency
-BuildRequires: openldap-devel
+BuildRequires:	openldap-devel
+
+Obsoletes:	trinity-kdevelop < %{version}-%{release}
+Provides:	trinity-kdevelop = %{version}-%{release}
 
 %description
-The KDevelop Integrated Development Environment provides many features
+The TDevelop Integrated Development Environment provides many features
 that developers need as well as providing a unified interface to programs
-like gdb, the C/C++ compiler, and make. KDevelop manages or provides:
+like gdb, the C/C++ compiler, and make. TDevelop manages or provides:
 
 All development tools needed for C++ programming like Compiler,
 Linker, automake and autoconf; KAppWizard, which generates complete,
@@ -90,26 +104,90 @@ with KIconEdit; The inclusion of any other program you need for
 development by adding it to the "Tools"-menu according to your
 individual needs.
 
+%files
+%defattr(-,root,root,-)
+%{tde_bindir}/*
+%{tde_tdelibdir}/*
+%{tde_libdir}/kconf_update_bin/*
+%{tde_tdeappdir}/*
+%{tde_datadir}/apps/*
+%{tde_datadir}/config/*
+%{tde_datadir}/desktop-directories/*
+%{tde_datadir}/icons/hicolor/*/*/*
+%{tde_datadir}/icons/locolor/*/*/*
+%{tde_datadir}/mimelnk/*.desktop
+%{tde_datadir}/mimelnk/*/*
+%{tde_datadir}/services/*
+%{tde_datadir}/servicetypes/*
+%{tde_tdedocdir}/HTML/en/*
+
+%post
+for f in hicolor locolor ; do
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
+
+%postun
+for f in hicolor locolor ; do
+  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
 %package devel
 Summary: Development files for %{name}
 Group: Development/Libraries
 Requires: %{name}-libs = %{version}-%{release}
+
+Obsoletes:	trinity-kdevelop-devel < %{version}-%{release}
+Provides:	trinity-kdevelop-devel = %{version}-%{release}
+
 %description devel
 %{summary}.
 
+%files devel
+%defattr(-,root,root,-)
+%{tde_libdir}/lib*.so
+%{tde_libdir}/lib*.la
+%{tde_includedir}/*
+
+%post devel
+/sbin/ldconfig || :
+
+%postun devel
+/sbin/ldconfig || :
+
+##########
+
 %package libs
 Summary: %{name} runtime libraries
 Group:   System Environment/Libraries
 Requires: trinity-kdelibs
 # include to be paranoid, installing libs-only is still mostly untested -- Rex
 Requires: %{name} = %{version}-%{release}
+
+Obsoletes:	trinity-kdevelop-libs < %{version}-%{release}
+Provides:	trinity-kdevelop-libs = %{version}-%{release}
+
 %description libs
 %{summary}.
 
+%files libs
+%defattr(-,root,root,-)
+%{tde_libdir}/lib*.so.*
+
+%post libs
+/sbin/ldconfig || :
 
+%postun libs
+/sbin/ldconfig || :
 
-%prep
+##########
 
+%prep
 %setup -q -n kdevelop -a1
 %patch1 -p0 -b .config
 %patch2 -p1
@@ -119,8 +197,8 @@ Requires: %{name} = %{version}-%{release}
 # 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"
@@ -132,22 +210,31 @@ Requires: %{name} = %{version}-%{release}
 
 %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}"
 
 # c references
 pushd c_cpp_reference-2.0.2_for_KDE_3.0
 %configure \
+  --exec-prefix=%{_prefix} \
+  --bindir=%{tde_bindir} \
+  --libdir=%{tde_libdir} \
+  --datadir=%{tde_datadir} \
+  --includedir=%{tde_tdeincludedir} \
   --with-qt-libraries=${QTLIB} \
   --with-qt-includes=${QTINC} \
-  --with-extra-libs=%{_libdir}
+  --with-extra-libs=%{tde_libdir}
 popd
 
-%__mkdir build
-cd build
+%{?!mgaversion:%__mkdir build; cd build}
 %cmake \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  -DCMAKE_SKIP_RPATH="OFF" \
   -DWITH_BUILDTOOL_ALL=ON \
   -DWITH_LANGUAGE_ALL=ON \
   -DWITH_VCS_ALL=OFF \
@@ -157,72 +244,28 @@ cd build
 
 %__make %{?_smp_mflags}
 
+# c references
 cd ..
 %__make %{?_smp_mflags} -C c_cpp_reference-2.0.2_for_KDE_3.0
 
 %install
 %__rm -rf %{buildroot}
-cd build
-%__make install DESTDIR=%{buildroot}
-cd ..
+%__make install DESTDIR=%{buildroot} -C build
 %__make install DESTDIR=%{buildroot} -C c_cpp_reference-2.0.2_for_KDE_3.0
 
 # remove useless files
 %__rm -rf %{buildroot}%{_prefix}/kdevbdb
 
 
-%post
-for f in hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-
-%postun
-for f in hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
-
-
 %clean
 %__rm -rf %{buildroot}
 
 
-%files
-%defattr(-,root,root,-)
-%{tde_docdir}/HTML/en/*
-%{_bindir}/*
-%{tde_libdir}/*
-%{_libdir}/kconf_update_bin/*
-%{tde_appdir}/*
-%{_datadir}/apps/*
-%{_datadir}/config/*
-%{_datadir}/desktop-directories/*
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/icons/locolor/*/*/*
-%{_datadir}/mimelnk/*.desktop
-%{_datadir}/mimelnk/*/*
-%{_datadir}/services/*
-%{_datadir}/servicetypes/*
-
-%files libs
-%defattr(-,root,root,-)
-%{_libdir}/lib*.so.*
-%{_libdir}/lib*.la
-
-%files devel
-%defattr(-,root,root,-)
-%{_libdir}/lib*.so
-%{_includedir}/*
-
-
 %changelog
+* Wed Aug 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5
+- Renames to 'trinity-tdevelop'
+- Add support for Mageia 2
+
 * Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
 - Removes runtime dependency to 'trinity-kdelibs'
 
diff --git a/redhat/kdewebdev/kdewebdev-3.5.13-fix_ftbfs.patch b/redhat/kdewebdev/kdewebdev-3.5.13-fix_ftbfs.patch
new file mode 100644
index 000000000..6126cf746
--- /dev/null
+++ b/redhat/kdewebdev/kdewebdev-3.5.13-fix_ftbfs.patch
@@ -0,0 +1,22 @@
+--- kdewebdev/kommander/plugin/Makefile.am.ORI	2012-07-30 20:43:40.366904851 +0200
++++ kdewebdev/kommander/plugin/Makefile.am	2012-07-30 20:43:52.205813593 +0200
+@@ -7,7 +7,7 @@
+ libkommanderplugin_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -no-undefined
+ 
+ # the libraries to link against.
+-libkommanderplugin_la_LIBADD  =  $(LIB_KDEUI) $(LIB_QT)
++libkommanderplugin_la_LIBADD  =  $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+ 
+ libkommanderplugin_la_SOURCES = kommanderplugin.cpp specialinformation.cpp
+ 
+--- kdewebdev/kommander/widget/Makefile.am.ORI	2012-07-30 20:49:46.120865640 +0200
++++ kdewebdev/kommander/widget/Makefile.am	2012-07-30 20:50:25.875198532 +0200
+@@ -7,7 +7,7 @@
+ libkommanderwidget_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -no-undefined
+ 
+ # the libraries to link against.
+-libkommanderwidget_la_LIBADD  = $(top_builddir)/kommander/factory/libkommanderfactory.la $(LIB_KIO) $(LIB_KDEUI) $(LIB_QT)
++libkommanderwidget_la_LIBADD  = $(top_builddir)/kommander/factory/libkommanderfactory.la $(LIB_KIO) $(LIB_KDEUI) $(LIB_QT) -lDCOP
+ 
+ libkommanderwidget_la_SOURCES = expression.cpp function.cpp functionlib.cpp \
+ 	invokeclass.cpp kmdrmainwindow.cpp kommanderfunctions.cpp kommanderwidget.cpp \
diff --git a/redhat/kdewebdev/trinity-kdewebdev-3.5.13.spec b/redhat/kdewebdev/trinity-kdewebdev-3.5.13.spec
index 7e0f16485..0460226b1 100644
--- a/redhat/kdewebdev/trinity-kdewebdev-3.5.13.spec
+++ b/redhat/kdewebdev/trinity-kdewebdev-3.5.13.spec
@@ -1,17 +1,26 @@
 # 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
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%define tde_bindir %{_prefix}/bin
+%define tde_datadir %{_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{_prefix}/include
+%define tde_libdir %{_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
 
-Name:		trinity-kdewebdev
+%define tde_tdeappdir %{tde_datadir}/applications/kde
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_docdir}
+
+Name:		trinity-tdewebdev
 Version:	3.5.13
-Release:	2%{?dist}%{?_variant}
+Release:	3%{?dist}%{?_variant}
 License:	GPL
 Summary:	Web development applications 
 Group:		Applications/Editors
@@ -24,17 +33,19 @@ Prefix:		%{_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	kdewebdev-%{version}.tar.gz
-Source1: http://download.sourceforge.net/quanta/css.tar.bz2
-Source2: http://download.sourceforge.net/quanta/html.tar.bz2
-Source3: http://download.sourceforge.net/quanta/php_manual_en_20030401.tar.bz2
-Source4: http://download.sourceforge.net/quanta/javascript.tar.bz2
-Source5: hi48-app-kxsldbg.png
+Source1:	http://download.sourceforge.net/quanta/css.tar.bz2
+Source2:	http://download.sourceforge.net/quanta/html.tar.bz2
+Source3:	http://download.sourceforge.net/quanta/php_manual_en_20030401.tar.bz2
+Source4:	http://download.sourceforge.net/quanta/javascript.tar.bz2
+Source5:	hi48-app-kxsldbg.png
 
-Patch0: javascript.patch
-Patch1: kdewebdev-3.5.4-kxsldbg-icons.patch
+Patch0:		javascript.patch
+Patch1:		kdewebdev-3.5.4-kxsldbg-icons.patch
 
+# [kdewebdev] Fix FTBFS due to missing linker flags
+Patch2:		kdewebdev-3.5.13-fix_ftbfs.patch
 
-BuildRequires: autoconf automake libtool m4
+BuildRequires:	autoconf automake libtool m4
 BuildRequires:	desktop-file-utils
 BuildRequires:	trinity-kdelibs-devel
 BuildRequires:	trinity-kdesdk-devel
@@ -45,19 +56,20 @@ BuildRequires:	libgcrypt-devel
 %endif
 BuildRequires:	perl
 
-Requires: %{name}-libs = %{version}-%{release}
 
-# optional
-Requires:	tidy
+Obsoletes:	trinity-kdewebdev-libs < %{version}-%{release}
+Provides:	trinity-kdewebdev-libs = %{version}-%{release}
+Obsoletes:	trinity-kdewebdev < %{version}-%{release}
+Provides:	trinity-kdewebdev = %{version}-%{release}
 
-Provides:	kdewebdev3 = %{version}-%{release}
+Requires: trinity-quanta = %{version}-%{release}
+Requires: trinity-quanta-data = %{version}-%{release}
+Requires: trinity-kfilereplace = %{version}-%{release}
+Requires: trinity-kimagemapeditor = %{version}-%{release}
+Requires: trinity-klinkstatus = %{version}-%{release}
+Requires: trinity-kommander = %{version}-%{release}
+Requires: trinity-kxsldbg = %{version}-%{release}
 
-Obsoletes: quanta < %{version}-%{release}
-Provides:  quanta = %{version}-%{release}
-
-%define kommander_ver 1.2.2
-#Obsoletes: kommander < %{kommander_ver}-%{release}
-Provides:  kommander = %{kommander_ver}-%{release}
 
 %description
 %{summary}, including:
@@ -68,33 +80,403 @@ Provides:  kommander = %{kommander_ver}-%{release}
 * kxsldbg: xslt Debugger
 * quanta+: web development
 
+%files
+
+##########
+
+%package -n trinity-quanta
+Summary:	web development environment for KDE [Trinity]
+Group:		Applications/Development
+Requires:	trinity-kfilereplace = %{version}-%{release}
+Requires:	trinity-klinkstatus = %{version}-%{release}
+Requires:	trinity-kommander = %{version}-%{release}
+Requires:	trinity-quanta-data = %{version}-%{release}
+#Requires:	trinity-kimagemapeditor = %{version}-%{release}
+#Requires:	trinity-kxsldbg = %{version}-%{release}
+Requires:	tidy
+
+%description -n trinity-quanta
+Quanta Plus is a web development environment for working with HTML
+and associated languages. It strives to be neutral and transparent
+to all markup languages, while supporting popular web-based scripting
+languages, CSS and other emerging W3C recommendations.
+
+Quanta Plus supports many external components, debuggers and other tools
+for web development, several of which are shipped with the KDE web
+development module.
+
+Quanta Plus is not in any way affiliated with any commercial versions
+of Quanta. The primary coders from the original team left the GPL'd
+version to produce a commercial product.
+
+This package is part of TDE, as a component of the TDE web development module.
+
+%files -n trinity-quanta
+%defattr(-,root,root,-)
+%{tde_bindir}/quanta
+%{tde_tdelibdir}/quantadebuggerdbgp.la
+%{tde_tdelibdir}/quantadebuggerdbgp.so
+%{tde_tdelibdir}/quantadebuggergubed.la
+%{tde_tdelibdir}/quantadebuggergubed.so
+%{tde_tdeappdir}/quanta.desktop
+%{tde_datadir}/apps/kafkapart
+%{tde_datadir}/icons/hicolor/*/apps/quanta.png
+%{tde_datadir}/mimelnk/application/x-webprj.desktop
+%{tde_datadir}/services/quantadebuggerdbgp.desktop
+%{tde_datadir}/services/quantadebuggergubed.desktop
+%{tde_datadir}/services/quanta_preview_config.desktop
+%{tde_datadir}/servicetypes/quantadebugger.desktop
+%{tde_tdedocdir}/HTML/en/quanta/
+
+%post -n trinity-quanta
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-quanta
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+
+##########
+
+%package -n trinity-quanta-data
+Summary:	data files for Quanta Plus web development environment [Trinity]
+Group:		Applications/Development
+
+%description -n trinity-quanta-data
+This package contains architecture-independent data files for Quanta
+Plus, a web development environment for working with HTML and associated
+languages.
+
+See the quanta package for further information.
+
+This package is part of TDE, as a component of the TDE web development module.
+
+%files -n trinity-quanta-data
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/quanta/
+
+##########
+
+%package -n trinity-kfilereplace
+Summary:	batch search-and-replace component for KDE [Trinity]
+Group:		Applications/Development
+
+%description -n trinity-kfilereplace
+KFileReplace is an embedded component for KDE that acts as a batch
+search-and-replace tool. It allows you to replace one expression with
+another in many files at once.
+
+Note that at the moment KFileReplace does not come as a standalone
+application. An example of an application that uses the KFileReplace
+component is Quanta Plus (found in the package quanta).
+
+This package is part of TDE, as a component of the TDE web development module.
+
+%files -n trinity-kfilereplace
+%defattr(-,root,root,-)
+%{tde_bindir}/kfilereplace
+%{tde_tdelibdir}/libkfilereplacepart.la
+%{tde_tdelibdir}/libkfilereplacepart.so
+%{tde_tdeappdir}/kfilereplace.desktop
+%{tde_datadir}/apps/kfilereplace/kfilereplaceui.rc
+%{tde_datadir}/apps/kfilereplacepart
+%{tde_datadir}/icons/hicolor/*/apps/kfilereplace.png
+%{tde_datadir}/services/kfilereplacepart.desktop
+%{tde_tdedocdir}/HTML/en/kfilereplace/
+
+%post -n trinity-kfilereplace
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kfilereplace
+for f in hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kimagemapeditor
+Summary:	HTML image map editor for KDE [Trinity]
+Group:		Applications/Development
+
+%description -n trinity-kimagemapeditor
+KImageMapEditor is a tool that allows you to edit image maps in HTML
+files. As well as providing a standalone application, KImageMapEditor
+makes itself available as a KPart for embedding into larger applications.
+
+This package is part of TDE, as a component of the TDE web development module.
+
+%files -n trinity-kimagemapeditor
+%defattr(-,root,root,-)
+%{tde_bindir}/kimagemapeditor
+%{tde_tdelibdir}/libkimagemapeditor.la
+%{tde_tdelibdir}/libkimagemapeditor.so
+%{tde_tdeappdir}/kimagemapeditor.desktop
+%{tde_datadir}/apps/kimagemapeditor/
+%{tde_datadir}/icons/hicolor/*/apps/kimagemapeditor.png
+%{tde_datadir}/icons/locolor/*/apps/kimagemapeditor.png
+%{tde_datadir}/services/kimagemapeditorpart.desktop
+
+%post -n trinity-kimagemapeditor
+for f in hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kimagemapeditor
+for f in hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-klinkstatus
+Summary:	web link validity checker for KDE [Trinity]
+Group:		Applications/Development
+
+%description -n trinity-klinkstatus
+KLinkStatus is KDE's web link validity checker. It allows you to
+search internal and external links throughout your web site. Simply
+point it to a single page and choose the depth to search.
+
+You can also check local files, or files over ftp:, fish: or any other
+KIO protocols. For performance, links can be checked simultaneously.
+
+This package is part of TDE, as a component of the TDE web development module.
+
+%files -n trinity-klinkstatus
+%defattr(-,root,root,-)
+%{tde_bindir}/klinkstatus
+%{tde_tdelibdir}/libklinkstatuspart.la
+%{tde_tdelibdir}/libklinkstatuspart.so
+%{tde_tdeappdir}/klinkstatus.desktop
+%{tde_datadir}/apps/klinkstatus/
+%{tde_datadir}/apps/klinkstatuspart/
+%{tde_datadir}/config.kcfg/klinkstatus.kcfg
+%{tde_datadir}/icons/crystalsvg/16x16/actions/bug.png
+%{tde_datadir}/icons/hicolor/*/apps/klinkstatus.png
+%{tde_datadir}/services/klinkstatus_part.desktop
+%{tde_tdedocdir}/HTML/en/klinkstatus/
+
+%post -n trinity-klinkstatus
+for f in crystalsvg hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-klinkstatus
+for f in crystalsvg hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kommander
+Summary:	visual dialog builder and executor tool [Trinity]
+Group:		Applications/Development
+Requires:	gettext
+
+%description -n trinity-kommander
+Kommander is a visual dialog building tool whose primary objective is
+to create as much functionality as possible without using any scripting
+language.
+
+More specifically, Kommander is a set of tools that allow you to create
+dynamic GUI dialogs that generate, based on their state, a piece of
+text. The piece of text can be a command line to a program, any piece
+of code, business documents that contain a lot of repetitious or
+templated text and so on.
+
+The resulting generated text can then be executed as a command line
+program (hence the name "Kommander"), written to a file, passed to a
+script for extended processing, and literally anything else you can
+think of. And you aren't required to write a single line of code!
+
+As well as building dialogs, Kommander may be expanded to create full
+mainwindow applications.
+
+This package is part of TDE, as a component of the TDE web development module.
+
+%files -n trinity-kommander
+%defattr(-,root,root,-)
+%{tde_bindir}/kmdr-editor
+%{tde_bindir}/kmdr-executor
+%{tde_bindir}/kmdr-plugins
+%{tde_libdir}/libkommanderplugin.so.*
+%{tde_libdir}/libkommanderwidgets.la
+%{tde_libdir}/libkommanderwidget.so.*
+%{tde_libdir}/libkommanderwidgets.so.*
+%{tde_tdeappdir}/kmdr-editor.desktop
+%{tde_datadir}/applnk/.hidden/kmdr-executor.desktop
+%{tde_datadir}/apps/katepart/syntax/kommander.xml
+%{tde_datadir}/apps/kommander/pics/kommandersplash.png
+%{tde_tdedocdir}/HTML/en/kommander/
+%{tde_datadir}/icons/crystalsvg/*/apps/kommander.png
+%{tde_datadir}/mimelnk/application/x-kommander.desktop
+#kommander/examples /opt/trinity/share/doc/kommander
+#kommander/working/extractkmdr /opt/trinity/bin
+#kommander/working/kmdr2po /opt/trinity/bin
+%{tde_tdelibdir}/libkommander_part.so
+%{tde_tdelibdir}/libkommander_part.la
+%{tde_datadir}/apps/kommander/
+%{tde_datadir}/apps/kmdr-editor/editor/
+%{tde_datadir}/apps/katepart/syntax/kommander-new.xml
+%{tde_datadir}/apps/kdevappwizard/kommanderplugin.png
+%{tde_datadir}/apps/kdevappwizard/kommanderplugin.tar.gz
+%{tde_datadir}/apps/kdevappwizard/templates/kommanderplugin.kdevtemplate
+%{tde_datadir}/services/kommander_part.desktop
+
+%post -n trinity-kommander
+/sbin/ldconfig || :
+for f in crystalsvg ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kommander
+/sbin/ldconfig || :
+for f in crystalsvg ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kommander-devel
+Summary:	development files for Kommander [Trinity]
+Group:		Development/Libraries
+Requires:	trinity-kommander = %{version}-%{release}
+
+%description -n trinity-kommander-devel
+This package contains the headers and other development files for
+building plugins or otherwise extending Kommander.
+
+Kommander is a visual dialog building tool whose primary objective is
+to create as much functionality as possible without using any scripting
+language.
+
+See the kommander package for further information.
+
+This package is part of TDE, as a component of the TDE web development module.
+
+%files -n trinity-kommander-devel
+%defattr(-,root,root,-)
+%{tde_libdir}/libkommanderplugin.la
+%{tde_libdir}/libkommanderplugin.so
+%{tde_libdir}/libkommanderwidget.la
+%{tde_libdir}/libkommanderwidget.so
+%{tde_libdir}/libkommanderwidgets.so
+%{tde_tdeincludedir}/kommander*
+%{tde_tdeincludedir}/specials.h
+
+%post -n trinity-kommander-devel
+/sbin/ldconfig || :
+
+%postun -n trinity-kommander-devel
+/sbin/ldconfig || :
+
+##########
+
+%package -n trinity-kxsldbg
+Summary:	graphical XSLT debugger for KDE [Trinity]
+Group:		Applications/Development
+
+%description -n trinity-kxsldbg
+KXSLDbg is a debugger for XSLT scripts. It includes a graphical user
+interface as well as a text-based debugger. KXSLDbg can be run as a
+standalone application or as an embedded KDE part.
+
+XSLT is an XML language for defining transformations of XML files from
+XML to some other arbitrary format, such as XML, HTML, plain text, etc.,
+using standard XSLT stylesheets.
+
+This package is part of TDE, as a component of the TDE web development module.
+
+%files -n trinity-kxsldbg
+%defattr(-,root,root,-)
+%{tde_bindir}/kxsldbg
+%{tde_bindir}/xsldbg
+%{tde_tdelibdir}/libkxsldbgpart.la
+%{tde_tdelibdir}/libkxsldbgpart.so
+%{tde_tdeappdir}/kxsldbg.desktop
+%{tde_datadir}/apps/kxsldbg
+%{tde_datadir}/apps/kxsldbgpart
+%{tde_tdedocdir}/HTML/en/kxsldbg/
+%{tde_tdedocdir}/HTML/en/xsldbg/
+%{tde_datadir}/icons/hicolor/*/actions/1downarrow.png
+%{tde_datadir}/icons/hicolor/*/actions/configure.png
+%{tde_datadir}/icons/hicolor/*/actions/exit.png
+%{tde_datadir}/icons/hicolor/*/actions/hash.png
+%{tde_datadir}/icons/hicolor/*/actions/mark.png
+%{tde_datadir}/icons/hicolor/*/actions/next.png
+%{tde_datadir}/icons/hicolor/*/actions/run.png
+%{tde_datadir}/icons/hicolor/*/actions/step.png
+%{tde_datadir}/icons/hicolor/*/actions/xsldbg_*.png
+%{tde_datadir}/icons/hicolor/*/apps/kxsldbg.png
+%{tde_datadir}/icons/locolor/*/apps/kxsldbg.png
+%{tde_datadir}/services/kxsldbg_part.desktop
+
+%post -n trinity-kxsldbg
+for f in hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kxsldbg
+for f in hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
 %package devel
 Group: Development/Libraries
-Summary: Header files and documentation for %{name} 
-Provides: kdewebdev3-devel = %{version}-%{release}
-Requires: trinity-kdelibs-devel
-Requires: %{name}-libs
-Obsoletes: quanta-devel < %{version}-%{release}
+Summary:	Header files and documentation for %{name} 
+
+Obsoletes:	trinity-kdewebdev-devel < %{version}-%{release}
+Provides:	trinity-kdewebdev-devel = %{version}-%{release}
+
+Requires:	trinity-tdelibs-devel
+Requires:	trinity-kommander-devel = %{version}-%{release}
+
 %description devel
 %{summary}.
 
-%package libs
-Summary: %{name} runtime libraries
-Group:   System Environment/Libraries
-Requires: trinity-kdelibs
-# helps multilib upgrades
-%description libs
-%{summary}.
+%files devel
 
+##########
 
 %prep
 %setup -q -a 1 -a 2 -a 3 -a 4 -n kdewebdev
 
 # 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"
+%__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"
@@ -102,29 +484,34 @@ Requires: trinity-kdelibs
 
 %patch0 -p0 -b .javascript
 %patch1 -p1 -b .kxsldbg-icons
+%patch2 -p1 -b .ftbfs
 
 %__install -m644 -p %{SOURCE5} kxsldbg/
 
 
 %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 \
-  --includedir=%{tde_includedir} \
+  --exec-prefix=%{_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --includedir=%{tde_tdeincludedir} \
   --disable-rpath \
   --enable-new-ldflags \
   --enable-closure \
   --disable-debug --disable-warnings \
   --disable-dependancy-tracking --enable-final \
-  --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}
 
@@ -134,15 +521,15 @@ export PATH="%{_bindir}:${PATH}"
 for i in css html javascript ; do
    pushd $i
    ./install.sh <<EOF
-%{buildroot}%{_datadir}/apps/quanta/doc
+%{buildroot}%{tde_datadir}/apps/quanta/doc
 EOF
    popd
    rm -rf $i
 done
-cp -a php php.docrc %{buildroot}%{_datadir}/apps/quanta/doc/
+cp -a php php.docrc %{buildroot}%{tde_datadir}/apps/quanta/doc/
 
 # make symlinks relative
-pushd %{buildroot}%{tde_docdir}/HTML/en
+pushd %{buildroot}%{tde_tdedocdir}/HTML/en
 for i in *; do
    if [ -d $i -a -L $i/common ]; then
       rm -f $i/common
@@ -151,69 +538,12 @@ for i in *; do
 done
 popd
 
-# rpmdocs
-for dir in k* quanta; do
-  for file in AUTHORS ChangeLog README TODO ; do
-    test -s  "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
-  done
-done
-
-
-%post
-for f in crystalsvg hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-
-%postun
-for f in crystalsvg hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-
-
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
 
 
 %clean
 %__rm -rf %{buildroot}
 
 
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README
-%doc rpmdocs/*
-%{_bindir}/*
-%{tde_libdir}/*
-%{_datadir}/applications/kde/*
-%{_datadir}/applnk/.hidden/*
-%{_datadir}/apps/*
-%doc %{_datadir}/apps/quanta/doc
-%{_datadir}/config.kcfg/*
-%{_datadir}/icons/crystalsvg/*/*/*
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/icons/locolor/*/*/*
-%{_datadir}/mimelnk/application/*
-%{_datadir}/services/*
-%{_datadir}/servicetypes/*
-%doc %lang(en) %{tde_docdir}/HTML/en/*
-
-
-%files libs
-%defattr(-,root,root,-)
-%{_libdir}/lib*.so.*
-%{_libdir}/lib*.la
-
-%files devel
-%defattr(-,root,root,-)
-%{_libdir}/lib*.so
-%{tde_includedir}/*
-
-
 %changelog
 * Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
 - Fix HTML directory location