Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

50 files changed, 5110 insertions, 439 deletions

diff --git a/redhat/applications/amarok/trinity-amarok.spec b/redhat/applications/amarok/trinity-amarok.spec
index 35580490f..b307f19ce 100644
--- a/redhat/applications/amarok/trinity-amarok.spec
+++ b/redhat/applications/amarok/trinity-amarok.spec
@@ -17,7 +17,7 @@ BuildRequires:	cmake >= 2.8
 
 
 Name:    trinity-%{kdecomp}
-Summary: A drop-down terminal emulator.
+Summary: Media player
 Version: %{version}
 Release: %{release}%{?dist}%{?_variant}
 
diff --git a/redhat/applications/kaffeine-mozilla/trinity-kaffeine-mozilla.spec b/redhat/applications/kaffeine-mozilla/trinity-kaffeine-mozilla.spec
new file mode 100644
index 000000000..e693dadb9
--- /dev/null
+++ b/redhat/applications/kaffeine-mozilla/trinity-kaffeine-mozilla.spec
@@ -0,0 +1,110 @@
+# Default version for this component
+%define kdecomp kaffeine-mozilla
+%define version 0.4.3.1.dfsg
+%define release 1
+
+%define _prefix /usr
+
+# 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
+
+
+Name:		trinity-%{kdecomp}
+Summary:	mozilla plugin that lanches kaffeine for supported media types [Trinity]
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Multimedia
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+Prefix:		%{_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+
+
+BuildRequires: tqtinterface-devel
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: trinity-kdebase-devel
+BuildRequires: desktop-file-utils
+
+BuildRequires:	libXaw-devel
+BuildRequires:	nspr-devel
+Requires:		trinity-kaffeine
+
+%description
+This mozilla plugin launches kaffeine, the xine-based media player for KDE,
+when a page containing a supported media format is loaded.
+
+
+%prep
+unset QTDIR; . /etc/profile.d/qt.sh
+%setup -q -n applications/%{kdecomp}
+
+%__cp -f "/usr/share/aclocal/libtool.m4" .
+%__cp -f "/usr/share/libtool/config/ltmain.sh" .
+autoreconf
+
+for i in src/jri_md.h src/jni_md.h; do
+	%__sed -i "${i}" \
+		-e "s|nspr/prtypes.h|nspr4/prtypes.h|g"
+done
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%configure \
+	--disable-rpath \
+    --with-extra-includes=%{_includedir}/tqt \
+    --enable-closure \
+    --prefix=%{_prefix}/%{_lib}/mozilla
+
+%__make %{?_smp_mflags}
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/sbin/ldconfig || :
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/sbin/ldconfig || :
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING README
+%exclude %{_libdir}/mozilla/plugins/kaffeineplugin.a
+%{_libdir}/mozilla/plugins/kaffeineplugin.la
+%{_libdir}/mozilla/plugins/kaffeineplugin.so
+
+
+%Changelog
+* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.3.1.dfsg-1
+- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+
diff --git a/redhat/applications/kaffeine/trinity-kaffeine.spec b/redhat/applications/kaffeine/trinity-kaffeine.spec
index a9597a754..04b6ef65c 100644
--- a/redhat/applications/kaffeine/trinity-kaffeine.spec
+++ b/redhat/applications/kaffeine/trinity-kaffeine.spec
@@ -1,7 +1,7 @@
 # Default version for this component
 %define kdecomp kaffeine
 %define version 0.8.6
-%define release 1
+%define release 2
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -35,9 +35,13 @@ BuildRequires: trinity-kdelibs-devel
 BuildRequires: cdparanoia-devel cdparanoia
 BuildRequires: libvorbis-devel
 BuildRequires: xine-lib-devel
-BuildRequires: libxcb-devel
 BuildRequires: libXext-devel libXinerama-devel libXtst-devel
 BuildRequires: libcdio-devel
+
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
+BuildRequires: libxcb-devel
+%endif
+
 # dvb
 BuildRequires: glibc-kernheaders 
 BuildRequires: gstreamer-devel >= 0.10, gstreamer-plugins-base-devel >= 0.10
@@ -77,8 +81,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"
+%__sed -i admin/acinclude.m4.in \
+  -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \
+  -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g"
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
 %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
@@ -100,7 +105,10 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
   --disable-dependency-tracking --disable-final \
   --with-gstreamer \
   --without-lame \
-  --with-extra-includes=%{_includedir}/tqt
+  --with-extra-includes=%{_includedir}/tqt \
+%if 0%{?rhel} > 0 && 0%{?rhel} <= 5
+  --without-dvb \
+%endif
   
 
 %__make %{?_smp_mflags}
@@ -144,11 +152,13 @@ rm -rf $RPM_BUILD_ROOT
 touch --no-create %{_datadir}/icons/hicolor ||:
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 update-desktop-database >& /dev/null ||:
+/sbin/ldconfig || :
 
 %postun
 touch --no-create %{_datadir}/icons/hicolor ||:
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 update-desktop-database >& /dev/null ||:
+/sbin/ldconfig || :
 
 %post libs -p /sbin/ldconfig
 
@@ -169,7 +179,7 @@ update-desktop-database >& /dev/null ||:
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/mimelnk/*/*.desktop
 %{_datadir}/service*/*.desktop
-%{_docdir}/HTML/en/kaffeine
+%{tde_docdir}/HTML/en/kaffeine
 
 %files libs
 %defattr(-,root,root,-)
@@ -183,5 +193,9 @@ update-desktop-database >& /dev/null ||:
 
 
 %changelog
+* Sun Dec 04 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.6-2
+- Disable 'libxcb-devel' for RHEL 5 compilation
+- Fix HTML directory location
+
 * Wed Nov 09 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.6-1
 - Spec file based on Fedora 8 'kaffeine-0.8.6-3'
diff --git a/redhat/applications/kde-guidance/trinity-kde-guidance.spec b/redhat/applications/kde-guidance/trinity-kde-guidance.spec
new file mode 100644
index 000000000..c15b9fd43
--- /dev/null
+++ b/redhat/applications/kde-guidance/trinity-kde-guidance.spec
@@ -0,0 +1,317 @@
+# Default version for this component
+%define kdecomp guidance
+%define version 0.8.0svn20080103
+%define release 1
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%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 __arch_install_post %{nil}
+
+Name:		trinity-%{kdecomp}
+Summary:	collection of KDE system administration tools for GNU/Linux [Trinity]
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.simonzone.com/software/guidance
+
+Prefix:    %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	kde-guidance-3.5.13.tar.gz
+
+BuildRequires:	tqtinterface-devel
+BuildRequires:	trinity-kdelibs-devel
+BuildRequires:	trinity-kdebase-devel
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	trinity-pykdeextensions
+BuildRequires:	chrpath
+Requires:		python-trinity
+Requires:		%{name}-backends
+Requires:		hwdata
+Requires:		python >= 2.5
+
+%if "%{_prefix}" == "/usr"
+Conflicts:	guidance-power-manager
+Conflicts:	kde-guidance-powermanager
+%endif
+
+%description
+Guidance currently consists of four programs designed to help you
+look after your system:
+ o  userconfig - User and Group administration
+ o  serviceconfig - Service/daemon administration
+ o  mountconfig - Disk and filesystem administration
+ o  displayconfig - Screen and display configuration
+ o  wineconfig - Wine configuration
+
+These tools are available in KDE Control Center, System Settings 
+or can be run as standalone applications.
+
+
+
+%package backends
+Group:		Applications/Utilities
+Summary:	collection of system administration tools for GNU/Linux [Trinity]
+Requires:	hwdata
+Requires:	python >= 2.5
+
+%description backends
+This package contains the platform neutral backends used in the
+Guidance configuration tools.
+
+
+%package powermanager
+Group:		Applications/Utilities
+Summary:	HAL based power manager applet [Trinity]
+Requires:	%{name} = %{version}-%{release}
+
+%description powermanager
+A power management applet to indicate battery levels and perform hibernate or
+suspend using HAL.
+
+
+%prep
+%setup -q -n applications/kde-guidance
+
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+./setup.py build
+
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+./setup.py install \
+	--prefix=%{_prefix} \
+	--root=%{buildroot}
+
+%find_lang %{kdecomp} || touch %{kdecomp}.lang
+
+# Fix building directories stored inside .py files
+for f in %{buildroot}%{_datadir}/apps/guidance/*.py; do
+	%__sed -i "${f}" -e "s|%{buildroot}||g"
+done
+
+##### MAIN PACKAGE INSTALLATION 
+# install icons to right place
+%__mkdir_p %{buildroot}%{_datadir}/icons/crystalsvg/32x32/apps
+%__mv -f %{buildroot}%{_datadir}/apps/guidance/pics/hi32-app-daemons.png \
+	%{buildroot}%{_datadir}/icons/crystalsvg/32x32/apps/daemons.png
+%__mv -f %{buildroot}%{_datadir}/apps/guidance/pics/kcmpartitions.png \
+	%{buildroot}%{_datadir}/icons/crystalsvg/32x32/apps/disksfilesystems.png
+%__mv -f %{buildroot}%{_datadir}/apps/guidance/pics/hi32-user.png \
+	%{buildroot}%{_datadir}/icons/crystalsvg/32x32/apps/userconfig.png
+%__mv -f %{buildroot}%{_datadir}/apps/guidance/pics/hi32-display.png \
+	%{buildroot}%{_datadir}/icons/crystalsvg/32x32/apps/displayconfig.png
+%__mv -f %{buildroot}%{_datadir}/apps/guidance/pics/32-wine.png \
+	%{buildroot}%{_datadir}/icons/crystalsvg/32x32/apps/wineconfig.png
+%__install -D -p -m0644 kde/wineconfig/pics/16x16/wineconfig.png \
+	%{buildroot}%{_datadir}/icons/crystalsvg/16x16/apps/wineconfig.png
+
+# fix binary-or-shlib-defines-rpath
+chrpath -d %{buildroot}%{tde_libdir}/kcm_*.so.*
+
+# fix executable-not-elf-or-script
+%__chmod 0644 %{buildroot}%{_datadir}/apps/guidance/pics/kdewinewizard.png
+
+# move python modules in %{python_sitearch}
+%__mkdir_p %{buildroot}%{python_sitearch}/%{name}
+%__mv -f %{buildroot}%{_datadir}/apps/guidance/SMBShareSelectDialog.py %{buildroot}%{python_sitearch}/%{name}
+%__mv -f %{buildroot}%{_datadir}/apps/guidance/SimpleCommandRunner.py %{buildroot}%{python_sitearch}/%{name}
+%__mv -f %{buildroot}%{_datadir}/apps/guidance/displayconfig.py %{buildroot}%{python_sitearch}/%{name}
+%__mv -f %{buildroot}%{_datadir}/apps/guidance/displayconfigwidgets.py %{buildroot}%{python_sitearch}/%{name}
+%__mv -f %{buildroot}%{_datadir}/apps/guidance/fuser.py %{buildroot}%{python_sitearch}/%{name}
+%__mv -f %{buildroot}%{_datadir}/apps/guidance/fuser_ui.py %{buildroot}%{python_sitearch}/%{name}
+%__mv -f %{buildroot}%{_datadir}/apps/guidance/grubconfig.py %{buildroot}%{python_sitearch}/%{name}
+%__mv -f %{buildroot}%{_datadir}/apps/guidance/ktimerdialog.py %{buildroot}%{python_sitearch}/%{name}
+%__mv -f %{buildroot}%{_datadir}/apps/guidance/mountconfig.py %{buildroot}%{python_sitearch}/%{name}
+%__mv -f %{buildroot}%{_datadir}/apps/guidance/servertestdialog.py %{buildroot}%{python_sitearch}/%{name}
+%__mv -f %{buildroot}%{_datadir}/apps/guidance/serviceconfig.py %{buildroot}%{python_sitearch}/%{name}
+%__mv -f %{buildroot}%{_datadir}/apps/guidance/sizeview.py %{buildroot}%{python_sitearch}/%{name}
+%__mv -f %{buildroot}%{_datadir}/apps/guidance/unixauthdb.py %{buildroot}%{python_sitearch}/%{name}
+%__mv -f %{buildroot}%{_datadir}/apps/guidance/userconfig.py %{buildroot}%{python_sitearch}/%{name}
+%__mv -f %{buildroot}%{_datadir}/apps/guidance/wineconfig.py %{buildroot}%{python_sitearch}/%{name}
+
+# fix the link properly
+%__rm -f %{buildroot}%{_bindir}/*
+%__ln_s -f %{python_sitearch}/%{name}/displayconfig.py %{buildroot}%{_bindir}/displayconfig
+%__ln_s -f %{python_sitearch}/%{name}/mountconfig.py %{buildroot}%{_bindir}/mountconfig
+%__ln_s -f %{python_sitearch}/%{name}/serviceconfig.py %{buildroot}%{_bindir}/serviceconfig
+%__ln_s -f %{python_sitearch}/%{name}/userconfig.py %{buildroot}%{_bindir}/userconfig
+%__ln_s -f %{python_sitearch}/%{name}/wineconfig.py %{buildroot}%{_bindir}/wineconfig
+%__ln_s -f %{python_sitearch}/%{name}/grubconfig.py %{buildroot}%{_bindir}/grubconfig
+
+# put this here since gnome people probably don't want it by default
+%__ln_s -f %{_python_sitearch}/guidance-backends-trinity/displayconfig-restore.py %{buildroot}%{_bindir}/displayconfig-restore
+
+# fix script-not-executable
+%__chmod 0755 %{buildroot}%{python_sitearch}/%{name}/fuser.py
+%__chmod 0755 %{buildroot}%{python_sitearch}/%{name}/grubconfig.py
+
+# Moves libraries
+%__mv -f %{buildroot}%{tde_libdir}/*.so.* %{buildroot}%{_libdir}
+%__mv -f %{buildroot}%{tde_libdir}/*.so %{buildroot}%{_libdir}
+%__mv -f %{buildroot}%{tde_libdir}/*.la %{buildroot}%{_libdir}
+%__mv -f %{buildroot}%{tde_libdir}/*.a %{buildroot}%{_libdir}
+
+%__mv -f %{buildroot}%{_datadir}/applications/kde/displayconfig.desktop %{buildroot}%{_datadir}/applications/kde/guidance-displayconfig.desktop
+
+##### BACKENDS INSTALLATION
+# install displayconfig-hwprobe.py script
+%__install -D -p -m0755 displayconfig/displayconfig-hwprobe.py \
+	%{buildroot}%{python_sitearch}/trinity-guidance-backends/displayconfig-hwprobe.py
+
+%__mv -f %{buildroot}%{_libdir}/python*/site-packages/ixf86misc.so %{buildroot}%{python_sitearch}
+%__mv -f %{buildroot}%{_libdir}/python*/site-packages/xf86misc.py* %{buildroot}%{python_sitearch}/trinity-guidance-backends
+%__mv -f %{buildroot}%{_datadir}/apps/guidance/MicroHAL.py %{buildroot}%{python_sitearch}/trinity-guidance-backends
+%__mv -f %{buildroot}%{_datadir}/apps/guidance/ScanPCI.py %{buildroot}%{python_sitearch}/trinity-guidance-backends
+%__mv -f %{buildroot}%{_datadir}/apps/guidance/infimport.py %{buildroot}%{python_sitearch}/trinity-guidance-backends
+%__mv -f %{buildroot}%{_datadir}/apps/guidance/displayconfigabstraction.py %{buildroot}%{python_sitearch}/trinity-guidance-backends
+%__mv -f %{buildroot}%{_datadir}/apps/guidance/displayconfig-restore.py %{buildroot}%{python_sitearch}/trinity-guidance-backends
+%__mv -f %{buildroot}%{_datadir}/apps/guidance/drivedetect.py %{buildroot}%{python_sitearch}/trinity-guidance-backends
+%__mv -f %{buildroot}%{_datadir}/apps/guidance/execwithcapture.py %{buildroot}%{python_sitearch}/trinity-guidance-backends
+%__mv -f %{buildroot}%{_datadir}/apps/guidance/wineread.py %{buildroot}%{python_sitearch}/trinity-guidance-backends
+%__mv -f %{buildroot}%{_datadir}/apps/guidance/winewrite.py %{buildroot}%{python_sitearch}/trinity-guidance-backends
+%__mv -f %{buildroot}%{_datadir}/apps/guidance/xorgconfig.py %{buildroot}%{python_sitearch}/trinity-guidance-backends
+
+%__rm -f %{buildroot}%{_datadir}/apps/guidance/MonitorsDB
+%__ln_s -f /usr/share/hwdata/MonitorsDB %{buildroot}%{_datadir}/apps/guidance/MonitorsDB
+
+
+
+##### POWERMANAGER INSTALLATION
+# install icon to right place
+%__install -D -p -m0644 kde/powermanager/pics/battery-charging-100.png \
+		%{buildroot}%{_datadir}/icons/hicolor/22x22/apps/power-manager.png
+%__install -D -p -m0644 kde/powermanager/pics/*.png \
+		%{buildroot}%{_datadir}/apps/guidance/pics/
+
+# install desktop file
+%__install -D -p -m0644 powermanager/guidance-power-manager.desktop \
+		%{buildroot}%{_datadir}/autostart/guidance-power-manager.desktop
+
+# copy python modules in PYSUPPORT_PATH
+%__mkdir_p %{buildroot}%{python_sitearch}/trinity-guidance-powermanager
+%__cp %{buildroot}%{python_sitearch}/trinity-guidance-backends/MicroHAL.py %{buildroot}%{python_sitearch}/trinity-guidance-powermanager
+%__mv -f %{buildroot}%{_datadir}/apps/guidance/guidance-power-manager.py %{buildroot}%{python_sitearch}/trinity-guidance-powermanager
+%__mv -f %{buildroot}%{_datadir}/apps/guidance/powermanage.py %{buildroot}%{python_sitearch}/trinity-guidance-powermanager
+%__mv -f %{buildroot}%{_datadir}/apps/guidance/gpmhelper.py %{buildroot}%{python_sitearch}/trinity-guidance-powermanager
+%__mv -f %{buildroot}%{_datadir}/apps/guidance/powermanager_ui.py %{buildroot}%{python_sitearch}/trinity-guidance-powermanager
+%__cp powermanager/guidance_power_manager_ui.py %{buildroot}%{python_sitearch}/trinity-guidance-powermanager
+%__cp powermanager/notify.py %{buildroot}%{python_sitearch}/trinity-guidance-powermanager
+%__cp powermanager/tooltip.py %{buildroot}%{python_sitearch}/trinity-guidance-powermanager
+
+# generate guidance-power-manager script
+cat <<EOF >%{buildroot}%{_bindir}/guidance-power-manager
+#!/bin/sh
+export PYTHONPATH=%{python_sitearch}/trinity-guidance-backends
+%{python_sitearch}/trinity-guidance-powermanager/guidance-power-manager.py &
+EOF
+chmod +x %{buildroot}%{_bindir}/guidance-power-manager
+
+# fix script-not-executable
+chmod 0755 %{buildroot}%{python_sitearch}/trinity-guidance-powermanager/powermanage.py
+chmod 0755 %{buildroot}%{python_sitearch}/trinity-guidance-powermanager/gpmhelper.py
+
+
+# Replace all '#!' calls to python with /usr/bin/python
+# and make them executable
+for i in `find %{buildroot} -type f`; do
+	sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python\1,' \
+		$i > $i.temp;
+	if cmp --quiet $i $i.temp; then
+		rm -f $i.temp;
+	else
+		mv -f $i.temp $i;
+		chmod 755 $i;
+		echo "fixed interpreter: $i";
+	fi;
+done
+
+find %{buildroot} -name "*.egg-info" -exec rm -f {} \;
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/sbin/ldconfig || :
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/sbin/ldconfig || :
+
+
+%files -f %{kdecomp}.lang
+%defattr(-,root,root,-)
+%doc ChangeLog COPYING README TODO
+%{_bindir}/displayconfig
+%{_bindir}/displayconfig-restore
+%{_bindir}/grubconfig
+%{_bindir}/mountconfig
+%{_bindir}/serviceconfig
+%{_bindir}/userconfig
+%{_bindir}/wineconfig
+%{_libdir}/*.so.*
+%{_libdir}/*.so
+%{_libdir}/*.la
+%{_libdir}/*.a
+%{_datadir}/apps/guidance
+%{python_sitearch}/trinity-guidance
+%{_datadir}/applications/kde/*.desktop
+%{tde_docdir}/HTML/en/guidance
+%{_datadir}/icons/crystalsvg/*/*/*.png
+%exclude %{_datadir}/icons/crystalsvg/*/*/*.svg
+#%{python_sitearch}/guidance-*.egg-info
+%exclude /etc/X11/Xsession.d/40guidance-displayconfig_restore
+
+%files -n trinity-guidance-backends
+%defattr(-,root,root,-)
+%{python_sitearch}/trinity-guidance-backends
+%{python_sitearch}/ixf86misc.so
+%{_datadir}/apps/guidance/vesamodes
+%{_datadir}/apps/guidance/extramodes
+%{_datadir}/apps/guidance/widescreenmodes
+%{_datadir}/apps/guidance/Cards+
+%{_datadir}/apps/guidance/pcitable
+%{_datadir}/apps/guidance/MonitorsDB
+
+
+%files powermanager
+%defattr(-,root,root,-)
+%{_bindir}/guidance-power-manager
+%{python_sitearch}/trinity-guidance-powermanager
+%{_datadir}/icons/hicolor/22x22/apps/power-manager.png
+%{_datadir}/apps/guidance/pics/ac-adapter.png
+%{_datadir}/apps/guidance/pics/battery*.png
+%{_datadir}/apps/guidance/pics/processor.png
+%{_datadir}/autostart/guidance-power-manager.desktop
+
+
+%Changelog
+* Thu Dec 01 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.0svn20080103-1
+- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kde-systemsettings/kde-settings-laptops.directory b/redhat/applications/kde-systemsettings/kde-settings-laptops.directory
new file mode 100644
index 000000000..687a493c4
--- /dev/null
+++ b/redhat/applications/kde-systemsettings/kde-settings-laptops.directory
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Laptops & Power
+Name[br]=Gremm
+Name[el]=Ισχύς
+Name[it]=Energia
+Name[mt]=Elettriku
+Name[nl]=Energie
+Name[pa]=ਊਰਜਾ(power)
+Name[pt_BR]=Energia
+Name[ru]=Управление питанием
+Name[sv]=Effekt
+Icon=energy
diff --git a/redhat/applications/kde-systemsettings/trinity-kde-systemsettings.spec b/redhat/applications/kde-systemsettings/trinity-kde-systemsettings.spec
new file mode 100644
index 000000000..d000bc753
--- /dev/null
+++ b/redhat/applications/kde-systemsettings/trinity-kde-systemsettings.spec
@@ -0,0 +1,120 @@
+# Default version for this component
+%define kdecomp kde-systemsettings
+%define version 0.0svn20070312
+%define release 1
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%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
+
+
+Name:		trinity-%{kdecomp}
+Summary:	easy to use control centre for TDE
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org
+
+Prefix:		%{_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+Source1:	kde-settings-laptops.directory
+
+BuildRequires: tqtinterface-devel
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: trinity-kdebase-devel
+BuildRequires: desktop-file-utils
+
+
+%description
+System preferences is a replacement for the TDE
+Control Centre with an improved user interface.
+
+
+%prep
+unset QTDIR; . /etc/profile.d/qt.sh
+%setup -q -n applications/%{kdecomp}
+
+# Ugly hack to modify TQT include directory inside autoconf files.
+# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
+%__sed -i "admin/acinclude.m4.in" \
+	-e "s,/usr/include/tqt,%{_includedir}/tqt,g" \
+	-e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g"
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%configure \
+	--disable-rpath \
+    --with-extra-includes=%{_includedir}/tqt \
+    --enable-closure
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+%__install -D -m 644 %{SOURCE1} %{buildroot}%{_datadir}/desktop-directories/
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{_datadir}/icons/crystalsvg || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
+
+%postun
+touch --no-create %{_datadir}/icons/crystalsvg || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
+
+
+%files
+%defattr(-,root,root,-)
+%doc README TODO
+%{_sysconfdir}/xdg/menus/applications-merged/system-settings-merge.menu
+%exclude %{_sysconfdir}/xdg/menus/system-settings.menu
+%{_bindir}/systemsettings
+%{_datadir}/applications/kde/audioencoding.desktop
+%{_datadir}/applications/kde/defaultapplication.desktop
+%{_datadir}/applications/kde/kcm_knetworkconfmodule_ss.desktop
+%{_datadir}/applications/kde/laptoppowermanagement.desktop
+%{_datadir}/applications/kde/medianotifications.desktop
+%{_datadir}/applications/kde/systemsettings.desktop
+%{_datadir}/apps/systemsettings/systemsettingsui.rc
+%{_datadir}/config/systemsettingsrc
+%{_datadir}/desktop-directories/*.directory
+%{_datadir}/icons/crystalsvg/*/apps/systemsettings.png
+
+%exclude %{_datadir}/applications/kde/kcmfontinst.desktop
+%exclude %{_datadir}/desktop-directories/kde-settings-power.directory
+%exclude %{_datadir}/desktop-directories/kde-settings-system.directory
+
+
+%Changelog
+* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-1
+- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+
diff --git a/redhat/applications/kio-locate/trinity-kio-locate.spec b/redhat/applications/kio-locate/trinity-kio-locate.spec
new file mode 100644
index 000000000..1ff1b119b
--- /dev/null
+++ b/redhat/applications/kio-locate/trinity-kio-locate.spec
@@ -0,0 +1,105 @@
+# Default version for this component
+%define kdecomp kio-locate
+%define version 0.4.5
+%define release 1
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%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
+
+
+Name:		trinity-%{kdecomp}
+Summary:	kio-slave for the locate command [Trinity]
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org
+
+Prefix:		%{_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+
+
+BuildRequires: tqtinterface-devel
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: trinity-kdebase-devel
+BuildRequires: desktop-file-utils
+
+BuildRequires:	scons
+
+%description
+Adds support for the "locate:" and "locater:"
+protocols to Konqueror and other KDE applications.
+
+This enables you to perform locate searches as you
+would in a terminal. The result is displayed just
+as a directory.
+
+
+%prep
+unset QTDIR; . /etc/profile.d/qt.sh
+%setup -q -n applications/%{kdecomp}
+
+# Ugly hack to modify TQT include directory inside SCONS files.
+# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
+%__sed -i admin/kde.py \
+  -e "s,/usr/include/tqt,%{_includedir}/tqt,g"
+
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+scons configure
+scons
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+scons install DESTDIR=%{buildroot}
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING TODO
+%{tde_libdir}/kio_locate.la
+%{tde_libdir}/kio_locate.so
+%{tde_docdir}/HTML/en/kio-locate/index.cache.bz2
+%{tde_docdir}/HTML/en/kio-locate/index.docbook
+%{tde_docdir}/HTML/en/kio-locate/screenshot.png
+%{_datadir}/services/locate.protocol
+%{_datadir}/services/locater.protocol
+%{_datadir}/services/rlocate.protocol
+%{_datadir}/services/searchproviders/locate.desktop
+
+
+%Changelog
+* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.5-1
+- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+
diff --git a/redhat/applications/kio-umountwrapper/trinity-kio-umountwrapper.spec b/redhat/applications/kio-umountwrapper/trinity-kio-umountwrapper.spec
new file mode 100644
index 000000000..172f54bf3
--- /dev/null
+++ b/redhat/applications/kio-umountwrapper/trinity-kio-umountwrapper.spec
@@ -0,0 +1,104 @@
+# Default version for this component
+%define kdecomp kio-umountwrapper
+%define version 0.2
+%define release 1
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%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
+
+
+Name:		trinity-%{kdecomp}
+Summary:	progress dialog for safely removing devices in Trinity.
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://frode.kde.no/misc/kio_umountwrapper/
+
+Prefix:		%{_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+
+
+BuildRequires: tqtinterface-devel
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: trinity-kdebase-devel
+BuildRequires: desktop-file-utils
+
+
+%description
+Wrapper around kio_media_mountwrapper.
+Provides a progress dialog for Safely Removing of devices in Trinity.
+
+
+
+%prep
+unset QTDIR; . /etc/profile.d/qt.sh
+%setup -q -n applications/%{kdecomp}
+
+# Ugly hack to modify TQT include directory inside autoconf files.
+# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
+%__sed -i "admin/acinclude.m4.in" \
+	-e "s,/usr/include/tqt,%{_includedir}/tqt,g" \
+	-e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g"
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%configure \
+	--disable-rpath \
+    --with-extra-includes=%{_includedir}/tqt \
+    --enable-closure
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%{_bindir}/kio_umountwrapper
+
+
+%Changelog
+* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.2-1
+- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+
diff --git a/redhat/applications/kmplayer/kmplayer-3.5.13-ftbfs.patch b/redhat/applications/kmplayer/kmplayer-3.5.13-ftbfs.patch
new file mode 100644
index 000000000..6b606e32b
--- /dev/null
+++ b/redhat/applications/kmplayer/kmplayer-3.5.13-ftbfs.patch
@@ -0,0 +1,10 @@
+--- kmplayer/src/Makefile.am.ORI	2011-12-03 23:22:01.601981533 +0100
++++ kmplayer/src/Makefile.am	2011-12-03 23:22:44.469655046 +0100
+@@ -58,6 +58,7 @@
+ kgstplayer_SOURCES= gstplayer.cpp
+ 
+ knpplayer_LDADD= $(LIBNSPR_LIBS)
++knpplayer_LDFLAGS= -lX11
+ knpplayer_SOURCES= npplayer.c
+ 
+ xdg_apps_DATA = kmplayer.desktop
diff --git a/redhat/applications/kmplayer/trinity-kmplayer.spec b/redhat/applications/kmplayer/trinity-kmplayer.spec
new file mode 100644
index 000000000..9b938fc7e
--- /dev/null
+++ b/redhat/applications/kmplayer/trinity-kmplayer.spec
@@ -0,0 +1,198 @@
+# Default version for this component
+%define kdecomp kmplayer
+%define version 0.10.0c
+%define release 1
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%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
+
+
+Name:		trinity-%{kdecomp}
+Summary:	media player for Trinity
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Multimedia
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://kmplayer.kde.org
+
+Prefix:		%{_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+Patch0:		kmplayer-3.5.13-ftbfs.patch
+
+BuildRequires: tqtinterface-devel
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: trinity-kdebase-devel
+BuildRequires: desktop-file-utils
+
+BuildRequires:	libXv-devel
+BuildRequires:	dbus-tqt-devel
+BuildRequires:	gstreamer-devel
+BuildRequires:	gstreamer-plugins-base-devel
+
+Requires:	%{name}-base
+
+%description
+A basic audio/video viewer application for Trinity.
+
+KMPlayer can:
+* play DVD (DVDNav only with the Xine player)
+* play VCD
+* let the backend players play from a pipe (read from stdin)
+* play from a TV device (experimental)
+* show backend player's console output
+* launch ffserver (only 0.4.8 works) when viewing from a v4l device
+* DCOP KMediaPlayer interface support
+* VDR viewer frontend (with *kxvplayer), configure VDR keys with standard KDE
+  shortcut configure window
+* Lots of configurable shortcuts. Highly recommended for the VDR keys
+  (if you have VDR) and volume increase/decrease
+
+
+%package base
+Group:			Applications/Multimedia
+Summary:		Base files for KMPlayer [Trinity]
+
+%description base
+Core files needed for KMPlayer.
+
+
+%package konq-plugins
+Group:			Applications/Multimedia
+Requires:		trinity-kmplayer-base, trinity-kdebase
+Summary:		KMPlayer plugin for KHTML/Konqueror [Trinity]
+
+%description konq-plugins
+This plugin enables audio/video playback inside konqueror, using Xine (with
+*kxineplayer) or GStreamer (with *kgstplayer), such as movie trailers, web
+tv or radio. It mimics QuickTime, MS Media Player and RealPlayer plugin
+browser plugins.
+
+
+%package doc
+Group:			Applications/Multimedia
+Requires:		%{name} = %{version}-%{release}
+Summary:		Handbook for KMPlayer [Trinity]
+
+%description doc
+Documention for KMPlayer, a basic audio/video viewer application for KDE.
+
+
+%prep
+unset QTDIR; . /etc/profile.d/qt.sh
+%setup -q -n applications/%{kdecomp}
+%patch0 -p1
+
+# Ugly hack to modify TQT include directory inside autoconf files.
+# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
+%__sed -i "admin/acinclude.m4.in" \
+	-e "s,/usr/include/tqt,%{_includedir}/tqt,g" \
+	-e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g"
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%configure \
+	--disable-rpath \
+    --with-extra-includes=%{_includedir}/tqt:%{_includedir}/dbus-1.0 \
+    --enable-closure
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+%find_lang %{kdecomp}
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%post base
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/sbin/ldconfig || :
+
+%postun base
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/sbin/ldconfig || :
+
+%post konq-plugins -p /sbin/ldconfig
+%postun konq-plugins  -p /sbin/ldconfig
+
+
+%files -f %{kdecomp}.lang
+%defattr(-,root,root,-)
+%doc README TODO
+%{_bindir}/kmplayer
+%{_bindir}/knpplayer
+%{_bindir}/kxvplayer
+%{_libdir}/libkdeinit_kmplayer.la
+%{_libdir}/libkdeinit_kmplayer.so
+%{tde_libdir}/kmplayer.la
+%{tde_libdir}/kmplayer.so
+%{_datadir}/applications/kde/kmplayer.desktop
+%{_datadir}/apps/kmplayer
+%exclude %{_datadir}/mimelnk/application/x-mplayer2.desktop
+%{_datadir}/services/kmplayer_part.desktop
+
+%files base
+%defattr(-,root,root,-)
+%{_libdir}/libkmplayercommon.la
+%{_libdir}/libkmplayercommon.so
+%{_bindir}/kgstplayer
+%{_bindir}/kxineplayer
+%{_datadir}/config/kmplayerrc
+%{_datadir}/apps/kmplayer/bookmarks.xml
+%{_datadir}/apps/kmplayer/noise.gif
+%{_datadir}/apps/kmplayer/pluginsinfo
+%{_datadir}/icons/hicolor/*/apps/kmplayer.png
+%{_datadir}/icons/hicolor/*/apps/kmplayer.svgz
+%{_datadir}/mimelnk/application/x-kmplayer.desktop
+%{_datadir}/mimelnk/video/x-ms-wmp.desktop
+
+
+%files doc
+%defattr(-,root,root,-)
+%{tde_docdir}/HTML/*/kmplayer
+
+%files konq-plugins
+%defattr(-,root,root,-)
+%{tde_libdir}/libkmplayerpart.la
+%{tde_libdir}/libkmplayerpart.so
+%{_datadir}/apps/kmplayer/kmplayerpartui.rc
+%{_datadir}/apps/kmplayer/pluginsinfo
+%{_datadir}/services/kmplayer_part.desktop
+
+
+%Changelog
+* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-1
+- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+
diff --git a/redhat/applications/kmyfirewall/trinity-kmyfirewall.spec b/redhat/applications/kmyfirewall/trinity-kmyfirewall.spec
new file mode 100644
index 000000000..54befc39d
--- /dev/null
+++ b/redhat/applications/kmyfirewall/trinity-kmyfirewall.spec
@@ -0,0 +1,179 @@
+# Default version for this component
+%define kdecomp kmyfirewall
+%define version 1.1.1
+%define release 1
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%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
+
+
+Name:		trinity-%{kdecomp}
+Summary:	iptables based firewall configuration tool for KDE [Trinity]
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+Prefix:		%{_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+
+
+BuildRequires: tqtinterface-devel
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: trinity-kdebase-devel
+BuildRequires: desktop-file-utils
+
+
+%description
+KMyFirewall attempts to make it easier to setup iptables based firewalls on
+Linux systems. It will be the right tool if you like to have a so called
+"Personal Firewall" running on your Linux box, but don't have the time and/or
+the interest to spend hours in front of the iptables manual just to setup a 
+Firewall that keeps the "bad" people out.
+
+There is also the possibility to save entire rule sets, so you only have to
+configure your rule set one time and then you can use it on several computers
+giving each of them a similar configuration (p.e. school networks, office,
+university etc.)
+
+%package devel
+Summary:		Development files for %{name}
+Group:			Development/Libraries
+Requires:		%{name} = %{version}-%{release}
+
+%description devel
+%{summary}
+
+
+%prep
+unset QTDIR; . /etc/profile.d/qt.sh
+%setup -q -n applications/%{kdecomp}
+
+# Ugly hack to modify TQT include directory inside autoconf files.
+# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
+%__sed -i admin/acinclude.m4.in \
+  -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \
+  -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g"
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%configure \
+	--disable-rpath \
+    --with-extra-includes=%{_includedir}/tqt \
+    --enable-closure
+
+%__make %{?_smp_mflags}
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/sbin/ldconfig || :
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/sbin/ldconfig || :
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING COPYING-DOCS README TODO
+%{_bindir}/kmyfirewall
+%{_libdir}/libkmfcore.so.*
+%{_libdir}/libkmfwidgets.so.*
+%{tde_libdir}/libkmfcompiler_ipt.la
+%{tde_libdir}/libkmfcompiler_ipt.so
+%{tde_libdir}/libkmfgenericinterfacepart.la
+%{tde_libdir}/libkmfgenericinterfacepart.so
+%{tde_libdir}/libkmfinstaller_linux.la
+%{tde_libdir}/libkmfinstaller_linux.so
+%{tde_libdir}/libkmfinstallerplugin.la
+%{tde_libdir}/libkmfinstallerplugin.so
+%{tde_libdir}/libkmfipteditorpart.la
+%{tde_libdir}/libkmfipteditorpart.so
+%{tde_libdir}/libkmfruleoptionedit_custom.la
+%{tde_libdir}/libkmfruleoptionedit_custom.so
+%{tde_libdir}/libkmfruleoptionedit_interface.la
+%{tde_libdir}/libkmfruleoptionedit_interface.so
+%{tde_libdir}/libkmfruleoptionedit_ip.la
+%{tde_libdir}/libkmfruleoptionedit_ip.so
+%{tde_libdir}/libkmfruleoptionedit_limit.la
+%{tde_libdir}/libkmfruleoptionedit_limit.so
+%{tde_libdir}/libkmfruleoptionedit_mac.la
+%{tde_libdir}/libkmfruleoptionedit_mac.so
+%{tde_libdir}/libkmfruleoptionedit_protocol.la
+%{tde_libdir}/libkmfruleoptionedit_protocol.so
+%{tde_libdir}/libkmfruleoptionedit_state.la
+%{tde_libdir}/libkmfruleoptionedit_state.so
+%{tde_libdir}/libkmfruleoptionedit_tos.la
+%{tde_libdir}/libkmfruleoptionedit_tos.so
+%{tde_libdir}/libkmfruletargetoptionedit_log.la
+%{tde_libdir}/libkmfruletargetoptionedit_log.so
+%{tde_libdir}/libkmfruletargetoptionedit_mark.la
+%{tde_libdir}/libkmfruletargetoptionedit_mark.so
+%{tde_libdir}/libkmfruletargetoptionedit_nat.la
+%{tde_libdir}/libkmfruletargetoptionedit_nat.so
+%{tde_libdir}/libkmfruletargetoptionedit_tos.la
+%{tde_libdir}/libkmfruletargetoptionedit_tos.so
+%{_datadir}/applications/kde/kmyfirewall.desktop
+%{_datadir}/apps/kmfgenericinterfacepart/kmfgenericinterfacepartui.rc
+%{_datadir}/apps/kmfipteditorpart/kmfipteditorpartui.rc
+%{_datadir}/apps/kmfsystray
+%{_datadir}/apps/kmyfirewall
+%{_datadir}/config.kcfg/kmfconfig.kcfg
+%{_datadir}/config/kmyfirewallrc
+%{tde_docdir}/HTML/en/kmyfirewall/common
+%{tde_docdir}/HTML/en/kmyfirewall/index.cache.bz2
+%{tde_docdir}/HTML/en/kmyfirewall/index.docbook
+%{_datadir}/icons/*/*/apps/kmyfirewall.png
+%{_datadir}/mimelnk/application/kmfgrs.desktop
+%{_datadir}/mimelnk/application/kmfnet.desktop
+%{_datadir}/mimelnk/application/kmfpkg.desktop
+%{_datadir}/mimelnk/application/kmfrs.desktop
+%{_datadir}/services/kmf*.desktop
+%{_datadir}/servicetypes/kmf*.desktop
+
+%files devel
+%{_includedir}/kmyfirewall
+%{_libdir}/libkmfcore.la
+%{_libdir}/libkmfcore.so
+%{_libdir}/libkmfwidgets.la
+%{_libdir}/libkmfwidgets.so
+
+%Changelog
+* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-1
+- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+
diff --git a/redhat/applications/knutclient/trinity-knutclient.spec b/redhat/applications/knutclient/trinity-knutclient.spec
new file mode 100644
index 000000000..be92e93df
--- /dev/null
+++ b/redhat/applications/knutclient/trinity-knutclient.spec
@@ -0,0 +1,112 @@
+# Default version for this component
+%define kdecomp knutclient
+%define version 0.9.5
+%define release 1
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%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
+
+
+Name:		trinity-%{kdecomp}
+Summary:	A KDE GUI that displays UPS statistics from NUT's upsd [Trinity]
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.knut.noveradsl.cz/knutclient/
+
+Prefix:		%{_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+
+
+BuildRequires: tqtinterface-devel
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: trinity-kdebase-devel
+BuildRequires: desktop-file-utils
+
+
+%description
+KNutClient monitors UPS statistics through the NUT (Network UPS Tools,
+http://www.networkupstools.org/) framework on Linux and other systems. This
+information, presented in a nice visual format, can be invaluable on
+stations using an UPS.
+
+
+%prep
+unset QTDIR; . /etc/profile.d/qt.sh
+%setup -q -n applications/%{kdecomp}
+
+# Ugly hack to modify TQT include directory inside autoconf files.
+# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
+%__sed -i "admin/acinclude.m4.in" \
+	-e "s,/usr/include/tqt,%{_includedir}/tqt,g" \
+	-e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g"
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%configure \
+	--disable-rpath \
+    --with-extra-includes=%{_includedir}/tqt \
+    --enable-closure
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+%find_lang %{kdecomp}
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+
+%files -f %{kdecomp}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%{_bindir}/knutclient
+%{_datadir}/applnk/Utilities/knutclient.desktop
+%{_datadir}/apps/knutclient/knutclientui.rc
+%{_datadir}/apps/knutclient
+%{tde_docdir}/HTML/cs/knutclient
+%{tde_docdir}/HTML/en/knutclient
+%{_datadir}/icons/*/*/apps/*.png
+
+
+%Changelog
+* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.5-1
+- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+
diff --git a/redhat/applications/kopete-otr/trinity-kopete-otr.spec b/redhat/applications/kopete-otr/trinity-kopete-otr.spec
new file mode 100644
index 000000000..390c5c14e
--- /dev/null
+++ b/redhat/applications/kopete-otr/trinity-kopete-otr.spec
@@ -0,0 +1,125 @@
+# Default version for this component
+%define kdecomp kopete-otr
+%define version 0.7
+%define release 1
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%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
+
+
+Name:		trinity-%{kdecomp}
+Summary:	Off-The-Record encryption for Kopete [Trinity]
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+Prefix:		%{_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+
+
+BuildRequires: tqtinterface-devel
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: trinity-kdebase-devel
+BuildRequires: desktop-file-utils
+
+# Kopete is provided by kdenetwork
+BuildRequires:	trinity-kdenetwork-devel
+Requires:		trinity-kdenetwork
+BuildRequires:	libotr-devel
+
+%description
+This plugin enables Off-The-Record encryption for the KDE instant
+messenger Kopete. Using this plugin you can encrypt chatsessions to other
+users with IM-Cients supporting the OTR encryption method.
+
+
+%prep
+unset QTDIR; . /etc/profile.d/qt.sh
+%setup -q -n applications/%{kdecomp}
+
+# Ugly hack to modify TQT include directory inside autoconf files.
+# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
+%__sed -i admin/acinclude.m4.in \
+	-e "s,/usr/include/tqt,%{_includedir}/tqt,g" \
+	-e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g"
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%configure \
+	--disable-rpath \
+    --with-extra-includes=%{_includedir}/tqt \
+    --enable-closure
+
+%__make %{?_smp_mflags}
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/sbin/ldconfig || :
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/sbin/ldconfig || :
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING README TODO
+%{_libdir}/libkotr.la
+%{_libdir}/libkotr.so
+%{_libdir}/libkotr.so.0
+%{_libdir}/libkotr.so.0.0.0
+%{tde_libdir}/kcm_kopete_otr.la
+%{tde_libdir}/kcm_kopete_otr.so
+%{tde_libdir}/kopete_otr.la
+%{tde_libdir}/kopete_otr.so
+%{_datadir}/apps/kopete_otr
+%{_datadir}/config.kcfg/kopete_otr.kcfg
+%{tde_docdir}/HTML/en/kopete_otr/common
+%{tde_docdir}/HTML/en/kopete_otr/index.cache.bz2
+%{tde_docdir}/HTML/en/kopete_otr/index.docbook
+%{_datadir}/icons/crystalsvg/16x16/apps/kopete_otr.png
+%{_datadir}/locale/de/LC_MESSAGES/kopete_otr.mo
+%{_datadir}/services/kconfiguredialog/kopete_otr_config.desktop
+%{_datadir}/services/kopete_otr.desktop
+
+
+%Changelog
+* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.7-1
+- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+
diff --git a/redhat/applications/krusader/trinity-krusader.spec b/redhat/applications/krusader/trinity-krusader.spec
new file mode 100644
index 000000000..eeb31a155
--- /dev/null
+++ b/redhat/applications/krusader/trinity-krusader.spec
@@ -0,0 +1,134 @@
+# Default version for this component
+%define kdecomp krusader
+%define version 1.90.0
+%define release 1
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%define _variant .opt
+%define _docdir %{_prefix}/share/doc
+%define _mandir %{_prefix}/share/man
+%endif
+
+# TDE 3.5.13 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}/kde
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/trinity
+
+
+Name:		trinity-%{kdecomp}
+Summary:	twin-panel (commander-style) file manager for KDE (and other desktops)
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+Prefix:    %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+
+
+BuildRequires: tqtinterface-devel
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: trinity-kdebase-devel
+BuildRequires: desktop-file-utils
+
+BuildRequires:	trinity-kdebindings-devel
+
+%description
+Krusader is a simple, easy, powerful, twin-panel (commander-style) file
+manager for KDE and other desktops, similar to Midnight Commander (C) or Total
+Commander (C).
+
+It provides all the file management features you could possibly want.
+
+Plus: extensive archive handling, mounted filesystem support, FTP,
+advanced search module, viewer/editor, directory synchronisation,
+file content comparisons, powerful batch renaming and much much more.
+
+It supports archive formats: ace, arj, bzip2, deb, iso, lha, rar, rpm, tar,
+zip and 7-zip.
+
+It handles KIOSlaves such as smb:// or fish://.
+
+Almost completely customizable, Krusader is very user friendly, fast and looks
+great on your desktop.
+
+
+%prep
+%setup -q -n applications/%{kdecomp}
+
+# Ugly hack to modify TQT include directory inside autoconf files.
+# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
+%__sed -i admin/acinclude.m4.in \
+  -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \
+  -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g"
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%configure \
+	--disable-rpath \
+    --with-extra-includes=%{_includedir}/tqt:%{tde_includedir}
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+%find_lang %{kdecomp}
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/sbin/ldconfig || :
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/sbin/ldconfig || :
+
+
+%files -f %{kdecomp}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING FAQ README TODO
+%{_bindir}/krusader
+%{tde_libdir}/kio_krarc.la
+%{tde_libdir}/kio_krarc.so
+%{tde_libdir}/kio_virt.la
+%{tde_libdir}/kio_virt.so
+%{_datadir}/applications/kde/krusader.desktop
+%{_datadir}/applications/kde/krusader_root-mode.desktop
+%{_datadir}/apps/krusader
+%{tde_docdir}/HTML/en/krusader
+%{tde_docdir}/HTML/ru/krusader
+%{_datadir}/icons/*/*/apps/*.png
+%{_datadir}/services/krarc.protocol
+%{_datadir}/services/virt.protocol
+%{_mandir}/man1/krusader.1
+
+
+%Changelog
+* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.90.0-1
+- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+
diff --git a/redhat/applications/ksystemlog/trinity-ksystemlog.spec b/redhat/applications/ksystemlog/trinity-ksystemlog.spec
new file mode 100644
index 000000000..cf7249b88
--- /dev/null
+++ b/redhat/applications/ksystemlog/trinity-ksystemlog.spec
@@ -0,0 +1,112 @@
+# Default version for this component
+%define kdecomp ksystemlog
+%define version 0.3.2
+%define release 1
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%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
+
+
+Name:		trinity-%{kdecomp}
+Summary:	system log viewer tool for Trinity
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/System
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://ksystemlog.forum-software.org
+
+Prefix:		%{_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+
+
+BuildRequires: tqtinterface-devel
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: trinity-kdebase-devel
+BuildRequires: desktop-file-utils
+
+
+%description
+ksystemlog is a system log viewer tool for Trinity.
+
+This program is developed for being used by beginner users, which don't know
+how to find information about their Linux system, and how the log files are in
+their computer. But it is also designed for advanced users, who want to
+quickly see problems occuring on their server.
+
+
+%prep
+unset QTDIR; . /etc/profile.d/qt.sh
+%setup -q -n applications/%{kdecomp}
+
+# Ugly hack to modify TQT include directory inside autoconf files.
+# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
+%__sed -i "admin/acinclude.m4.in" \
+	-e "s,/usr/include/tqt,%{_includedir}/tqt,g" \
+	-e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g"
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%configure \
+	--disable-rpath \
+    --with-extra-includes=%{_includedir}/tqt \
+    --enable-closure
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING README
+%{_bindir}/ksystemlog
+%{_datadir}/applnk/Utilities/ksystemlog.desktop
+%{_datadir}/apps/ksystemlog/ksystemlogui.rc
+%{_datadir}/config.kcfg/ksystemlog.kcfg
+%{_datadir}/icons/hicolor/*/apps/ksystemlog.png
+%{_datadir}/icons/hicolor/*/apps/ksystemlog.svgz
+
+
+%Changelog
+* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.3.2-1
+- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+
diff --git a/redhat/applications/kvkbd/trinity-kvkbd.spec b/redhat/applications/kvkbd/trinity-kvkbd.spec
new file mode 100644
index 000000000..e62bae222
--- /dev/null
+++ b/redhat/applications/kvkbd/trinity-kvkbd.spec
@@ -0,0 +1,107 @@
+# Default version for this component
+%define kdecomp kvkbd
+%define version 0.4.8
+%define release 1
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%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
+
+
+Name:		trinity-%{kdecomp}
+Summary:	Virtual keyboard for KDE [Trinity]
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/System
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://pan4os.info/main/index.php
+
+Prefix:		%{_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+
+BuildRequires: tqtinterface-devel
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: trinity-kdebase-devel
+BuildRequires: desktop-file-utils
+
+
+%description
+Virtual keyboard for KDE for use with accessibility. Application contains
+a systray widget as well as a dockwidget.
+
+
+%prep
+unset QTDIR; . /etc/profile.d/qt.sh
+%setup -q -n applications/%{kdecomp}
+
+# Ugly hack to modify TQT include directory inside autoconf files.
+# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
+%__sed -i "admin/acinclude.m4.in" \
+	-e "s,/usr/include/tqt,%{_includedir}/tqt,g" \
+	-e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g"
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%configure \
+	--disable-rpath \
+    --with-extra-includes=%{_includedir}/tqt \
+    --enable-closure
+    
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%{_bindir}/kvkbd
+%{_datadir}/applnk/Utilities/kvkbd.desktop
+%{_datadir}/apps/kvkbd/pics/dock.png
+%{_datadir}/apps/kvkbd/pics/tray.png
+%{_datadir}/icons/hicolor/16x16/apps/kvkbd.png
+%{_datadir}/icons/hicolor/32x32/apps/kvkbd.png
+
+
+%Changelog
+* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.8-1
+- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+
diff --git a/redhat/applications/potracegui/trinity-potracegui.spec b/redhat/applications/potracegui/trinity-potracegui.spec
new file mode 100644
index 000000000..51327f7e8
--- /dev/null
+++ b/redhat/applications/potracegui/trinity-potracegui.spec
@@ -0,0 +1,112 @@
+# Default version for this component
+%define kdecomp potracegui
+%define version 1.3
+%define release 1
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%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
+
+
+Name:		trinity-%{kdecomp}
+Summary:	KDE frontend for potrace [Trinity]
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Multimedia
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://potracegui.sourceforge.net
+
+Prefix:		%{_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+
+BuildRequires: tqtinterface-devel
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: trinity-kdebase-devel
+BuildRequires: desktop-file-utils
+
+
+%description
+A KDE interface for the commandline tracing tools potrace and/or autotrace. It
+supports drag and drop as well as all image types recognized by KDE, which are
+a lot more than the 4 recognized by the potrace commandline tool. Loading of
+remote files (web, ftp, ...) is also supported.  
+
+
+%prep
+unset QTDIR; . /etc/profile.d/qt.sh
+%setup -q -n applications/%{kdecomp}
+
+# Ugly hack to modify TQT include directory inside autoconf files.
+# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
+%__sed -i "admin/acinclude.m4.in" \
+	-e "s,/usr/include/tqt,%{_includedir}/tqt,g" \
+	-e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g"
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%configure \
+	--disable-rpath \
+    --with-extra-includes=%{_includedir}/tqt \
+    --enable-closure
+   
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%{_bindir}/potracegui
+%{_datadir}/applnk/Utilities/potracegui.desktop
+%{_datadir}/apps/potracegui/potraceguiui.rc
+%{tde_docdir}/HTML/en/potracegui/common
+%{tde_docdir}/HTML/en/potracegui/index.cache.bz2
+%{tde_docdir}/HTML/en/potracegui/index.docbook
+%{_datadir}/icons/hicolor/16x16/apps/potracegui.png
+%{_datadir}/icons/hicolor/32x32/apps/potracegui.png
+%lang(de) %{_datadir}/locale/de/LC_MESSAGES/potracegui.mo
+
+
+%Changelog
+* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.3-1
+- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+
diff --git a/redhat/applications/smartcardauth/smartcardauth-3.5.13-ftbfs.patch b/redhat/applications/smartcardauth/smartcardauth-3.5.13-ftbfs.patch
new file mode 100644
index 000000000..ce76facdc
--- /dev/null
+++ b/redhat/applications/smartcardauth/smartcardauth-3.5.13-ftbfs.patch
@@ -0,0 +1,10 @@
+--- smartcardauth/src/ckpasswd.c.ORI	2011-12-04 03:44:36.047000504 -0500
++++ smartcardauth/src/ckpasswd.c	2011-12-04 03:44:47.450745795 -0500
+@@ -30,6 +30,7 @@
+ #include <fcntl.h>
+ #include <pwd.h>
+ #include <grp.h>
++#include <getopt.h>
+ 
+ #define DB_DBM_HSEARCH 1
+ #include <db.h>
diff --git a/redhat/applications/smartcardauth/trinity-smartcardauth.spec b/redhat/applications/smartcardauth/trinity-smartcardauth.spec
new file mode 100644
index 000000000..f762703e0
--- /dev/null
+++ b/redhat/applications/smartcardauth/trinity-smartcardauth.spec
@@ -0,0 +1,131 @@
+# Default version for this component
+%define kdecomp smartcardauth
+%define version 1.0
+%define release 1
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%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
+
+
+Name:		trinity-%{kdecomp}
+Summary:	SmartCard Login and LUKS Decrypt, Setup Utility
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/System
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+Prefix:		%{_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+Patch0:		smartcardauth-3.5.13-ftbfs.patch
+
+BuildRequires: tqtinterface-devel
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: trinity-kdebase-devel
+BuildRequires: desktop-file-utils
+
+#BuildRequires:	perl-PAR-Packer
+Requires:		pcsc-perl
+
+%description
+This utility will allow you to set up your computer to accept a SmartCard as an authentication source for:
+- Your encrypted LUKS partition
+- TDE3.x, including automatic login, lock, and unlock features
+
+It is designed to work with any ISO 7816-1,2,3,4 compliant smartcard
+Examples of such cards are:
+- The Schlumberger MultiFlex
+- The ACS ACOS5 / ACOS6 series of cryptographic ISO 7816 cards
+
+If a card is chosen that has PKSC support, such as the ACOS cards, this utility can run
+simultaneously with the certificate reading program(s) to provide single sign on
+in addition to the PKCS certificate functionality
+
+
+%prep
+unset QTDIR; . /etc/profile.d/qt.sh
+%setup -q -n applications/%{kdecomp}
+%patch0 -p1
+
+# Ugly hack to modify TQT include directory inside autoconf files.
+# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
+%__sed -i "src/Makefile" \
+	-e "s,/usr/include/tqt,%{_includedir}/tqt,g" \
+	-e "s,/usr/include/qt3,${QTINC},g"
+
+%__sed -i "Makefile" \
+	-e "s|/usr/lib/perl5/Chipcard|/usr/lib64/perl5/vendor_perl/Chipcard|g"
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+./build_ckpasswd
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+
+%__install -D -m 755 scriptor_standalone.pl %{buildroot}%{_bindir}/scriptor.pl
+%__install -D -m 755 src/ckpasswd %{buildroot}%{_bindir}/smartauthckpasswd
+#%__install -D -m 755 src/ckpasswd %{buildroot}%{_bindir}/smartauthmon
+%__ln_s smartauthckpasswd %{buildroot}%{_bindir}/smartauthmon
+%__cp -Rp usr/*  %{buildroot}%{_prefix}
+
+%__mkdir_p %{buildroot}%{_sysconfdir}
+%__cp -Rp etc/* %{buildroot}%{_sysconfdir}
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+
+%files
+%defattr(-,root,root,-)
+%doc gpl.txt
+%{_sysconfdir}/init/smartauthlogin.conf
+%{_sysconfdir}/smartauth/smartauth.sh.in
+%{_sysconfdir}/smartauth/smartauthmon.sh.in
+%{_bindir}/cryptosmartcard.sh
+%{_bindir}/scriptor.pl
+%{_bindir}/setupcard.sh
+%{_bindir}/setupslavecard.sh
+%{_bindir}/smartauth.sh
+%{_bindir}/smartauthckpasswd
+%{_bindir}/smartauthmon
+%{_datadir}/applications/smartcardauth.desktop
+%{_datadir}/applications/smartcardrestrict.desktop
+%{_datadir}/icons/hicolor/16x16/apps/smartcardauth.png
+%{_datadir}/icons/hicolor/32x32/apps/smartcardauth.png
+%{_datadir}/initramfs-tools/hooks/cryptlukssc
+
+
+%Changelog
+* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-1
+- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+
diff --git a/redhat/applications/soundkonverter/trinity-soundkonverter.spec b/redhat/applications/soundkonverter/trinity-soundkonverter.spec
new file mode 100644
index 000000000..b9ff1ae15
--- /dev/null
+++ b/redhat/applications/soundkonverter/trinity-soundkonverter.spec
@@ -0,0 +1,157 @@
+# Default version for this component
+%define kdecomp soundkonverter
+%define version 0.3.8
+%define release 1
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%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
+
+
+Name:		trinity-%{kdecomp}
+Summary:	audio converter frontend for Trinity
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Application/Multimedia
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://potracegui.sourceforge.net
+
+Prefix:		%{_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+
+BuildRequires: tqtinterface-devel
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: trinity-kdebase-devel
+BuildRequires: desktop-file-utils
+
+
+%description
+soundKonverter is a frontend to various audio converters.
+
+The key features are:
+ - Audio conversion
+ - Replay Gain calculation
+ - CD ripping
+
+soundKonverter supports reading and writing tags for many formats, so the tags
+are preserved when converting files.
+
+It comes with an Amarok script.
+
+See 'soundkonverter-amarok' package for more informations.
+
+See README.Debian for more informations on supported formats.
+
+
+%package amarok
+Summary:		audio converter frontend for Trinity (Amarok script)
+Group:			Application/Multimedia
+Requires:		%{name} = %{version}-%{release}
+Requires:		trinity-amarok
+
+%description amarok
+Amarok script for soundKonverter. It allows you to easily transcode files when
+transferring them to your media device.
+
+See the 'soundkonverter-trinity' package for more information.
+
+
+%prep
+unset QTDIR; . /etc/profile.d/qt.sh
+%setup -q -n applications/%{kdecomp}
+
+# Ugly hack to modify TQT include directory inside autoconf files.
+# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
+%__sed -i "admin/acinclude.m4.in" \
+	-e "s,/usr/include/tqt,%{_includedir}/tqt,g" \
+	-e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g"
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%configure \
+	--disable-rpath \
+    --with-extra-includes=%{_includedir}/tqt:/usr/include/cdda \
+    --enable-closure
+   
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+%find_lang %{kdecomp}
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+
+%files -f %{kdecomp}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%{_bindir}/soundkonverter
+%{_bindir}/userscript.sh
+%{_datadir}/applications/kde/soundkonverter.desktop
+%{_datadir}/apps/konqueror/servicemenus/audiocd_extract_with_soundkonverter.desktop
+%{_datadir}/apps/soundkonverter
+%exclude %{_datadir}/apps/soundkonverter/amarokscript/README
+%exclude %{_datadir}/apps/soundkonverter/amarokscript/soundKonverter.rb
+%{tde_docdir}/HTML/en/soundkonverter/common
+%{tde_docdir}/HTML/en/soundkonverter/index.cache.bz2
+%{tde_docdir}/HTML/en/soundkonverter/index.docbook
+%{_datadir}/icons/hicolor/*/apps/soundkonverter*.png
+%{_datadir}/mimelnk/application/x-la.soundkonverter.desktop
+%{_datadir}/mimelnk/application/x-ofc.soundkonverter.desktop
+%{_datadir}/mimelnk/application/x-ofr.soundkonverter.desktop
+%{_datadir}/mimelnk/application/x-ofs.soundkonverter.desktop
+%{_datadir}/mimelnk/application/x-shorten.soundkonverter.desktop
+%{_datadir}/mimelnk/audio/amr.soundkonverter.desktop
+%{_datadir}/mimelnk/audio/x-ape.soundkonverter.desktop
+%{_datadir}/mimelnk/audio/x-bonk.soundkonverter.desktop
+%{_datadir}/mimelnk/audio/x-pac.soundkonverter.desktop
+%{_datadir}/mimelnk/audio/x-tta.soundkonverter.desktop
+%{_datadir}/mimelnk/audio/x-wavpack-correction.soundkonverter.desktop
+%{_datadir}/mimelnk/audio/x-wavpack.soundkonverter.desktop
+%{_datadir}/mimelnk/video/x-flv.soundkonverter.desktop
+
+%files amarok
+%defattr(-,root,root,-)
+%{_datadir}/apps/soundkonverter/amarokscript/README
+%{_datadir}/apps/soundkonverter/amarokscript/soundKonverter.rb
+
+
+%Changelog
+* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.3.8-1
+- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+
diff --git a/redhat/components.txt b/redhat/components.txt
index d4d16049a..620d7ef06 100644
--- a/redhat/components.txt
+++ b/redhat/components.txt
@@ -2,6 +2,8 @@ libraries/libkdcraw
 libraries/libkexiv2
 libraries/libkipi
 libraries/libksquirrel
+libraries/python-trinity
+libraries/pykdeextensions
 qt3
 dependencies/libcaldav
 dependencies/libcarddav
@@ -9,8 +11,7 @@ dependencies/tqtinterface
 dependencies/dbus-tqt
 dependencies/dbus-1-tqt
 dependencies/arts
-#trinity-settings
-trinity-live
+dependencies/tqscintilla
 kdelibs
 kdebase
 kdebindings
@@ -30,10 +31,12 @@ kdeedu
 kdeaddons
 kdewebdev
 kde-i18n
+extras/kasablanca
 extras/ksensors
 extras/libkarma
 #extras/libkexif
 extras/trinity-desktop
+extras/trinity-live
 applications/k3b
 applications/abakus
 applications/dolphin
@@ -99,3 +102,18 @@ applications/kgtk-qt3
 applications/kima
 applications/kdesvn
 applications/kde-guidance
+applications/krusader
+applications/smartcardauth
+applications/kmyfirewall
+applications/kopete-otr
+applications/kaffeine-mozilla
+applications/ksystemlog
+applications/kio-locate
+#applications/konstruct
+applications/kio-umountwrapper
+applications/knutclient
+applications/kde-systemsettings
+applications/kmplayer
+applications/kvkbd
+applications/potracegui
+applications/soundkonverter
diff --git a/redhat/dependencies/tqscintilla/tqscintilla-ftbfs.patch b/redhat/dependencies/tqscintilla/tqscintilla-ftbfs.patch
new file mode 100644
index 000000000..b4bb5b08e
--- /dev/null
+++ b/redhat/dependencies/tqscintilla/tqscintilla-ftbfs.patch
@@ -0,0 +1,614 @@
+--- tqscintilla-master/qt/qextscintillacommandset.cpp.ORI	2011-12-04 14:33:29.344201345 +0100
++++ tqscintilla-master/qt/qextscintillacommandset.cpp	2011-12-04 14:35:03.180233103 +0100
+@@ -43,525 +43,525 @@
+ 			QextScintillaBase::SCI_LINEDOWN,
+ 			TQt::Key_Down,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Move down one line")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_LINEDOWNEXTEND,
+ 			TQt::Key_Down | TQt::SHIFT,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Extend selection down one line")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_LINESCROLLDOWN,
+ 			TQt::Key_Down | TQt::CTRL,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Scroll view down one line")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_LINEDOWNRECTEXTEND,
+ 			TQt::Key_Down | TQt::ALT | TQt::SHIFT,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Extend rectangular selection down one line")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_LINEUP,
+ 			TQt::Key_Up,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Move up one line")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_LINEUPEXTEND,
+ 			TQt::Key_Up | TQt::SHIFT,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Extend selection up one line")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_LINESCROLLUP,
+ 			TQt::Key_Up | TQt::CTRL,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Scroll view up one line")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_LINEUPRECTEXTEND,
+ 			TQt::Key_Up | TQt::ALT | TQt::SHIFT,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Extend rectangular selection up one line")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_PARAUP,
+ 			TQt::Key_BracketLeft | TQt::CTRL,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Move up one paragraph")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_PARAUPEXTEND,
+ 			TQt::Key_BracketLeft | TQt::CTRL | TQt::SHIFT,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Extend selection up one paragraph")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_PARADOWN,
+ 			TQt::Key_BracketRight | TQt::CTRL,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Move down one paragraph")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_PARADOWNEXTEND,
+ 			TQt::Key_BracketRight | TQt::CTRL | TQt::SHIFT,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Extend selection down one paragraph")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_CHARLEFT,
+ 			TQt::Key_Left,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Move left one character")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_CHARLEFTEXTEND,
+ 			TQt::Key_Left | TQt::SHIFT,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Extend selection left one character")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_WORDLEFT,
+ 			TQt::Key_Left | TQt::CTRL,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Move left one word")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_WORDLEFTEXTEND,
+ 			TQt::Key_Left | TQt::SHIFT | TQt::CTRL,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Extend selection left one word")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_CHARLEFTRECTEXTEND,
+ 			TQt::Key_Left | TQt::ALT | TQt::SHIFT,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Extend rectangular selection left one character")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_CHARRIGHT,
+ 			TQt::Key_Right,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Move right one character")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_CHARRIGHTEXTEND,
+ 			TQt::Key_Right | TQt::SHIFT,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Extend selection right one character")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_WORDRIGHT,
+ 			TQt::Key_Right | TQt::CTRL,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Move right one word")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_WORDRIGHTEXTEND,
+ 			TQt::Key_Right | TQt::CTRL | TQt::SHIFT,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Extend selection right one word")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_CHARRIGHTRECTEXTEND,
+ 			TQt::Key_Right | TQt::ALT | TQt::SHIFT,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Extend rectangular selection right one character")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_WORDPARTLEFT,
+ 			TQt::Key_Slash | TQt::CTRL,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Move left one word part")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_WORDPARTLEFTEXTEND,
+ 			TQt::Key_Slash | TQt::CTRL | TQt::SHIFT,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Extend selection left one word part")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_WORDPARTRIGHT,
+ 			TQt::Key_Backslash | TQt::CTRL,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Move right one word part")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_WORDPARTRIGHTEXTEND,
+ 			TQt::Key_Backslash | TQt::CTRL | TQt::SHIFT,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Extend selection right one word part")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_VCHOME,
+ 			TQt::Key_Home,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Move to first visible character in line")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_VCHOMEEXTEND,
+ 			TQt::Key_Home | TQt::SHIFT,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Extend selection to first visible character in line")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_DOCUMENTSTART,
+ 			TQt::Key_Home | TQt::CTRL,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Move to start of text")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_DOCUMENTSTARTEXTEND,
+ 			TQt::Key_Home | TQt::CTRL | TQt::SHIFT,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Extend selection to start of text")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_HOMEDISPLAY,
+ 			TQt::Key_Home | TQt::ALT,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Move to start of displayed line")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_HOMEDISPLAYEXTEND,
+ 			0,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Extend selection to start of line")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_VCHOMERECTEXTEND,
+ 			TQt::Key_Home | TQt::ALT | TQt::SHIFT,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Extend rectangular selection to first visible character in line")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_LINEEND,
+ 			TQt::Key_End,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Move to end of line")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_LINEENDEXTEND,
+ 			TQt::Key_End | TQt::SHIFT,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Extend selection to end of line")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_DOCUMENTEND,
+ 			TQt::Key_End | TQt::CTRL,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Move to end of text")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_DOCUMENTENDEXTEND,
+ 			TQt::Key_End | TQt::CTRL | TQt::SHIFT,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Extend selection to end of text")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_LINEENDDISPLAY,
+ 			TQt::Key_End | TQt::ALT,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Move to end of displayed line")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_LINEENDDISPLAYEXTEND,
+ 			0,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Extend selection to end of displayed line")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_LINEENDRECTEXTEND,
+ 			TQt::Key_End | TQt::ALT | TQt::SHIFT,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Extend rectangular selection to end of line")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_PAGEUP,
+ 			TQt::Key_Prior,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Move up one page")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_PAGEUPEXTEND,
+ 			TQt::Key_Prior | TQt::SHIFT,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Extend selection up one page")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_PAGEUPRECTEXTEND,
+ 			TQt::Key_Prior | TQt::ALT | TQt::SHIFT,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Extend rectangular selection up one page")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_PAGEDOWN,
+ 			TQt::Key_Next,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Move down one page")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_PAGEDOWNEXTEND,
+ 			TQt::Key_Next | TQt::SHIFT,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Extend selection down one page")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_PAGEDOWNRECTEXTEND,
+ 			TQt::Key_Next | TQt::ALT | TQt::SHIFT,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Extend rectangular selection down one page")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_CLEAR,
+ 			TQt::Key_Delete,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Delete current character")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_CUT,
+ 			TQt::Key_X | TQt::CTRL,
+ 			TQt::Key_Delete | TQt::SHIFT,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Cut selection")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_DELWORDRIGHT,
+ 			TQt::Key_Delete | TQt::CTRL,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Delete word to right")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_DELLINERIGHT,
+ 			TQt::Key_Delete | TQt::CTRL | TQt::SHIFT,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Delete line to right")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_EDITTOGGLEOVERTYPE,
+ 			TQt::Key_Insert,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Toggle insert/overtype")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_PASTE,
+ 			TQt::Key_V | TQt::CTRL,
+ 			TQt::Key_Insert | TQt::SHIFT,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Paste")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_COPY,
+ 			TQt::Key_C | TQt::CTRL,
+ 			TQt::Key_Insert | TQt::CTRL,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Copy selection")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_CANCEL,
+ 			TQt::Key_Escape,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Cancel")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_DELETEBACK,
+ 			TQt::Key_Backspace,
+ 			TQt::Key_Backspace | TQt::SHIFT,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Delete previous character")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_DELWORDLEFT,
+ 			TQt::Key_Backspace | TQt::CTRL,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Delete word to left")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_UNDO,
+ 			TQt::Key_Z | TQt::CTRL,
+ 			TQt::Key_Backspace | TQt::ALT,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Undo the last command")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_DELLINELEFT,
+ 			TQt::Key_Backspace | TQt::CTRL | TQt::SHIFT,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Delete line to left")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_REDO,
+ 			TQt::Key_Y | TQt::CTRL,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Redo last command")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_SELECTALL,
+ 			TQt::Key_A | TQt::CTRL,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Select all text")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_TAB,
+ 			TQt::Key_Tab,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Indent one level")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_BACKTAB,
+ 			TQt::Key_Tab | TQt::SHIFT,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Move back one indentation level")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_NEWLINE,
+ 			TQt::Key_Return,
+ 			TQt::Key_Return | TQt::SHIFT,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Insert new line")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_ZOOMIN,
+ 			TQt::Key_Plus | TQt::CTRL,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Zoom in")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_ZOOMOUT,
+ 			TQt::Key_Minus | TQt::CTRL,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Zoom out")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_SETZOOM,
+ 			0,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Set zoom")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_FORMFEED,
+ 			0,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Formfeed")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_LINECUT,
+ 			TQt::Key_L | TQt::CTRL,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Cut current line")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_LINEDELETE,
+ 			TQt::Key_L | TQt::CTRL | TQt::SHIFT,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Delete current line")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_LINECOPY,
+ 			TQt::Key_T | TQt::CTRL | TQt::SHIFT,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Copy current line")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_LINETRANSPOSE,
+ 			TQt::Key_T | TQt::CTRL,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Swap current and previous lines")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_SELECTIONDUPLICATE,
+ 			TQt::Key_D | TQt::CTRL,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Duplicate selection")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_LOWERCASE,
+ 			TQt::Key_U | TQt::CTRL,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Convert selection to lower case")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_UPPERCASE,
+ 			TQt::Key_U | TQt::CTRL | TQt::SHIFT,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Convert selection to upper case")
+ 		},
+ 		{
+ 			QextScintillaBase::SCI_DELETEBACKNOTLINE,
+ 			0,
+ 			0,
+-			TQT_TRANSLATE_NOOP("QextScintillaCommand",
++			QT_TRANSLATE_NOOP("QextScintillaCommand",
+ 				"Delete previous character if not at line start")
+ 		},
+ 	};
+--- tqscintilla-master/designer/designer.pro.ORI	2011-12-04 14:41:08.714487484 +0100
++++ tqscintilla-master/designer/designer.pro	2011-12-04 14:41:21.248222899 +0100
+@@ -5,7 +5,7 @@
+ TARGET = qscintillaplugin
+ # DESTDIR = $(QTDIR)/plugins/designer
+ INCLUDEPATH = ../qt /usr/include/tqt
+-LIBPATH += ../tmplib
++LIBPATH += ../tmplib ../qt
+ CONFIG += qt warn_on release plugin
+ 
+ SOURCES += qscintillaplugin.cpp
diff --git a/redhat/dependencies/tqscintilla/trinity-tqscintilla.spec b/redhat/dependencies/tqscintilla/trinity-tqscintilla.spec
new file mode 100644
index 000000000..3742b868f
--- /dev/null
+++ b/redhat/dependencies/tqscintilla/trinity-tqscintilla.spec
@@ -0,0 +1,233 @@
+# Default version for this component
+%define kdecomp libtqscintilla
+%define version 1.7.1
+%define release 1
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%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
+
+%global qtdir	%(qmake -query QT_INSTALL_PREFIX)
+%global qtdata	%(qmake -query QT_INSTALL_DATA)
+%global qtinc	%{qtdir}/include
+%global qtlib	%{qtdir}/lib
+
+
+Name:		%{kdecomp}
+Summary:	TQt source code editing component based on Scintilla
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Development/Tools
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+Url:		http://www.riverbankcomputing.co.uk/qscintilla/
+
+Prefix:		%{_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+# This file is a GIT snapshot
+Source0:	tqscintilla-master.tar.gz
+
+# Fix FTBFS
+Patch0:		tqscintilla-ftbfs.patch
+
+BuildRequires:	tqtinterface-devel
+BuildRequires:	trinity-kdelibs-devel
+BuildRequires:	trinity-kdebase-devel
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+%description
+Scintilla is a free source code editing component. It has features found
+in standard editing components, as well as features especially useful
+when editing and debugging source code.
+
+TQScintilla is a port or Scintilla to the TQt GUI toolkit.
+
+
+%package designer
+Summary:        TQScintilla designer plugin 
+Group:          Development/Tools
+Requires:       %{name} = %{version}-%{release}
+Requires:       qt-designer
+%description designer
+%{summary}.
+
+%package devel
+Summary:        TQScintilla Development Files
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       qt-devel 
+%description devel
+%{summary}.
+
+%package doc
+Summary:        TQScintilla Documentation
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+%description doc
+%{summary}.
+
+%prep
+%setup -q -n tqscintilla-master
+%patch0 -p1
+
+# Ugly hack to modify TQT include directory inside autoconf files.
+# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
+%__sed -i */*.pro \
+	-e "s|/usr/include/tqt|%{_includedir}/tqt|g"
+
+( cd qt; qmake "DESTDIR=$PWD/../tmplib" )
+( cd designer; qmake )
+
+
+%build
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%__make %{?_smp_mflags} -C qt
+%__make %{?_smp_mflags} -C designer
+
+
+%install
+%__rm -rf $RPM_BUILD_ROOT
+
+# Installs the QT part
+%__make INSTALL_ROOT=$RPM_BUILD_ROOT -C qt install
+
+# Installs supplementary headers
+for i in include/*.h; do
+	%__install -D -m 644 $i %{buildroot}${QTINC}/private/${i##*/}
+done
+
+# Installs the HTML documentation
+for i in doc/html/*; do
+	%__install -D -m 644 $i %{buildroot}%{tde_docdir}/HTML/en/%{name}/${i##*/}
+done
+
+# Installs the Designer plugin
+for i in designer/*.so; do
+	%__install -D -m 644 $i %{buildroot}${QTDIR}/plugins/designer/${i##*/}
+done
+
+# Installs libraries
+%__mkdir_p %{buildroot}%{_libdir}
+%__mv -f tmplib/* %{buildroot}%{_libdir}
+
+%clean
+%__rm -rf $RPM_BUILD_ROOT
+
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+
+%files
+%defattr(-,root,root,-)
+%doc ChangeLog LICENSE NEWS README
+%{_libdir}/*.so.*
+%{qtdir}/translations/*.qm
+
+%files designer
+%defattr(-,root,root,-)
+%{qtdir}/plugins/designer/*.so
+
+%files devel
+%defattr(-,root,root,-)
+%doc doc/html doc/Scintilla example
+%{qtinc}/*.h
+%{qtinc}/private/*.h
+%{_libdir}/*.so
+
+%files doc
+%defattr(-,root,root,-)
+%{tde_docdir}/HTML/en/%{name}
+
+%changelog
+* Sat Aug 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 1.7.1-3
+- respin (BuildID)
+
+* Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 1.7.1-2
+- License: GPLv2+
+
+* Mon Dec 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 1.7.1-1
+- QScintilla-1.71-gpl-1.7.1
+
+* Thu Nov 09 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 1.7-1
+- QScintilla1-1.71-gpl-1.7 (#214192)
+
+* Sun Sep 03 2006 Konstantin Ryabitsev <icon@fedoraproject.org> - 1.6-3.3
+- FC6 rebuild.
+- Export flags.
+
+* Mon Feb 13 2006 Konstantin Ryabitsev <icon@fedoraproject.org> - 1.6-3.2
+- FC5 Rebuild.
+
+* Tue Jan 31 2006 Konstantin Ryabitsev <icon@fedoraproject.org> - 1.6-3.1
+- Rebuild for FC5.
+
+* Wed Sep 14 2005 Konstantin Ryabitsev <icon@linux.duke.edu> - 1.6-3
+- Fix permissions in prep, not in install.
+
+* Tue Sep 13 2005 Konstantin Ryabitsev <icon@linux.duke.edu> - 1.6-2
+- Fix permissions on doc files to be 0644.
+
+* Sun Sep 11 2005 Konstantin Ryabitsev <icon@linux.duke.edu> 1.6-1
+- Update to 1.65-gpl-1.6
+- Use the patch from Aurelien Bompard to build sanely in buildroot
+- Include docs and examples for the -devel package
+
+* Sat Aug 27 2005 Konstantin Ryabitsev <icon@linux.duke.edu> 1.5.1-1
+- Adapt for Fedora Extras
+- Drop 0-Epoch
+- Make specfile simpler
+- Move .so to devel
+
+* Mon Mar 09 2005 Rex Dieter 0:1.5.1-0.0.kde
+- 1.5.1
+
+* Thu Sep 16 2004 Rex Dieter <rexdieter at sf.net> 0:1.4-0.1.kde
+- updated designer-incpath patch: don't require an already installed
+  qscintilla-devel
+- BuildConflicts: qscintilla-devel != %%version
+
+* Thu Sep 16 2004 Rex Dieter <rexdieter at sf.net> 0:1.4-0.0.kde
+- 1.4
+- include designer plugin
+- Prereq: %%qtdir
+
+* Fri May 28 2004 Rex Dieter <rexdieter at sf.net> 0:1.3-0.fdr.0
+- 1.3
+
+* Thu Mar 11 2004 Rex Dieter <rexdieter at sf.net> 0:1.2-0.fdr.6
+- dynamically determine version for qt dependancy.
+
+* Wed Mar 10 2004 Rex Dieter <rexdieter at sf.net> 0:1.2-0.fdr.5
+- (re)build against qt-3.3.1
+
+* Wed Dec 03 2003 Rex Dieter <rexdieter at sf.net> 0:1.2-0.fdr.4
+- remove extraneous macros
+- (re)build against qt-3.2.3
+
+* Mon Nov 10 2003 Rex Dieter <rexdieter at sf.net> 0:1.2-0.fdr.3
+- (re)build against qt-3.2.2
+
+* Wed Sep 17 2003 Rex Dieter <rexdieter at sf.net> 0:1.2-0.fdr.2
+- use Epoch's in Requires
+
+* Tue Aug 19 2003 Rex Dieter <rexdieter at sf.net> 0:1.2-0.fdr.1
+- 1.2
+
diff --git a/redhat/extras/kasablanca/kasablanca-0.4.0.2-dt.patch b/redhat/extras/kasablanca/kasablanca-0.4.0.2-dt.patch
new file mode 100644
index 000000000..3a7ccd17f
--- /dev/null
+++ b/redhat/extras/kasablanca/kasablanca-0.4.0.2-dt.patch
@@ -0,0 +1,30 @@
+--- kasablanca-0.4.0.2/src/kasablanca.desktop.dt	2004-03-22 12:58:39.000000000 -0600
++++ kasablanca-0.4.0.2/src/kasablanca.desktop	2006-01-19 09:48:07.000000000 -0600
+@@ -1,26 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=kasablanca
+-Name[xx]=xxkasablancaxx
++GenericName=FTP Client
+ Exec=kasablanca
+ Icon=kasablanca
+ Type=Application
+-Comment=A simple KDE Application
+-Comment[ca]=Una simple aplicació KDE
+-Comment[da]=Et simpelt KDE program
+-Comment[de]=Eine einfache KDE-Anwendung
+-Comment[el]=Μια απλή εφαρμογή του KDE
+-Comment[es]=Una aplicación de KDE sencilla
+-Comment[et]=Lihtne KDE rakendus
+-Comment[fr]=Une application simple pour KDE.
+-Comment[hu]=Egyszerű KDE-alkalmazás
+-Comment[it]=Una semplice applicazione KDE
+-Comment[nl]=Een eenvoudige KDE-toepassing
+-Comment[pt]=Uma aplicação KDE simples
+-Comment[pt_BR]=Um simples Aplicativo do KDE
+-Comment[ru]=Простое приложение KDE
+-Comment[sl]=Preprost program za KDE
+-Comment[sr]=Једноставан KDE програм
+-Comment[sv]=Ett enkelt KDE-program
+-Comment[xx]=xxA simple KDE Applicationxx
+-Comment[zh_CN]=一个简单的KDE应用程序
diff --git a/redhat/extras/kasablanca/kasablanca-0.4.0.2-ftbfs.patch b/redhat/extras/kasablanca/kasablanca-0.4.0.2-ftbfs.patch
new file mode 100644
index 000000000..6596d894a
--- /dev/null
+++ b/redhat/extras/kasablanca/kasablanca-0.4.0.2-ftbfs.patch
@@ -0,0 +1,11 @@
+--- kasablanca-0.4.0.2/src/Makefile.am.ORI	2011-12-04 15:42:39.245402912 +0100
++++ kasablanca-0.4.0.2/src/Makefile.am	2011-12-04 15:42:45.744265760 +0100
+@@ -22,7 +22,7 @@
+ # the application source, library search path, and link libraries
+ kasablanca_SOURCES = main.cpp kasablanca.cpp bookmarkdialog.cpp customconnectdialog.cpp fileexistsdialog.cpp kbitem.cpp Q_bookmarkdialog.ui Q_fileexistsdialog.ui Q_mainwindow.ui eventhandler.cpp ftpthread.cpp ftplib.cpp ftpsession.cpp kbfileinfo.cpp kbdirinfo.cpp kbdir.cpp kbfile.cpp kbtransferitem.cpp kbtransferdir.cpp kbtransferfile.cpp kbconfig.kcfgc Q_colorspreferencesdialog.ui Q_generalpreferencesdialog.ui kbtaskview.cpp Q_userinterfacepreferencesdialog.ui kbbookmarkitem.cpp kbsiteinfo.cpp Q_customconnectdialog.ui Q_importdialog.ui importdialog.cpp kbstatustip.cpp
+ kasablanca_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+-kasablanca_LDADD = -lssl $(LIB_KDEUI)
++kasablanca_LDADD = -lssl $(LIB_KDEUI) -lcrypto
+ 
+ # this is where the desktop file will go 
+ shelldesktopdir = $(kde_appsdir)/Utilities
diff --git a/redhat/extras/kasablanca/kasablanca-0.4.0.2.tar.gz b/redhat/extras/kasablanca/kasablanca-0.4.0.2.tar.gz
new file mode 100644
index 000000000..1175e6db3
--- /dev/null
+++ b/redhat/extras/kasablanca/kasablanca-0.4.0.2.tar.gz
diff --git a/redhat/extras/kasablanca/kasablanca-autotools.patch b/redhat/extras/kasablanca/kasablanca-autotools.patch
new file mode 100644
index 000000000..0eae8f419
--- /dev/null
+++ b/redhat/extras/kasablanca/kasablanca-autotools.patch
@@ -0,0 +1,111 @@
+--- kasablanca-0.4.0.2/admin/cvs.sh.ORI	2011-12-04 15:24:44.405943353 +0100
++++ kasablanca-0.4.0.2/admin/cvs.sh	2011-12-04 15:33:50.829581434 +0100
+@@ -30,7 +30,7 @@
+ required_autoconf_version="2.53 or newer"
+ AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
+ case $AUTOCONF_VERSION in
+-  Autoconf*2.5* | autoconf*2.5* ) : ;;
++  Autoconf*2.5* | autoconf*2.5* | [Aa]utoconf*2.6* ) : ;;
+   "" )
+     echo "*** AUTOCONF NOT FOUND!."
+     echo "*** KDE requires autoconf $required_autoconf_version"
+@@ -45,7 +45,7 @@
+  
+ AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
+ case $AUTOHEADER_VERSION in
+-  Autoconf*2.5* | autoheader*2.5* ) : ;;
++  Autoconf*2.5* | autoheader*2.5* | *Autoconf*2.6* ) : ;;
+   "" )
+     echo "*** AUTOHEADER NOT FOUND!."
+     echo "*** KDE requires autoheader $required_autoconf_version"
+@@ -66,7 +66,7 @@
+     echo "*** KDE requires automake $required_automake_version"
+     exit 1
+     ;;
+-  automake*1.6.* | automake*1.7* | automake*1.8* ) : ;;
++  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11* ) : ;;
+   "" )
+     echo "*** AUTOMAKE NOT FOUND!."
+     echo "*** KDE requires automake $required_automake_version"
+--- kasablanca-0.4.0.2/admin/acinclude.m4.in.ORI	2011-12-04 15:37:05.013464315 +0100
++++ kasablanca-0.4.0.2/admin/acinclude.m4.in	2011-12-04 15:40:40.722904947 +0100
+@@ -468,14 +468,14 @@
+     if test "$kde_qtver" = "2"; then
+       kde_moduledir='\${libdir}/kde2'
+     else
+-      kde_moduledir='\${libdir}/kde3'
++      kde_moduledir='\${libdir}/trinity'
+     fi
+   fi
+   if test -z "$kde_styledir"; then
+-    kde_styledir='\${libdir}/kde3/plugins/styles'
++    kde_styledir='\${libdir}/trinity/plugins/styles'
+   fi
+   if test -z "$kde_widgetdir"; then
+-    kde_widgetdir='\${libdir}/kde3/plugins/designer'
++    kde_widgetdir='\${libdir}/trinity/plugins/designer'
+   fi
+   if test -z "$xdg_appsdir"; then
+     xdg_appsdir='\${datadir}/applications/kde'
+@@ -542,7 +542,7 @@
+     )
+     AM_CONDITIONAL(include_ARTS, test "$build_arts" != "no")
+ 
+-        kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
++        kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/trinity/bin /usr/kde/bin /usr/local/kde/bin"
+         test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
+         if test -n "$KDEDIRS"; then
+            kde_save_IFS=$IFS
+@@ -578,7 +578,7 @@
+         KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [XMLLINT=""])
+ 
+         if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then  
+- 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
++ 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/trinity/share /opt/kde/share $prefix/share"
+             test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
+             AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
+ 	    if test "$KDE_XSL_STYLESHEET" = "NO"; then
+@@ -1738,7 +1738,7 @@
+ 
+ if test -z "$1"; then
+ 
+-kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
++kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/trinity/include /opt/kde/include $x_includes $qt_includes"
+ test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
+ kde_incdirs="$ac_kde_includes $kde_incdirs"
+ AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
+@@ -1750,7 +1750,7 @@
+ So, check this please and use another prefix!])
+ fi
+ 
+-kde_libdirs="/usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
++kde_libdirs="/usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/trinity /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/trinity/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
+ test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
+ kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
+ AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
+@@ -1758,7 +1758,7 @@
+ 
+ kde_widgetdir=NO
+ dnl this might be somewhere else
+-AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
++AC_FIND_FILE("trinity/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
+ 
+ if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
+ AC_MSG_ERROR([
+@@ -1766,14 +1766,14 @@
+ So, check this please and use another prefix!])
+ fi
+ 
+-if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
++if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then
+ AC_MSG_ERROR([
+ I can't find the designer plugins. These are required and should have been installed
+ by kdelibs])
+ fi
+ 
+ if test -n "$kde_widgetdir"; then
+-    kde_widgetdir="$kde_widgetdir/kde3/plugins/designer"
++    kde_widgetdir="$kde_widgetdir/trinity/plugins/designer"
+ fi
+ 
+ 
diff --git a/redhat/extras/kasablanca/trinity-kasablanca.spec b/redhat/extras/kasablanca/trinity-kasablanca.spec
new file mode 100644
index 000000000..26ff6c296
--- /dev/null
+++ b/redhat/extras/kasablanca/trinity-kasablanca.spec
@@ -0,0 +1,136 @@
+%define kdecomp kasablanca
+
+Name:		trinity-%{kdecomp}
+Summary:	Graphical FTP client
+Version:	0.4.0.2
+Release:	1%{?dist}
+
+License:	GPLv2+
+Url:		http://kasablanca.berlios.de/ 
+Source:		http://download.berlios.de/kasablanca/kasablanca-%{version}.tar.gz
+Group:		Applications/Internet 
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Patch1:		kasablanca-0.4.0.2-dt.patch
+Patch2:		kasablanca-autotools.patch
+Patch3:		kasablanca-0.4.0.2-ftbfs.patch
+
+BuildRequires: desktop-file-utils
+BuildRequires: gettext 
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: openssl-devel
+BuildRequires: libutempter-devel
+
+%description
+Kasablanca is an ftp client, among its features are currently: 
+* ftps encryption via AUTH TLS
+* fxp (direct server to server transfer), supporting alternative mode.
+* advanced bookmarking system.
+* fast responsive multithreaded engine.
+* concurrent connections to multiple hosts.
+* interactive transfer queue, movable by drag and drop.
+* small nifty features, like a skiplist.
+
+
+%prep
+%setup -q -n %{kdecomp}-%{version}
+%patch1 -p1 -b .dt
+%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"
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+unset QTDIR || : ; . /etc/profile.d/qt.sh
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+## Needed(?) for older/legacy setups, harmless otherwise
+if pkg-config openssl ; then
+	export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags-only-I openssl)"
+fi
+
+%configure \
+	--disable-rpath \
+	--disable-debug --disable-warnings \
+	--disable-dependency-tracking --enable-final \
+	--with-extra-includes=%{_includedir}/tqt
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf $RPM_BUILD_ROOT 
+
+%__make install DESTDIR=$RPM_BUILD_ROOT
+
+desktop-file-install \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
+  --vendor="" \
+  --add-category="Network" \
+  --add-category="KDE" \
+  --delete-original \
+  $RPM_BUILD_ROOT%{_datadir}/applnk/*/*.desktop
+
+## File lists
+# locale's
+%find_lang %{kdecomp} || touch %{kdecomp}.lang
+# HTML (1.0)
+HTML_DIR=$(kde-config --expandvars --install html)
+if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
+for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do
+  if [ -d $lang_dir ]; then
+    lang=$(basename $lang_dir)
+    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
+    # replace absolute symlinks with relative ones
+    pushd $lang_dir
+      for i in *; do
+        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
+      done
+    popd
+  fi
+done
+fi
+
+
+%clean
+%__rm -rf $RPM_BUILD_ROOT 
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+
+
+%files -f %{kdecomp}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README 
+%{_bindir}/*
+%{_datadir}/applications/kde/*.desktop
+%{_datadir}/apps/kasablanca/
+%{_datadir}/config*/*
+%{_datadir}/icons/hicolor/*/*/*
+
+
+%changelog
+* Sun Dec 04 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.0.2-1
+- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Based on Fedora 12 Spec 'kasablanca-0.4.0.2-17'
diff --git a/redhat/kde-i18n/trinity-kde-i18n-3.5.12.spec b/redhat/kde-i18n/trinity-kde-i18n-3.5.12.spec
index 1d46ff40f..2f6aaf0ab 100644
--- a/redhat/kde-i18n/trinity-kde-i18n-3.5.12.spec
+++ b/redhat/kde-i18n/trinity-kde-i18n-3.5.12.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.12
 %endif
-%define release 7
+%define release 8
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -46,12 +46,18 @@ AutoReq: no
 
 Source0:	kde-i18n-%{version}.tar.gz
 
-# Patch for 'kdesu': the message was modified in 'kdebase' package
+# [zh_TW] Updated translations, thanks to Wei-Lun Chao !
+Source1:	kde-i18n-zh_TW-3.5.10.tar.bz2
+
+# TDE 3.5.12: Translate 'kdesu' message was modified in 'kdebase' package
 Patch0:		kde-i18n-kdesu.patch
 
-# Patch to translate 'Open Terminal Here' desktop shortcut
+# TDE 3.5.12: Translate 'Open Terminal Here' desktop shortcut
 Patch1:		trinity-kde-i18n-fr-openterminalhere.patch
 
+# TDE 3.5.13: French translations for new features
+Patch2:		kde-i18n-3.5.13-add_french_translations.patch
+
 BuildRequires:	findutils
 BuildRequires:	gettext
 BuildRequires:	trinity-arts-devel
@@ -64,7 +70,7 @@ BuildRequires:	trinity-kdelibs-devel
 Summary: Afrikaans(af) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-af = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Afrikaans
 %{summary}.
 
@@ -72,7 +78,7 @@ Requires: kde-filesystem
 Summary: Arabic(ar) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-ar = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Arabic
 %{summary}.
 
@@ -80,7 +86,7 @@ Requires: kde-filesystem
 Summary: Azerbaijani(az) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-az = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Azerbaijani
 %{summary}.
 
@@ -88,7 +94,7 @@ Requires: kde-filesystem
 Summary: Belarusian(be) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-be = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Belarusian
 %{summary}.
 
@@ -96,7 +102,7 @@ Requires: kde-filesystem
 Summary: Bulgarian(bg) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-bg = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Bulgarian
 %{summary}.
 
@@ -104,7 +110,7 @@ Requires: kde-filesystem
 Summary: Bengali(bn) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-bn = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Bengali
 %{summary}.
 
@@ -112,7 +118,7 @@ Requires: kde-filesystem
 Summary: Tibetan(bo) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-bo = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Tibetan
 %{summary}.
 
@@ -120,7 +126,7 @@ Requires: kde-filesystem
 Summary: Breton(br) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-br = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Breton
 %{summary}.
 
@@ -128,7 +134,7 @@ Requires: kde-filesystem
 Summary: Bosnian(bs) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-bs = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Bosnian
 %{summary}.
 
@@ -136,7 +142,7 @@ Requires: kde-filesystem
 Summary: Catalan(ca) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-ca = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Catalan
 %{summary}.
 
@@ -144,14 +150,14 @@ Requires: kde-filesystem
 Summary: Czech(cs) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-cs = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Czech
 %{summary}.
 
 %package Cymraeg
 Summary: Cymraeg language support for KDE3
 Group: User Interface/Desktops
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Cymraeg
 %{summary}.
 
@@ -159,7 +165,7 @@ Requires: kde-filesystem
 Summary: Welsh(cy) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-cy = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Welsh
 %{summary}.
 
@@ -167,7 +173,7 @@ Requires: kde-filesystem
 Summary: Danish(da) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-da = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Danish
 %{summary}.
 
@@ -175,7 +181,7 @@ Requires: kde-filesystem
 Summary: German(de) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-de = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description German
 %{summary}.
 
@@ -183,7 +189,7 @@ Requires: kde-filesystem
 Summary: Greek(el) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-el = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Greek
 %{summary}.
 
@@ -191,7 +197,7 @@ Requires: kde-filesystem
 Summary: British(en_GB) English support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-en_GB = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description British
 %{summary}.
 
@@ -199,7 +205,7 @@ Requires: kde-filesystem
 Summary: Esperanto(eo) support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-eo = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Esperanto
 %{summary}.
 
@@ -207,7 +213,7 @@ Requires: kde-filesystem
 Summary: Spanish(es) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-es = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Spanish
 %{summary}.
 
@@ -215,7 +221,7 @@ Requires: kde-filesystem
 Summary: Estonian(et) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-et = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Estonian
 %{summary}.
 
@@ -223,7 +229,7 @@ Requires: kde-filesystem
 Summary: Basque(eu) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-eu = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Basque
 %{summary}.
 
@@ -231,7 +237,7 @@ Requires: kde-filesystem
 Summary: Farsi(fa) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-fa = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Farsi
 %{summary}.
 
@@ -239,7 +245,7 @@ Requires: kde-filesystem
 Summary: Finnish(fi) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-fi = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Finnish
 %{summary}.
 
@@ -247,7 +253,7 @@ Requires: kde-filesystem
 Summary: Faroese(fo) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-fo = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Faroese
 %{summary}.
 
@@ -255,7 +261,7 @@ Requires: kde-filesystem
 Summary: French(fr) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-fr = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description French
 %{summary}.
 
@@ -263,7 +269,7 @@ Requires: kde-filesystem
 Summary: Frisian(fy) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-fy = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Frisian
 %{summary}.
 
@@ -272,7 +278,7 @@ Summary: Irish(ga) language support for KDE3
 Group: User Interface/Desktops
 Obsoletes: kde-i18n-Gaeilge < %{version}
 Provides: %{name}-ga = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Irish
 %{summary}.
 
@@ -280,7 +286,7 @@ Requires: kde-filesystem
 Summary: Galician(gl) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-gl = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Galician
 %{summary}.
 
@@ -288,7 +294,7 @@ Requires: kde-filesystem
 Summary: Hebrew(he) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-he = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Hebrew
 %{summary}.
 
@@ -296,7 +302,7 @@ Requires: kde-filesystem
 Summary: Hindi(hi) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-hi = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Hindi
 %{summary}.
 
@@ -304,7 +310,7 @@ Requires: kde-filesystem
 Summary: Croatian(hr) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-hr = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Croatian
 %{summary}.
 
@@ -312,7 +318,7 @@ Requires: kde-filesystem
 Summary: Hungarian(hu) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-hu = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Hungarian
 %{summary}.
 
@@ -320,7 +326,7 @@ Requires: kde-filesystem
 Summary: Indonesian(id) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-id = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Indonesian
 %{summary}.
 
@@ -328,7 +334,7 @@ Requires: kde-filesystem
 Summary: Icelandic(is) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-is = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Icelandic
 %{summary}.
 
@@ -336,7 +342,7 @@ Requires: kde-filesystem
 Summary: Italian(it) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-it = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Italian
 %{summary}.
 
@@ -344,7 +350,7 @@ Requires: kde-filesystem
 Summary: Japanese(ja) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-ja = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Japanese
 %{summary}.
 
@@ -352,7 +358,7 @@ Requires: kde-filesystem
 Summary: Korean(ko) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-ko = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Korean
 %{summary}.
 
@@ -360,7 +366,7 @@ Requires: kde-filesystem
 Summary: Kurdish(ku) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-ku = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Kurdish
 %{summary}.
 
@@ -368,7 +374,7 @@ Requires: kde-filesystem
 Summary: Lao(lo) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-lo = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Lao
 %{summary}.
 
@@ -376,7 +382,7 @@ Requires: kde-filesystem
 Summary: Lithuanian(lt) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-lt = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Lithuanian
 %{summary}.
 
@@ -384,7 +390,7 @@ Requires: kde-filesystem
 Summary: Latvian(lv) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-lv = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Latvian
 %{summary}.
 
@@ -392,7 +398,7 @@ Requires: kde-filesystem
 Summary: Maori(mi) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-mi = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Maori
 %{summary}.
 
@@ -400,7 +406,7 @@ Requires: kde-filesystem
 Summary: Macedonian(mk) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-mk = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Macedonian
 %{summary}.
 
@@ -408,7 +414,7 @@ Requires: kde-filesystem
 Summary: Maltese(mt) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-mt = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Maltese
 %{summary}.
 
@@ -416,7 +422,7 @@ Requires: kde-filesystem
 Summary: Dutch(nl) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-nl = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Dutch
 %{summary}.
 
@@ -424,7 +430,7 @@ Requires: kde-filesystem
 Summary: Norwegian(no) (Bokmaal) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-no = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Norwegian
 %{summary}.
 
@@ -432,7 +438,7 @@ Requires: kde-filesystem
 Summary: Norwegian(nn) (Nynorsk) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-nn = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Norwegian-Nynorsk
 %{summary}.
 
@@ -440,7 +446,7 @@ Requires: kde-filesystem
 Summary: Occitan(oc) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-oc = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Occitan
 %{summary}.
 
@@ -448,7 +454,7 @@ Requires: kde-filesystem
 Summary: Polish(pl) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-pl = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Polish
 %{summary}.
 
@@ -456,7 +462,7 @@ Requires: kde-filesystem
 Summary: Portuguese(pt) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-pt = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Portuguese
 %{summary}.
 
@@ -464,7 +470,7 @@ Requires: kde-filesystem
 Summary: Punjabi(pa) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-pa = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Punjabi
 %{summary}.
 
@@ -472,7 +478,7 @@ Requires: kde-filesystem
 Summary: Brazil(pt_BR) Portuguese language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-pt_BR = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Brazil
 %{summary}.
 
@@ -480,7 +486,7 @@ Requires: kde-filesystem
 Summary: Romanian(ro) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-ro = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Romanian
 %{summary}.
 
@@ -488,7 +494,7 @@ Requires: kde-filesystem
 Summary: Russian(ru) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-ru = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Russian
 %{summary}.
 
@@ -496,7 +502,7 @@ Requires: kde-filesystem
 Summary: Slovak(sk) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-sk = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Slovak
 %{summary}.
 
@@ -504,7 +510,7 @@ Requires: kde-filesystem
 Summary: Slovenian(sl) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-sl = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Slovenian
 %{summary}.
 
@@ -512,7 +518,7 @@ Requires: kde-filesystem
 Summary: Serbian(sr) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-sr = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Serbian
 %{summary}.
 
@@ -520,7 +526,7 @@ Requires: kde-filesystem
 Summary: Swedish(sv) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-sv = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Swedish
 %{summary}.
 
@@ -528,7 +534,7 @@ Requires: kde-filesystem
 Summary: Tamil(ta) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-ta = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Tamil
 %{summary}.
 
@@ -536,7 +542,7 @@ Requires: kde-filesystem
 Summary: Tajik(tg) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-tg = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Tajik
 %{summary}.
 
@@ -544,7 +550,7 @@ Requires: kde-filesystem
 Summary: Thai(th) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-th = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Thai
 %{summary}.
 
@@ -552,7 +558,7 @@ Requires: kde-filesystem
 Summary: Turkish(tr) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-tr = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Turkish
 %{summary}.
 
@@ -560,7 +566,7 @@ Requires: kde-filesystem
 Summary: Ukrainian(uk) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-uk = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Ukrainian
 %{summary}.
 
@@ -568,7 +574,7 @@ Requires: kde-filesystem
 Summary: Venda(ven) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-ven = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Venda
 %{summary}.
 
@@ -576,7 +582,7 @@ Requires: kde-filesystem
 Summary: Vietnamese(vi) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-vi = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Vietnamese
 %{summary}.
 
@@ -584,7 +590,7 @@ Requires: kde-filesystem
 Summary: Walloon(wa) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-wa = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Walloon
 %{summary}.
 
@@ -592,7 +598,7 @@ Requires: kde-filesystem
 Summary: Xhosa(xh) (a Bantu language) support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-xh = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Xhosa
 %{summary}.
 
@@ -600,7 +606,7 @@ Requires: kde-filesystem
 Summary: Chinese(zh_CN) (Simplified Chinese) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-zh_CN = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Chinese
 %{summary}.
 
@@ -608,7 +614,7 @@ Requires: kde-filesystem
 Summary: Chinese(zh_TW) (Big5) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-tz_TW = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Chinese-Big5
 %{summary}.
 
@@ -616,57 +622,54 @@ Requires: kde-filesystem
 
 %prep
 %setup -q -n kde-i18n
+%__cp -f %{SOURCE1} .
 
 for l in %{KDE_LANGS}; do
   for f in kde-i18n-${l}-*.tar.bz2; do
-    tar xjf ${f}
+    tar xjf "${f}"
   done
 done
 
 %patch0
 %patch1
+%patch2
 
 
 %build
 export PATH="%{_bindir}:${PATH}"
 export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 
+export kde_htmldir="%{tde_docdir}/HTML"
+
 for l in %{KDE_LANGS}; do
   for f in kde-i18n-${l}-*/; do
     if [ -d "${f}" ] && [ -x "${f}/configure" ] ; then 
       pushd ${f}
-      %configure --prefix=%{_prefix}
-      %{__make} %{?_smp_mflags}
+      %configure
+      %__make %{?_smp_mflags}
       popd
     fi
   done
 done
 
 %install
-rm -rf %{?buildroot}
+%__rm -rf %{?buildroot}
 export PATH="%{_bindir}:${PATH}"
 
 for l in %{KDE_LANGS}; do
   for f in kde-i18n-${l}-*/; do
     if [ -d "${f}" ] && [ -r "${f}/Makefile" ] ; then 
-      pushd ${f}
-
-      # Thales: dirty hack to remove directory 'common' from install list (else it fails to install)
-      if [ -r docs/Makefile ]; then
-        sed -i docs/Makefile -e "s,^\(SUBDIRS =.*\)common\(.*\)$,\1 \2,"
-      fi
-
-      %__make install DESTDIR=%{?buildroot}
-      popd
+      %__make install DESTDIR="%{?buildroot}" -C "${f}"
     fi
   done
 done
 
 # make symlinks relative
-pushd %{buildroot}%{_docdir}/HTML
+%if "%{_prefix}" == "/usr"
+pushd "%{buildroot}%{tde_docdir}/HTML"
 for lang in *; do
-  if [ -d $lang ]; then
-    pushd $lang
+  if [ -d "$lang" ]; then
+    pushd "$lang"
     for i in */*/*; do
       if [ -d $i -a -L $i/common ]; then
         rm -f $i/common
@@ -692,543 +695,483 @@ for lang in *; do
   fi
 done
 popd   
+%endif
 
 # remove zero-length file
-find %{buildroot}%{_docdir}/HTML -size 0 -exec rm -f {} \;
+find "%{buildroot}%{tde_docdir}/HTML" -size 0 -exec rm -f {} \;
 
 # See http://fedoraproject.org/wiki/Languages (???)
-rm -f %{buildroot}%{_datadir}/locale/*/flag.png
-# And also the 'desktop.entry' (???)
-rm -f %{buildroot}%{_datadir}/locale/*/entry.desktop
+%__rm -f %{buildroot}%{_datadir}/locale/*/flag.png
+
+# Removes conflict with KDE4
+%if "%{?_prefix}" == "/usr"
+%__rm -f %{buildroot}%{_datadir}/locale/*/entry.desktop
+%endif
 
 # remove obsolete KDE 3 application data translations
-rm -rf %{buildroot}%{_datadir}/apps
+%__rm -rf "%{buildroot}%{_datadir}/apps"
 
 %clean
-rm -rf %{buildroot}
+%__rm -rf %{buildroot}
 
 %if "%( grep -w af <<< '%{KDE_LANGS}' )" != ""
 %files Afrikaans
 %defattr(-,root,root,-)
-%lang(af) %{_datadir}/locale/af/LC_MESSAGES/*
-%lang(af) %{_datadir}/locale/af/charset
-%lang(af) %{_docdir}/HTML/af/
+%lang(af) %{_datadir}/locale/af/*
+%lang(af) %{tde_docdir}/HTML/af/
 %endif
 
 %if "%( grep -w ar <<< '%{KDE_LANGS}' )" != ""
 %files Arabic 
 %defattr(-,root,root,-)
-%lang(ar) %{_datadir}/locale/ar/LC_MESSAGES/*
-%lang(ar) %{_datadir}/locale/ar/charset
+%lang(ar) %{_datadir}/locale/ar/*
 %endif
 
 %if "%( grep -w az <<< '%{KDE_LANGS}' )" != ""
 %files Azerbaijani
 %defattr(-,root,root,-)
-%lang(az) %{_datadir}/locale/az/LC_MESSAGES/*
-%lang(az) %{_datadir}/locale/az/charset
+%lang(az) %{_datadir}/locale/az/*
 %endif
 
 %if "%( grep -w be <<< '%{KDE_LANGS}' )" != ""
 %files Belarusian
 %defattr(-,root,root,-)
-%lang(be) %{_datadir}/locale/be/LC_MESSAGES/*
-%lang(be) %{_datadir}/locale/be/charset
+%lang(be) %{_datadir}/locale/be/*
 %endif
 
 %if "%( grep -w bg <<< '%{KDE_LANGS}' )" != ""
 %files Bulgarian
 %defattr(-,root,root,-)
-%lang(bg) %{_datadir}/locale/bg/LC_MESSAGES/*
-%lang(bg) %{_datadir}/locale/bg/charset
+%lang(bg) %{_datadir}/locale/bg/*
 %endif
 
 %if "%( grep -w bn <<< '%{KDE_LANGS}' )" != ""
 %files Bengali
 %defattr(-,root,root,-)
-%lang(bn) %{_datadir}/locale/bn/LC_MESSAGES/*
-%lang(bn) %{_datadir}/locale/bn/charset
+%lang(bn) %{_datadir}/locale/bn/*
 %endif
 
 %if "%( grep -w bo <<< '%{KDE_LANGS}' )" != ""
 %files Tibetan
 %defattr(-,root,root,-)
-%lang(bo) %{_datadir}/locale/bo/LC_MESSAGES/*
-%lang(bo) %{_datadir}/locale/bo/charset
+%lang(bo) %{_datadir}/locale/bo/*
 %endif
 
 %if "%( grep -w br <<< '%{KDE_LANGS}' )" != ""
 %files Breton
 %defattr(-,root,root,-)
-%lang(br) %{_datadir}/locale/br/LC_MESSAGES/*
-%lang(br) %{_datadir}/locale/br/charset
+%lang(br) %{_datadir}/locale/br/*
 %endif
 
 %if "%( grep -w bs <<< '%{KDE_LANGS}' )" != ""
 %files Bosnian
 %defattr(-,root,root,-)
-%lang(bs) %{_datadir}/locale/bs/LC_MESSAGES/*
-%lang(bs) %{_datadir}/locale/bs/charset
+%lang(bs) %{_datadir}/locale/bs/*
 %endif
 
 %if "%( grep -w ca <<< '%{KDE_LANGS}' )" != ""
 %files Catalan
 %defattr(-,root,root,-)
-%lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/*
-%lang(ca) %{_datadir}/locale/ca/charset
-%lang(ca) %{_docdir}/HTML/ca/
+%lang(ca) %{_datadir}/locale/ca/*
+%lang(ca) %{tde_docdir}/HTML/ca/
 %endif
 
 %if "%( grep -w cs <<< '%{KDE_LANGS}' )" != ""
 %files Czech
 %defattr(-,root,root,-)
-%lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/*
-%lang(cs) %{_datadir}/locale/cs/charset
-%lang(cs) %{_docdir}/HTML/cs/
+%lang(cs) %{_datadir}/locale/cs/*
+%lang(cs) %{tde_docdir}/HTML/cs/
 %endif
 
 %if "%( grep -w cy <<< '%{KDE_LANGS}' )" != ""
 %files Welsh
 %defattr(-,root,root,-)
-%lang(cy) %{_datadir}/locale/cy/LC_MESSAGES/*
-%lang(cy) %{_datadir}/locale/cy/charset
+%lang(cy) %{_datadir}/locale/cy/*
 %endif
 
 %if "%( grep -w da <<< '%{KDE_LANGS}' )" != ""
 %files Danish
 %defattr(-,root,root,-)
-%lang(da) %{_datadir}/locale/da/LC_MESSAGES/*
-%lang(da) %{_datadir}/locale/da/charset
-%lang(da) %{_datadir}/locale/da/da.compendium
-%lang(da) %{_docdir}/HTML/da/
+%lang(da) %{_datadir}/locale/da/*
+%lang(da) %{tde_docdir}/HTML/da/
 %endif
 
 %if "%( grep -w de <<< '%{KDE_LANGS}' )" != ""
 %files German
 %defattr(-,root,root,-)
-%lang(de) %{_datadir}/locale/de/LC_MESSAGES/*
-%lang(de) %{_datadir}/locale/de/charset
-%lang(de) %{_docdir}/HTML/de/
+%lang(de) %{_datadir}/locale/de/*
+%lang(de) %{tde_docdir}/HTML/de/
 %endif
 
 %if "%( grep -w el <<< '%{KDE_LANGS}' )" != ""
 %files Greek
 %defattr(-,root,root,-)
-%lang(el) %{_datadir}/locale/el/LC_MESSAGES/*
-%lang(el) %{_datadir}/locale/el/charset
+%lang(el) %{_datadir}/locale/el/*
 %endif
 
 %if "%( grep -w en_GB <<< '%{KDE_LANGS}' )" != ""
 %files British
 %defattr(-,root,root,-)
-%lang(en_GB) %{_datadir}/locale/en_GB/LC_MESSAGES/*
-%lang(en_GB) %{_datadir}/locale/en_GB/charset
-%lang(en_GB) %{_docdir}/HTML/en_GB/
+%lang(en_GB) %{_datadir}/locale/en_GB/*
+%lang(en_GB) %{tde_docdir}/HTML/en_GB/
 %endif
 
 %if "%( grep -w eo <<< '%{KDE_LANGS}' )" != ""
 %files Esperanto
 %defattr(-,root,root,-)
-%lang(eo) %{_datadir}/locale/eo/LC_MESSAGES/*
-%lang(eo) %{_datadir}/locale/eo/charset
+%lang(eo) %{_datadir}/locale/eo/*
 %endif
 
 %if "%( grep -w es <<< '%{KDE_LANGS}' )" != ""
 %files Spanish
 %defattr(-,root,root,-)
-%lang(es) %{_datadir}/locale/es/LC_MESSAGES/*
-%lang(es) %{_datadir}/locale/es/charset
-%lang(es) %{_docdir}/HTML/es/
+%lang(es) %{_datadir}/locale/es/*
+%lang(es) %{tde_docdir}/HTML/es/
 %endif
 
 %if "%( grep -w et <<< '%{KDE_LANGS}' )" != ""
 %files Estonian
 %defattr(-,root,root,-)
-%lang(et) %{_datadir}/locale/et/LC_MESSAGES/*
-%lang(et) %{_datadir}/locale/et/charset
-%lang(et) %{_docdir}/HTML/et/
+%lang(et) %{_datadir}/locale/et/*
+%lang(et) %{tde_docdir}/HTML/et/
 %endif
 
 %if "%( grep -w eu <<< '%{KDE_LANGS}' )" != ""
 %files Basque
 %defattr(-,root,root,-)
-%lang(eu) %{_datadir}/locale/eu/LC_MESSAGES/*
-%lang(eu) %{_datadir}/locale/eu/charset
+%lang(eu) %{_datadir}/locale/eu/*
 %endif
 
 %if "%( grep -w fa <<< '%{KDE_LANGS}' )" != ""
 %files Farsi
 %defattr(-,root,root,-)
-%lang(fa) %{_datadir}/locale/fa/LC_MESSAGES/*
-%lang(fa) %{_datadir}/locale/fa/charset
+%lang(fa) %{_datadir}/locale/fa/*
 %endif
 
 %if "%( grep -w fi <<< '%{KDE_LANGS}' )" != ""
 %files Finnish
 %defattr(-,root,root,-)
-%lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/*
-%lang(fi) %{_datadir}/locale/fi/charset
-%lang(fi) %{_docdir}/HTML/fi/
+%lang(fi) %{_datadir}/locale/fi/*
+%lang(fi) %{tde_docdir}/HTML/fi/
 %endif
 
 %if "%( grep -w fo <<< '%{KDE_LANGS}' )" != ""
 %files Faroese
 %defattr(-,root,root,-)
-%lang(fo) %{_datadir}/locale/fo/LC_MESSAGES/*
-%lang(fo) %{_datadir}/locale/fo/charset
+%lang(fo) %{_datadir}/locale/fo/*
 %endif
 
 %if "%( grep -w fr <<< '%{KDE_LANGS}' )" != ""
 %files French
 %defattr(-,root,root,-)
-%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/*
-%lang(fr) %{_datadir}/locale/fr/charset
-%lang(fr) %{_datadir}/locale/fr/nbsp_gui_fr.txt
-%lang(fr) %{_datadir}/locale/fr/relecture_*
-%lang(fr) %{_docdir}/HTML/fr/
+%lang(fr) %{_datadir}/locale/fr/*
+%lang(fr) %{tde_docdir}/HTML/fr/
 %endif
 
 %if "%( grep -w fy <<< '%{KDE_LANGS}' )" != ""
 %files Frisian
 %defattr(-,root,root,-)
-%lang(fy) %{_datadir}/locale/fy/LC_MESSAGES/*
-%lang(fy) %{_datadir}/locale/fy/charset
+%lang(fy) %{_datadir}/locale/fy/*
 %endif
 
 %if "%( grep -w ga <<< '%{KDE_LANGS}' )" != ""
 %files Irish
 %defattr(-,root,root,-)
-%lang(ga) %{_datadir}/locale/ga/LC_MESSAGES/*
-%lang(ga) %{_datadir}/locale/ga/charset
+%lang(ga) %{_datadir}/locale/ga/*
 %endif
 
 %if "%( grep -w gl <<< '%{KDE_LANGS}' )" != ""
 %files Galician
 %defattr(-,root,root,-)
-%lang(gl) %{_datadir}/locale/gl/LC_MESSAGES/*
-%lang(gl) %{_datadir}/locale/gl/charset
+%lang(gl) %{_datadir}/locale/gl/*
 %endif
 
 %if "%( grep -w he <<< '%{KDE_LANGS}' )" != ""
 %files Hebrew
 %defattr(-,root,root,-)
-%lang(he) %{_datadir}/locale/he/LC_MESSAGES/*
-%lang(he) %{_datadir}/locale/he/charset
-%lang(he) %{_docdir}/HTML/he/
+%lang(he) %{_datadir}/locale/he/*
+%lang(he) %{tde_docdir}/HTML/he/
 %endif
 
 %if "%( grep -w hi <<< '%{KDE_LANGS}' )" != ""
 %files Hindi
 %defattr(-,root,root,-)
-%lang(hi) %{_datadir}/locale/hi/LC_MESSAGES/*
-%lang(hi) %{_datadir}/locale/hi/charset
+%lang(hi) %{_datadir}/locale/hi/*
 %endif
 
 %if "%( grep -w hr <<< '%{KDE_LANGS}' )" != ""
 %files Croatian
 %defattr(-,root,root,-)
-%lang(hr) %{_datadir}/locale/hr/LC_MESSAGES/*
-%lang(hr) %{_datadir}/locale/hr/charset
-%lang(hr) %{_docdir}/HTML/hr/
+%lang(hr) %{_datadir}/locale/hr/*
+%lang(hr) %{tde_docdir}/HTML/hr/
 %endif
 
 %if "%( grep -w hu <<< '%{KDE_LANGS}' )" != ""
 %files Hungarian
 %defattr(-,root,root,-)
-%lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/*
-%lang(hu) %{_datadir}/locale/hu/charset
-%lang(hu) %{_docdir}/HTML/hu/
+%lang(hu) %{_datadir}/locale/hu/*
+%lang(hu) %{tde_docdir}/HTML/hu/
 %endif
 
 %if "%( grep -w id <<< '%{KDE_LANGS}' )" != ""
 %files Indonesian
 %defattr(-,root,root,-)
-%lang(id) %{_datadir}/locale/id/LC_MESSAGES/*
-%lang(id) %{_datadir}/locale/id/charset
-%lang(id) %{_docdir}/HTML/id/
+%lang(id) %{_datadir}/locale/id/*
+%lang(id) %{tde_docdir}/HTML/id/
 %endif
 
 %if "%( grep -w is <<< '%{KDE_LANGS}' )" != ""
 %files Icelandic
 %defattr(-,root,root,-)
-%lang(is) %{_datadir}/locale/is/LC_MESSAGES/*
-%lang(is) %{_datadir}/locale/is/charset
+%lang(is) %{_datadir}/locale/is/*
 %endif
 
 %if "%( grep -w it <<< '%{KDE_LANGS}' )" != ""
 %files Italian
 %defattr(-,root,root,-)
-%lang(it) %{_datadir}/locale/it/LC_MESSAGES/*
-%lang(it) %{_datadir}/locale/it/charset
-%lang(it) %{_docdir}/HTML/it/
+%lang(it) %{_datadir}/locale/it/*
+%lang(it) %{tde_docdir}/HTML/it/
 %endif
 
 %if "%( grep -w ja <<< '%{KDE_LANGS}' )" != ""
 %files Japanese
 %defattr(-,root,root,-)
-%lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/*
-%lang(ja) %{_datadir}/locale/ja/charset
-%lang(ja) %{_docdir}/HTML/ja/
+%lang(ja) %{_datadir}/locale/ja/*
+%lang(ja) %{tde_docdir}/HTML/ja/
 %endif
 
 %if "%( grep -w ko <<< '%{KDE_LANGS}' )" != ""
 %files Korean
 %defattr(-,root,root,-)
-%lang(ko) %{_datadir}/locale/ko/LC_MESSAGES/*
-%lang(ko) %{_datadir}/locale/ko/charset
-%lang(ko) %{_docdir}/HTML/ko/
+%lang(ko) %{_datadir}/locale/ko/*
+%lang(ko) %{tde_docdir}/HTML/ko/
 %endif
 
 %if "%( grep -w ku <<< '%{KDE_LANGS}' )" != ""
 %files Kurdish
 %defattr(-,root,root,-)
-%lang(ku) %{_datadir}/locale/ku/LC_MESSAGES/*
-%lang(ku) %{_datadir}/locale/ku/charset
-%lang(ku) %{_docdir}/HTML/ku/
+%lang(ku) %{_datadir}/locale/ku/*
+%lang(ku) %{tde_docdir}/HTML/ku/
 %endif
 
 %if "%( grep -w lao <<< '%{KDE_LANGS}' )" != ""
 %files Lao
 %defattr(-,root,root,-)
-%lang(lo) %{_datadir}/locale/lo/LC_MESSAGES/*
-%lang(lo) %{_datadir}/locale/lo/charset
-%lang(lo) %{_docdir}/HTML/lo/
+%lang(lo) %{_datadir}/locale/lo/*
+%lang(lo) %{tde_docdir}/HTML/lo/
 %endif
 
 %if "%( grep -w lt <<< '%{KDE_LANGS}' )" != ""
 %files Lithuanian
 %defattr(-,root,root,-)
-%lang(lt) %{_datadir}/locale/lt/LC_MESSAGES/*
-%lang(lt) %{_datadir}/locale/lt/charset
+%lang(lt) %{_datadir}/locale/lt/*
 %endif
 
 %if "%( grep -w lv <<< '%{KDE_LANGS}' )" != ""
 %files Latvian
 %defattr(-,root,root,-)
-%lang(lv) %{_datadir}/locale/lv/LC_MESSAGES/*
-%lang(lv) %{_datadir}/locale/lv/charset
+%lang(lv) %{_datadir}/locale/lv/*
 %endif
 
 %if "%( grep -w mi <<< '%{KDE_LANGS}' )" != ""
 %files Maori
 %defattr(-,root,root,-)
-%lang(mi) %{_datadir}/locale/mi/LC_MESSAGES/*
-%lang(mi) %{_datadir}/locale/mi/charset
+%lang(mi) %{_datadir}/locale/mi/*
 %endif
 
 %if "%( grep -w mk <<< '%{KDE_LANGS}' )" != ""
 %files Macedonian
 %defattr(-,root,root,-)
-%lang(mk) %{_datadir}/locale/mk/LC_MESSAGES/*
-%lang(mk) %{_datadir}/locale/mk/charset
+%lang(mk) %{_datadir}/locale/mk/*
 %endif
 
 %if "%( grep -w mt <<< '%{KDE_LANGS}' )" != ""
 %files Maltese
 %defattr(-,root,root,-)
-%lang(mt) %{_datadir}/locale/mt/LC_MESSAGES/*
-%lang(mt) %{_datadir}/locale/mt/charset
+%lang(mt) %{_datadir}/locale/mt/*
 %endif
 
 %if "%( grep -w nl <<< '%{KDE_LANGS}' )" != ""
 %files Dutch
 %defattr(-,root,root,-)
-%lang(nl) %{_datadir}/locale/nl/LC_MESSAGES/*
-%lang(nl) %{_datadir}/locale/nl/charset
-%lang(nl) %{_docdir}/HTML/nl/
+%lang(nl) %{_datadir}/locale/nl/*
+%lang(nl) %{tde_docdir}/HTML/nl/
 %endif
 
 %if "%( grep -w nb <<< '%{KDE_LANGS}' )" != ""
 %files Norwegian
 %defattr(-,root,root,-)
-%lang(nb) %{_datadir}/locale/nb/LC_MESSAGES/*
-%lang(nb) %{_datadir}/locale/nb/charset
-%lang(nb) %{_datadir}/locale/nb/README
-#%lang(nb) %{_docdir}/HTML/nb/
+%lang(nb) %{_datadir}/locale/nb/*
+#%lang(nb) %{tde_docdir}/HTML/nb/
 %endif
 
 %if "%( grep -w nn <<< '%{KDE_LANGS}' )" != ""
 %files Norwegian-Nynorsk
 %defattr(-,root,root,-)
-%lang(nn) %{_datadir}/locale/nn/LC_MESSAGES/*
-%lang(nn) %{_datadir}/locale/nn/charset
-#%lang(nn) %{_docdir}/HTML/nn/
+%lang(nn) %{_datadir}/locale/nn/*
+#%lang(nn) %{tde_docdir}/HTML/nn/
 %endif
 
 %if "%( grep -w oc <<< '%{KDE_LANGS}' )" != ""
 %files Occitan
 %defattr(-,root,root,-)
-%lang(oc) %{_datadir}/locale/oc/LC_MESSAGES/*
-%lang(oc) %{_datadir}/locale/oc/charset
+%lang(oc) %{_datadir}/locale/oc/*
 %endif
 
 %if "%( grep -w pa <<< '%{KDE_LANGS}' )" != ""
 %files Punjabi
 %defattr(-,root,root,-)
-%lang(pa) %{_datadir}/locale/pa/LC_MESSAGES/*
-%lang(pa) %{_datadir}/locale/pa/charset
+%lang(pa) %{_datadir}/locale/pa/*
 %endif
 
 %if "%( grep -w pl <<< '%{KDE_LANGS}' )" != ""
 %files Polish
 %defattr(-,root,root,-)
-%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/*
-%lang(pl) %{_datadir}/locale/pl/charset
-%lang(pl) %{_docdir}/HTML/pl/
+%lang(pl) %{_datadir}/locale/pl/*
+%lang(pl) %{tde_docdir}/HTML/pl/
 %endif
 
 %if "%( grep -w pt <<< '%{KDE_LANGS}' )" != ""
 %files Portuguese
 %defattr(-,root,root,-)
-%lang(pt) %{_datadir}/locale/pt/LC_MESSAGES/*
-%lang(pt) %{_datadir}/locale/pt/charset
-%lang(pt) %{_docdir}/HTML/pt/
+%lang(pt) %{_datadir}/locale/pt/*
+%lang(pt) %{tde_docdir}/HTML/pt/
 %endif
 
 %if "%( grep -w pt_BR <<< '%{KDE_LANGS}' )" != ""
 %files Brazil
 %defattr(-,root,root,-)
-%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/*
-%lang(pt_BR) %{_datadir}/locale/pt_BR/charset
-%lang(pt_BR) %{_docdir}/HTML/pt_BR/
+%lang(pt_BR) %{_datadir}/locale/pt_BR/*
+%lang(pt_BR) %{tde_docdir}/HTML/pt_BR/
 %endif
 
 %if "%( grep -w ro <<< '%{KDE_LANGS}' )" != ""
 %files Romanian
 %defattr(-,root,root,-)
-%lang(ro) %{_datadir}/locale/ro/LC_MESSAGES/*
-%lang(ro) %{_datadir}/locale/ro/charset
-%lang(ro) %{_docdir}/HTML/ro/
+%lang(ro) %{_datadir}/locale/ro/*
+%lang(ro) %{tde_docdir}/HTML/ro/
 %endif
 
 %if "%( grep -w ru <<< '%{KDE_LANGS}' )" != ""
 %files Russian
 %defattr(-,root,root,-)
-%lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/*
-%lang(ru) %{_datadir}/locale/ru/charset
-%lang(ru) %{_docdir}/HTML/ru/
+%lang(ru) %{_datadir}/locale/ru/*
+%lang(ru) %{tde_docdir}/HTML/ru/
 %endif
 
 %if "%( grep -w sk <<< '%{KDE_LANGS}' )" != ""
 %files Slovak
 %defattr(-,root,root,-)
-%lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/*
-%lang(sk) %{_datadir}/locale/sk/charset
-%lang(sk) %{_docdir}/HTML/sk/
+%lang(sk) %{_datadir}/locale/sk/*
+%lang(sk) %{tde_docdir}/HTML/sk/
 %endif
 
 %if "%( grep -w sl <<< '%{KDE_LANGS}' )" != ""
 %files Slovenian
 %defattr(-,root,root,-)
-%lang(sl) %{_datadir}/locale/sl/LC_MESSAGES/*
-%lang(sl) %{_datadir}/locale/sl/charset
-%lang(sl) %{_docdir}/HTML/sl/
+%lang(sl) %{_datadir}/locale/sl/*
+%lang(sl) %{tde_docdir}/HTML/sl/
 %endif
 
 %if "%( grep -w sr <<< '%{KDE_LANGS}' )" != ""
 %files Serbian
 %defattr(-,root,root,-)
-%lang(sr) %{_datadir}/locale/sr/LC_MESSAGES/*
-%lang(sr) %{_datadir}/locale/sr/charset
-%lang(sr) %{_docdir}/HTML/sr/
+%lang(sr) %{_datadir}/locale/sr/*
+%lang(sr) %{tde_docdir}/HTML/sr/
 %endif
 
 %if "%( grep -w sv <<< '%{KDE_LANGS}' )" != ""
 %files Swedish
 %defattr(-,root,root,-)
-%lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/*
-%lang(sv) %{_datadir}/locale/sv/charset
-%lang(sv) %{_docdir}/HTML/sv/
+%lang(sv) %{_datadir}/locale/sv/*
+%lang(sv) %{tde_docdir}/HTML/sv/
 %endif
 
 %if "%( grep -w ta <<< '%{KDE_LANGS}' )" != ""
 %files Tamil
 %defattr(-,root,root,-)
-%lang(ta) %{_datadir}/locale/ta/LC_MESSAGES/*
-%lang(ta) %{_datadir}/locale/ta/charset
+%lang(ta) %{_datadir}/locale/ta/*
 %endif
 
 %if "%( grep -w tg <<< '%{KDE_LANGS}' )" != ""
 %files Tajik
 %defattr(-,root,root,-)
-%lang(tg) %{_datadir}/locale/tg/LC_MESSAGES/*
-%lang(tg) %{_datadir}/locale/tg/charset
+%lang(tg) %{_datadir}/locale/tg/*
 %endif
 
 %if "%( grep -w th <<< '%{KDE_LANGS}' )" != ""
 %files Thai
 %defattr(-,root,root,-)
-%lang(th) %{_datadir}/locale/th/LC_MESSAGES/*
-%lang(th) %{_datadir}/locale/th/charset
+%lang(th) %{_datadir}/locale/th/*
 %endif
 
 %if "%( grep -w tr <<< '%{KDE_LANGS}' )" != ""
 %files Turkish
 %defattr(-,root,root,-)
-%lang(tr) %{_datadir}/locale/tr/LC_MESSAGES/*
-%lang(tr) %{_datadir}/locale/tr/charset
-%lang(tr) %{_docdir}/HTML/tr/
+%lang(tr) %{_datadir}/locale/tr/*
+%lang(tr) %{tde_docdir}/HTML/tr/
 %endif
 
 %if "%( grep -w uk <<< '%{KDE_LANGS}' )" != ""
 %files Ukrainian
 %defattr(-,root,root,-)
-%lang(uk) %{_docdir}/HTML/uk/
-%lang(uk) %{_datadir}/locale/uk/LC_MESSAGES/*
-%lang(uk) %{_datadir}/locale/uk/charset
+%lang(uk) %{tde_docdir}/HTML/uk/
+%lang(uk) %{_datadir}/locale/uk/*
 %endif
 
 %if "%( grep -w ven <<< '%{KDE_LANGS}' )" != ""
 %files Venda
 %defattr(-,root,root,-)
-%lang(ven) %{_datadir}/locale/ven/LC_MESSAGES/*
-%lang(ven) %{_datadir}/locale/ven/charset
+%lang(ven) %{_datadir}/locale/ven/*
 %endif
 
 %if "%( grep -w vi <<< '%{KDE_LANGS}' )" != ""
 %files Vietnamese
 %defattr(-,root,root,-)
-%lang(vi) %{_datadir}/locale/vi/LC_MESSAGES/*
-%lang(vi) %{_datadir}/locale/vi/charset
+%lang(vi) %{_datadir}/locale/vi/*
 %endif
 
 %if "%( grep -w wa <<< '%{KDE_LANGS}' )" != ""
 %files Walloon
 %defattr(-,root,root,-)
-%lang(wa) %{_datadir}/locale/wa/LC_MESSAGES/*
-%lang(wa) %{_datadir}/locale/wa/charset
+%lang(wa) %{_datadir}/locale/wa/*
 %endif
 
 %if "%( grep -w xh <<< '%{KDE_LANGS}' )" != ""
 %files Xhosa
 %defattr(-,root,root,-)
-%lang(xh) %{_datadir}/locale/xh/LC_MESSAGES/*
-%lang(xh) %{_datadir}/locale/xh/charset
-%lang(xh) %{_docdir}/HTML/xh/
+%lang(xh) %{_datadir}/locale/xh/*
+%lang(xh) %{tde_docdir}/HTML/xh/
 %endif
 
 %if "%( grep -w zh_CN <<< '%{KDE_LANGS}' )" != ""
 %files Chinese
 %defattr(-,root,root,-)
-%lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/*
-%lang(zh_CN) %{_datadir}/locale/zh_CN/charset
-%lang(zh_CN) %{_docdir}/HTML/zh_CN/
+%lang(zh_CN) %{_datadir}/locale/zh_CN/*
+%lang(zh_CN) %{tde_docdir}/HTML/zh_CN/
 %endif
 
 %if "%( grep -w zh_TW <<< '%{KDE_LANGS}' )" != ""
 %files Chinese-Big5
 %defattr(-,root,root,-)
-%lang(zh_TW) %{_datadir}/locale/zh_TW/LC_MESSAGES/*
-%lang(zh_TW) %{_datadir}/locale/zh_TW/charset
-%lang(zh_TW) %{_docdir}/HTML/zh_TW/
+%lang(zh_TW) %{_datadir}/locale/zh_TW/*
+%lang(zh_TW) %{tde_docdir}/HTML/zh_TW/
 %endif
 
 %changelog
+* Fri Dec 09 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-8
+- Backport from TDE 3.5.13
+- Removes 'kde-filesystem" dependancy
+- Fix HTML directory location
+- Re-adds missing files 'entry.desktop'
+- Updates zh_TW translation, thanks to Wei-Lun Chao
+- Add missing french translations for TDE 3.5.13
+
 * Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-7
 - Add support for RHEL5
 
 * Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-6
-- Re-introduce all languages
+- Re-introduce all languages (again)
 
 * Wed Aug 24 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-5
 - Re-introduce all languages
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 dfd9eb97f..f98405524 100644
--- a/redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec
+++ b/redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.13
 %endif
-%define release 4
+%define release 5
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -70,7 +70,7 @@ BuildRequires:	trinity-kdelibs-devel
 Summary: Afrikaans(af) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-af = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Afrikaans
 %{summary}.
 
@@ -78,7 +78,7 @@ Requires: kde-filesystem
 Summary: Arabic(ar) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-ar = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Arabic
 %{summary}.
 
@@ -86,7 +86,7 @@ Requires: kde-filesystem
 Summary: Azerbaijani(az) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-az = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Azerbaijani
 %{summary}.
 
@@ -94,7 +94,7 @@ Requires: kde-filesystem
 Summary: Belarusian(be) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-be = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Belarusian
 %{summary}.
 
@@ -102,7 +102,7 @@ Requires: kde-filesystem
 Summary: Bulgarian(bg) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-bg = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Bulgarian
 %{summary}.
 
@@ -110,7 +110,7 @@ Requires: kde-filesystem
 Summary: Bengali(bn) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-bn = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Bengali
 %{summary}.
 
@@ -118,7 +118,7 @@ Requires: kde-filesystem
 Summary: Tibetan(bo) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-bo = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Tibetan
 %{summary}.
 
@@ -126,7 +126,7 @@ Requires: kde-filesystem
 Summary: Breton(br) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-br = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Breton
 %{summary}.
 
@@ -134,7 +134,7 @@ Requires: kde-filesystem
 Summary: Bosnian(bs) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-bs = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Bosnian
 %{summary}.
 
@@ -142,7 +142,7 @@ Requires: kde-filesystem
 Summary: Catalan(ca) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-ca = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Catalan
 %{summary}.
 
@@ -150,14 +150,14 @@ Requires: kde-filesystem
 Summary: Czech(cs) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-cs = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Czech
 %{summary}.
 
 %package Cymraeg
 Summary: Cymraeg language support for KDE3
 Group: User Interface/Desktops
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Cymraeg
 %{summary}.
 
@@ -165,7 +165,7 @@ Requires: kde-filesystem
 Summary: Welsh(cy) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-cy = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Welsh
 %{summary}.
 
@@ -173,7 +173,7 @@ Requires: kde-filesystem
 Summary: Danish(da) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-da = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Danish
 %{summary}.
 
@@ -181,7 +181,7 @@ Requires: kde-filesystem
 Summary: German(de) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-de = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description German
 %{summary}.
 
@@ -189,7 +189,7 @@ Requires: kde-filesystem
 Summary: Greek(el) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-el = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Greek
 %{summary}.
 
@@ -197,7 +197,7 @@ Requires: kde-filesystem
 Summary: British(en_GB) English support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-en_GB = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description British
 %{summary}.
 
@@ -205,7 +205,7 @@ Requires: kde-filesystem
 Summary: Esperanto(eo) support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-eo = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Esperanto
 %{summary}.
 
@@ -213,7 +213,7 @@ Requires: kde-filesystem
 Summary: Spanish(es) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-es = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Spanish
 %{summary}.
 
@@ -221,7 +221,7 @@ Requires: kde-filesystem
 Summary: Estonian(et) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-et = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Estonian
 %{summary}.
 
@@ -229,7 +229,7 @@ Requires: kde-filesystem
 Summary: Basque(eu) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-eu = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Basque
 %{summary}.
 
@@ -237,7 +237,7 @@ Requires: kde-filesystem
 Summary: Farsi(fa) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-fa = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Farsi
 %{summary}.
 
@@ -245,7 +245,7 @@ Requires: kde-filesystem
 Summary: Finnish(fi) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-fi = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Finnish
 %{summary}.
 
@@ -253,7 +253,7 @@ Requires: kde-filesystem
 Summary: Faroese(fo) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-fo = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Faroese
 %{summary}.
 
@@ -261,7 +261,7 @@ Requires: kde-filesystem
 Summary: French(fr) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-fr = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description French
 %{summary}.
 
@@ -269,7 +269,7 @@ Requires: kde-filesystem
 Summary: Frisian(fy) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-fy = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Frisian
 %{summary}.
 
@@ -278,7 +278,7 @@ Summary: Irish(ga) language support for KDE3
 Group: User Interface/Desktops
 Obsoletes: kde-i18n-Gaeilge < %{version}
 Provides: %{name}-ga = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Irish
 %{summary}.
 
@@ -286,7 +286,7 @@ Requires: kde-filesystem
 Summary: Galician(gl) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-gl = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Galician
 %{summary}.
 
@@ -294,7 +294,7 @@ Requires: kde-filesystem
 Summary: Hebrew(he) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-he = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Hebrew
 %{summary}.
 
@@ -302,7 +302,7 @@ Requires: kde-filesystem
 Summary: Hindi(hi) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-hi = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Hindi
 %{summary}.
 
@@ -310,7 +310,7 @@ Requires: kde-filesystem
 Summary: Croatian(hr) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-hr = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Croatian
 %{summary}.
 
@@ -318,7 +318,7 @@ Requires: kde-filesystem
 Summary: Hungarian(hu) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-hu = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Hungarian
 %{summary}.
 
@@ -326,7 +326,7 @@ Requires: kde-filesystem
 Summary: Indonesian(id) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-id = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Indonesian
 %{summary}.
 
@@ -334,7 +334,7 @@ Requires: kde-filesystem
 Summary: Icelandic(is) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-is = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Icelandic
 %{summary}.
 
@@ -342,7 +342,7 @@ Requires: kde-filesystem
 Summary: Italian(it) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-it = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Italian
 %{summary}.
 
@@ -350,7 +350,7 @@ Requires: kde-filesystem
 Summary: Japanese(ja) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-ja = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Japanese
 %{summary}.
 
@@ -358,7 +358,7 @@ Requires: kde-filesystem
 Summary: Korean(ko) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-ko = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Korean
 %{summary}.
 
@@ -366,7 +366,7 @@ Requires: kde-filesystem
 Summary: Kurdish(ku) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-ku = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Kurdish
 %{summary}.
 
@@ -374,7 +374,7 @@ Requires: kde-filesystem
 Summary: Lao(lo) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-lo = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Lao
 %{summary}.
 
@@ -382,7 +382,7 @@ Requires: kde-filesystem
 Summary: Lithuanian(lt) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-lt = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Lithuanian
 %{summary}.
 
@@ -390,7 +390,7 @@ Requires: kde-filesystem
 Summary: Latvian(lv) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-lv = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Latvian
 %{summary}.
 
@@ -398,7 +398,7 @@ Requires: kde-filesystem
 Summary: Maori(mi) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-mi = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Maori
 %{summary}.
 
@@ -406,7 +406,7 @@ Requires: kde-filesystem
 Summary: Macedonian(mk) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-mk = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Macedonian
 %{summary}.
 
@@ -414,7 +414,7 @@ Requires: kde-filesystem
 Summary: Maltese(mt) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-mt = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Maltese
 %{summary}.
 
@@ -422,7 +422,7 @@ Requires: kde-filesystem
 Summary: Dutch(nl) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-nl = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Dutch
 %{summary}.
 
@@ -430,7 +430,7 @@ Requires: kde-filesystem
 Summary: Norwegian(no) (Bokmaal) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-no = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Norwegian
 %{summary}.
 
@@ -438,7 +438,7 @@ Requires: kde-filesystem
 Summary: Norwegian(nn) (Nynorsk) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-nn = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Norwegian-Nynorsk
 %{summary}.
 
@@ -446,7 +446,7 @@ Requires: kde-filesystem
 Summary: Occitan(oc) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-oc = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Occitan
 %{summary}.
 
@@ -454,7 +454,7 @@ Requires: kde-filesystem
 Summary: Polish(pl) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-pl = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Polish
 %{summary}.
 
@@ -462,7 +462,7 @@ Requires: kde-filesystem
 Summary: Portuguese(pt) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-pt = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Portuguese
 %{summary}.
 
@@ -470,7 +470,7 @@ Requires: kde-filesystem
 Summary: Punjabi(pa) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-pa = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Punjabi
 %{summary}.
 
@@ -478,7 +478,7 @@ Requires: kde-filesystem
 Summary: Brazil(pt_BR) Portuguese language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-pt_BR = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Brazil
 %{summary}.
 
@@ -486,7 +486,7 @@ Requires: kde-filesystem
 Summary: Romanian(ro) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-ro = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Romanian
 %{summary}.
 
@@ -494,7 +494,7 @@ Requires: kde-filesystem
 Summary: Russian(ru) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-ru = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Russian
 %{summary}.
 
@@ -502,7 +502,7 @@ Requires: kde-filesystem
 Summary: Slovak(sk) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-sk = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Slovak
 %{summary}.
 
@@ -510,7 +510,7 @@ Requires: kde-filesystem
 Summary: Slovenian(sl) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-sl = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Slovenian
 %{summary}.
 
@@ -518,7 +518,7 @@ Requires: kde-filesystem
 Summary: Serbian(sr) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-sr = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Serbian
 %{summary}.
 
@@ -526,7 +526,7 @@ Requires: kde-filesystem
 Summary: Swedish(sv) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-sv = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Swedish
 %{summary}.
 
@@ -534,7 +534,7 @@ Requires: kde-filesystem
 Summary: Tamil(ta) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-ta = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Tamil
 %{summary}.
 
@@ -542,7 +542,7 @@ Requires: kde-filesystem
 Summary: Tajik(tg) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-tg = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Tajik
 %{summary}.
 
@@ -550,7 +550,7 @@ Requires: kde-filesystem
 Summary: Thai(th) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-th = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Thai
 %{summary}.
 
@@ -558,7 +558,7 @@ Requires: kde-filesystem
 Summary: Turkish(tr) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-tr = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Turkish
 %{summary}.
 
@@ -566,7 +566,7 @@ Requires: kde-filesystem
 Summary: Ukrainian(uk) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-uk = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Ukrainian
 %{summary}.
 
@@ -574,7 +574,7 @@ Requires: kde-filesystem
 Summary: Venda(ven) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-ven = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Venda
 %{summary}.
 
@@ -582,7 +582,7 @@ Requires: kde-filesystem
 Summary: Vietnamese(vi) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-vi = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Vietnamese
 %{summary}.
 
@@ -590,7 +590,7 @@ Requires: kde-filesystem
 Summary: Walloon(wa) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-wa = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Walloon
 %{summary}.
 
@@ -598,7 +598,7 @@ Requires: kde-filesystem
 Summary: Xhosa(xh) (a Bantu language) support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-xh = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Xhosa
 %{summary}.
 
@@ -606,7 +606,7 @@ Requires: kde-filesystem
 Summary: Chinese(zh_CN) (Simplified Chinese) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-zh_CN = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Chinese
 %{summary}.
 
@@ -614,7 +614,7 @@ Requires: kde-filesystem
 Summary: Chinese(zh_TW) (Big5) language support for KDE3
 Group: User Interface/Desktops
 Provides: %{name}-tz_TW = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
 %description Chinese-Big5
 %{summary}.
 
@@ -659,15 +659,7 @@ export PATH="%{_bindir}:${PATH}"
 for l in %{KDE_LANGS}; do
   for f in kde-i18n-${l}-*/; do
     if [ -d "${f}" ] && [ -r "${f}/Makefile" ] ; then 
-      pushd ${f}
-
-      # RHEL/Fedora: dirty hack to remove directory 'common' from install list (else it fails to install)
-#      if [ -r docs/Makefile ]; then
-#        sed -i docs/Makefile -e "s,^\(SUBDIRS =.*\)common\(.*\)$,\1 \2,"
-#      fi
-
-      %__make install DESTDIR=%{?buildroot}
-      popd
+      %__make install DESTDIR=%{?buildroot} -C ${f}
     fi
   done
 done
@@ -1165,6 +1157,9 @@ find %{buildroot}%{tde_docdir}/HTML -size 0 -exec rm -f {} \;
 %endif
 
 %changelog
+* Sun Dec 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5
+- Removes 'kde-filesystem" dependancy
+
 * Fri Nov 26 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
 - Fix HTML directory location
 
diff --git a/redhat/kdebase/kdebase-3.5.12-kickoff_unstable.patch b/redhat/kdebase/kdebase-3.5.12-kickoff_unstable.patch
new file mode 100644
index 000000000..a66bf625d
--- /dev/null
+++ b/redhat/kdebase/kdebase-3.5.12-kickoff_unstable.patch
@@ -0,0 +1,428 @@
+--- kdebase/kicker/kicker/buttons/knewbutton.cpp.ORI	2011-12-08 21:15:57.551323941 +0100
++++ kdebase/kicker/kicker/buttons/knewbutton.cpp	2011-12-08 21:22:05.216346827 +0100
+@@ -55,26 +55,26 @@
+     : KButton( parent ),
+       m_oldPos(0,0)
+ {
++	setTitle(i18n("K Menu"));
+     Q_ASSERT( !m_self );
+     m_self = this;
+-    m_hoverTimer = -1;
+     m_openTimer = -1;
+-    m_active = false;
++    m_hoverTimer = -1;
+     m_mouseInside = false;
+     m_drag = false;
+ 
+-    setIconAlignment((Qt::AlignmentFlags)(AlignTop|AlignRight));
+-    setAcceptDrops(true);
+-    setIcon("kmenu-suse");
+-    setDrawArrow(false);
+-
+-    m_movie = new TQMovie(locate("data", "kicker/pics/kmenu_basic.mng"));
+-    m_movie->connectUpdate(this, TQT_SLOT(updateMovie()));
+-    m_movie->connectStatus(this, TQT_SLOT(slotStatus(int)));
+-    m_movie->connectResize(this, TQT_SLOT(slotSetSize(const TQSize&)));
++    setIcon("kmenu");
++    setIcon(KickerSettings::customKMenuIcon());
+ 
+     TQApplication::desktop()->screen()->installEventFilter(this);
+-    setMouseTracking(true);
++    if (KickerSettings::showKMenuText())
++    {
++        setButtonText(KickerSettings::kMenuText());
++        setFont(KickerSettings::buttonFont());
++        setTextColor(KickerSettings::buttonTextColor());
++    }    
++    
++    repaint();
+ }
+ 
+ KNewButton::~KNewButton()
+@@ -82,28 +82,14 @@
+     if ( m_self == this )
+         m_self = 0;
+     setMouseTracking(false);
+-    delete m_movie;
+-}
+-
+-void KNewButton::slotStatus(int status)
+-{
+-    if(status == TQMovie::EndOfLoop)
+-        slotStopAnimation();
+ }
+ 
+-TQColor KNewButton::borderColor() const
++void KNewButton::drawButton(TQPainter *p)
+ {
+-    TQImage img = m_active_pixmap.convertToImage();
+-
+-    for (int i = 0; i < img.width(); ++i) {
+-        QRgb rgb = img.pixel(orientation() == Qt::Horizontal ? img.width() - i - 1 :
+-                    i, 2);
+-
+-        if (qGreen(rgb) > 0x50)
+-            return rgb;
+-    }
+-
+-    return img.pixel( orientation() == Qt::Horizontal ? img.width() - 2 : 2, 2);
++    //if (KickerSettings::showDeepButtons())
++    //    PanelPopupButton::drawDeepButton(p);
++    //else
++        PanelPopupButton::drawButton(p);
+ }
+ 
+ void KNewButton::show()
+@@ -111,103 +97,12 @@
+      KButton::show();
+ 
+      if (KickerSettings::firstRun()) {
+-         TQTimer::singleShot(500,this,TQT_SLOT(slotExecMenu()));
++         TQTimer::singleShot(0,this,TQT_SLOT(slotExecMenu()));
+          KickerSettings::setFirstRun(false);
+          KickerSettings::writeConfig();
+      }
+ }
+ 
+-void KNewButton::updateMovie()
+-{
+-    m_oldPos = TQPoint( -1, -1 );
+-    drawEye();
+-
+-    if (!m_active && m_movie->running())
+-        m_movie->pause();
+-}
+-
+-void KNewButton::setPopupDirection(KPanelApplet::Direction d)
+-{
+-    KButton::setPopupDirection(d);
+-
+-    delete m_movie;
+-
+-    switch (d) {
+-    case KPanelApplet::Left:
+-        setIconAlignment((Qt::AlignmentFlags)(AlignTop|AlignLeft));
+-        m_movie = new TQMovie(locate("data", "kicker/pics/kmenu_vertical.mng"));
+-        break;
+-    case KPanelApplet::Right:
+-        setIconAlignment((Qt::AlignmentFlags)(AlignTop|AlignRight));
+-        m_movie = new TQMovie(locate("data", "kicker/pics/kmenu_vertical.mng"));
+-        break;
+-    case KPanelApplet::Up:
+-        setIconAlignment((Qt::AlignmentFlags)(AlignTop|AlignHCenter));
+-        m_movie = new TQMovie(locate("data", "kicker/pics/kmenu_basic.mng"));
+-        break;
+-    case KPanelApplet::Down:
+-        setIconAlignment((Qt::AlignmentFlags)(AlignBottom|AlignHCenter));
+-        m_movie = new TQMovie(locate("data", "kicker/pics/kmenu_flipped.mng"));
+-    }
+-
+-    m_movie->connectUpdate(this, TQT_SLOT(updateMovie()));
+-    m_movie->connectStatus(this, TQT_SLOT(slotStatus(int)));
+-    m_movie->connectResize(this, TQT_SLOT(slotSetSize(const TQSize&)));
+-}
+-
+-void KNewButton::slotSetSize(const TQSize& s)
+-{
+-    m_iconSize = s;
+-}
+-
+-double KNewButton::buttonScaleFactor(const TQSize& s) const
+-{
+-    double sf = 1.0;
+-
+-    switch (popupDirection()) {
+-        case KPanelApplet::Left:
+-        case KPanelApplet::Right:
+-//            sf = kMin(double(s.width()) / m_iconSize.height(), double(s.height()) / m_iconSize.width());
+-//            break;
+-        case KPanelApplet::Up:
+-        case KPanelApplet::Down:
+-            sf = kMin(double(s.width()) / m_iconSize.width(), double(s.height()) / m_iconSize.height());
+-            break;
+-    }
+-
+-    if (sf > 0.8) sf = 1.0;
+-    return sf;
+-}
+-
+-int KNewButton::widthForHeight(int height) const
+-{
+-    int r = m_iconSize.width() * buttonScaleFactor(TQSize(m_iconSize.width(), height));
+-
+-    if (!m_movie->running() && height != m_active_pixmap.height())
+-    {
+-        KNewButton* that = const_cast<KNewButton*>(this);
+-        TQTimer::singleShot(0, that, TQT_SLOT(slotStopAnimation()));
+-    }
+- 
+-    return r;
+-}
+-
+-int KNewButton::preferredDimension(int panelDim) const
+-{
+-    return kMax(m_icon.width(), m_icon.height());
+-}
+-
+-int KNewButton::heightForWidth(int width) const
+-{
+-    int r = m_iconSize.width() * buttonScaleFactor(TQSize(width, m_iconSize.height()));
+-    if (!m_movie->running() && width != m_active_pixmap.width())
+-    {
+-        KNewButton* that = const_cast<KNewButton*>(this);
+-        TQTimer::singleShot(0, that, TQT_SLOT(slotStopAnimation()));
+-    }
+-    return r;
+-}
+-
+ bool KNewButton::eventFilter(TQObject *o, TQEvent *e)
+ {
+     if (e->type() == TQEvent::MouseButtonRelease ||
+@@ -223,75 +118,9 @@
+         }
+     }
+ 
+-    if (KickerSettings::kickoffDrawGeekoEye() && e->type() == TQEvent::MouseMove)
+-    {
+-        TQMouseEvent *me = static_cast<TQMouseEvent *>(e);
+-        if ((me->state() & MouseButtonMask) == NoButton) 
+-            drawEye();
+-    }
+-
+     return KButton::eventFilter(o, e);
+ }
+ 
+-void KNewButton::drawEye()
+-{
+-#define eye_x 62
+-#define eye_y 13
+-    TQPoint mouse = TQCursor::pos();
+-    TQPoint me = mapToGlobal(TQPoint(eye_x, eye_y));
+-    double a = atan2(mouse.y() - me.y(), mouse.x() - me.x());
+-    int dx = int(2.1 * cos(a));
+-    int dy = int(2.1 * sin(a));
+-
+-    TQPoint newpos(eye_x+dx,eye_y+dy);
+-    if (newpos!=m_oldPos) {
+-        m_oldPos = newpos;
+-        TQPixmap pixmap = m_active_pixmap;
+-
+-        double sf = 1.0;
+-
+-        if(!m_movie->framePixmap().isNull())
+-        {
+-            pixmap = m_movie->framePixmap();
+-            pixmap.detach();
+-            m_iconSize = pixmap.size();
+-            sf = buttonScaleFactor(size());
+-
+-            if (KickerSettings::kickoffDrawGeekoEye()) {
+-               TQPainter p(&pixmap);
+-               p.setPen(white);
+-               p.setBrush(white);
+-               //      p.setPen(TQColor(110,185,55));
+-               p.drawRect(eye_x+dx, eye_y+dy, 2, 2);
+-               p. end();
+-            }
+-        }
+-
+-        TQWMatrix matrix;
+-        switch (popupDirection()) {
+-        case KPanelApplet::Left:
+-            matrix.scale(sf, -sf);
+-            matrix.rotate(90);
+-            break;
+-        case KPanelApplet::Up:
+-            matrix.scale(sf, sf);
+-            break;
+-        case KPanelApplet::Right:
+-            matrix.scale(sf, -sf);
+-            matrix.rotate(90);
+-            break;
+-        case KPanelApplet::Down:
+-            matrix.scale(sf, sf);
+-            break;
+-        }
+-        m_active_pixmap = pixmap.xForm(matrix);
+-
+-        repaint(false);
+-    }
+-#undef eye_x
+-#undef eye_y
+-}
+-
+ void KNewButton::enterEvent(TQEvent* e)
+ {
+     KButton::enterEvent(e);
+@@ -315,14 +144,6 @@
+     }
+ 
+     m_active = true;
+-    m_movie->unpause();
+-    m_movie->restart();
+-}
+-
+-void KNewButton::rewindMovie()
+-{
+-    m_oldPos = TQPoint( -1, -1 );
+-    m_movie->unpause();
+ }
+ 
+ void KNewButton::dragEnterEvent(TQDragEnterEvent* /*e*/)
+@@ -369,31 +190,11 @@
+     }
+ }
+ 
+-void KNewButton::slotStopAnimation()
+-{
+-    m_active = false;
+-    m_movie->pause();
+-    m_movie->restart();
+-    TQTimer::singleShot(200, this, TQT_SLOT(rewindMovie()));
+-}
+-
+-const TQPixmap& KNewButton::labelIcon() const
+-{
+-    return m_active_pixmap;
+-}
+-
+ void KNewButton::slotExecMenu()
+ {
+-    if (m_openTimer != -1)
+-        killTimer(m_openTimer);
+-
+-    m_openTimer = startTimer(TQApplication::doubleClickInterval() * 3);
+-
+     if (m_active)
+     {
+         m_active = false;
+-        m_movie->pause();
+-        m_movie->restart();
+     }
+ 
+     KButton::slotExecMenu();
+@@ -401,40 +202,11 @@
+     assert(!KickerTip::tippingEnabled());
+     assert(dynamic_cast<KMenu*>(m_popup));
+ 
+-    disconnect(dynamic_cast<KMenu*>(m_popup), TQT_SIGNAL(aboutToHide()), this,
+-            TQT_SLOT(slotStopAnimation()));
+-    connect(dynamic_cast<KMenu*>(m_popup), TQT_SIGNAL(aboutToHide()),
+-            TQT_SLOT(slotStopAnimation()));
+-
+     m_popup->move(KickerLib::popupPosition(popupDirection(), m_popup, this));
+     // I wish KMenu would properly done itself when it closes. But it doesn't.
+ 
+-    bool useEffect = true; // could be TQApplication::isEffectEnabled()
+-    useEffect = false; // too many TQt bugs to be useful
+-    if (m_drag)
+-	useEffect = false;
+-
+     m_drag = false; // once is enough
+-
+-    if (useEffect) 
+-    {
+-        switch (popupDirection()) {
+-        case KPanelApplet::Left:
+-            qScrollEffect(m_popup, QEffects::LeftScroll);
+-            break;
+-        case KPanelApplet::Up:
+-            qScrollEffect(m_popup, QEffects::UpScroll);
+-            break;
+-        case KPanelApplet::Right:
+-            qScrollEffect(m_popup, QEffects::RightScroll);
+-            break;
+-        case KPanelApplet::Down:
+-            qScrollEffect(m_popup, QEffects::DownScroll);
+-            break;
+-        }
+-    }
+-    else
+-        static_cast<KMenu*>(m_popup)->show();
++    static_cast<KMenu*>(m_popup)->show();
+ }
+ 
+ void KNewButton::timerEvent(TQTimerEvent* e)
+@@ -447,9 +219,4 @@
+         killTimer(m_hoverTimer);
+         m_hoverTimer = -1;
+     }
+-    if (e->timerId() == m_openTimer)
+-    {
+-        killTimer(m_openTimer);
+-        m_openTimer = -1;
+-    }
+ }
+--- kdebase/kicker/kicker/buttons/knewbutton.h.ORI	2011-12-08 21:22:24.273573281 +0100
++++ kdebase/kicker/kicker/buttons/knewbutton.h	2011-12-08 21:24:16.791338762 +0100
+@@ -28,7 +28,6 @@
+ 
+ #include "kbutton.h"
+ 
+-#include <tqmovie.h>
+ #include <tqpoint.h>
+ 
+ /**
+@@ -46,23 +45,8 @@
+ 
+     void loadConfig( const KConfigGroup& config );
+ 
+-    virtual const TQPixmap& labelIcon() const;
+-
+-    virtual int widthForHeight(int height) const;
+-    virtual int preferredDimension(int panelDim) const;
+-    virtual int heightForWidth(int width) const;
+-
+     TQColor borderColor() const;
+ 
+-    virtual void setPopupDirection(KPanelApplet::Direction d);
+-
+-private slots:
+-    void slotStatus(int);
+-    void slotSetSize(const TQSize&);
+-    void slotStopAnimation();
+-    void rewindMovie();
+-    void updateMovie();
+-
+ protected:
+     virtual void show();
+     virtual void slotExecMenu();
+@@ -78,16 +62,13 @@
+     void timerEvent(TQTimerEvent*);
+ 
+ private:
+-    void drawEye();
+-    double buttonScaleFactor(const TQSize& s) const;
+-
+-    TQMovie* m_movie;
++	void drawButton(TQPainter *p);
+     TQPixmap m_active_pixmap;
+     TQPoint m_oldPos;
+     TQSize m_iconSize;
+     TQRect m_sloppyRegion;
+-    int m_hoverTimer;
+     int m_openTimer;
++    int m_hoverTimer;
+     bool m_active;
+     bool m_mouseInside;
+     bool m_drag;
+--- kdebase/kicker/kicker/ui/k_new_mnu.cpp.ORI	2011-12-08 21:24:57.071572016 +0100
++++ kdebase/kicker/kicker/ui/k_new_mnu.cpp	2011-12-08 21:25:54.300324465 +0100
+@@ -1700,8 +1700,6 @@
+         TQPixmap pix( 64, footer->height() );
+         TQPainter p( &pix );
+         p.fillRect( 0, 0, 64, footer->height(), m_branding->colorGroup().brush( TQColorGroup::Base ) );
+-        p.fillRect( 0, m_orientation == BottomUp ? footer->height() - 2 : 0,
+-                64, 3, KNewButton::self()->borderColor() );
+         p.end();
+         footer->setPaletteBackgroundPixmap( pix );
+     }
+@@ -3501,6 +3499,8 @@
+         m_systemView->insertItem( iconName, userLabel.isEmpty() ? label : userLabel,
+                                   descr, "system:/media/" + name, nId++, -1 );
+ 
++        ++it;
++        ++it;
+         ++it; // skip separator
+     }
+ }
diff --git a/redhat/kdebase/kdebase-3.5.12-kio_man_utf8.patch b/redhat/kdebase/kdebase-3.5.12-kio_man_utf8.patch
new file mode 100644
index 000000000..a85f0286d
--- /dev/null
+++ b/redhat/kdebase/kdebase-3.5.12-kio_man_utf8.patch
@@ -0,0 +1,40 @@
+--- kdebase/kioslave/man/kio_man.cpp.orig	2010-08-13 00:37:38.000000000 +0200
++++ kdebase/kioslave/man/kio_man.cpp	2011-12-08 21:10:25.720324499 +0100
+@@ -569,20 +569,24 @@
+         }
+         lastdir = filename.left(filename.findRev('/'));
+     
+-        myStdStream = TQString::null;
+-        KProcess proc;
+-        /* TODO: detect availability of 'man --recode' so that this can go
+-         * upstream */
+-        proc << "man" << "--recode" << "UTF-8" << filename;
+-
+-        TQApplication::connect(&proc, TQT_SIGNAL(receivedStdout (KProcess *, char *, int)),
+-                              this, TQT_SLOT(slotGetStdOutputUtf8(KProcess *, char *, int)));
+-        proc.start(KProcess::Block, KProcess::All);
+-
+-        const TQCString cstr=myStdStream.utf8();
+-        const int len = cstr.size()-1;
++        QIODevice *fd= KFilterDev::deviceForFile(filename);
++    
++        if ( !fd || !fd->open(IO_ReadOnly))
++        {
++           delete fd;
++           return 0;
++        }
++        QByteArray array(fd->readAll());
++        kdDebug(7107) << "read " << array.size() << endl;
++        fd->close();
++        delete fd;
++        
++        if (array.isEmpty())
++            return 0;
++    
++        const int len = array.size();
+         buf = new char[len + 4];
+-        qmemmove(buf + 1, cstr.data(), len);
++        qmemmove(buf + 1, array.data(), len);
+         buf[0]=buf[len]='\n'; // Start and end with a end of line
+         buf[len+1]=buf[len+2]='\0'; // Two NUL characters at end
+     }
diff --git a/redhat/kdebase/kdebase-3.5.12-konq_menu_tab_background.patch b/redhat/kdebase/kdebase-3.5.12-konq_menu_tab_background.patch
new file mode 100644
index 000000000..442486efa
--- /dev/null
+++ b/redhat/kdebase/kdebase-3.5.12-konq_menu_tab_background.patch
@@ -0,0 +1,136 @@
+diff -Nuar kcontrol.ORI/konqhtml/advancedTabDialog.cpp kcontrol/konqhtml/advancedTabDialog.cpp
+--- kdebase/kcontrol.ORI/konqhtml/advancedTabDialog.cpp	2011-12-09 23:45:04.676253975 +0100
++++ kdebase/kcontrol/konqhtml/advancedTabDialog.cpp	2011-12-09 23:46:28.239256986 +0100
+@@ -58,7 +58,6 @@
+     layout->addSpacing( 20 );
+     layout->addStretch();
+ 
+-    connect(m_advancedWidget->m_pNewTabsInBackground, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+     connect(m_advancedWidget->m_pOpenAfterCurrentPage, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+     connect(m_advancedWidget->m_pTabConfirm, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+     connect(m_advancedWidget->m_pTabCloseActivatePrevious, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+@@ -76,7 +75,6 @@
+ void advancedTabDialog::load()
+ {
+     m_pConfig->setGroup("FMSettings");
+-    m_advancedWidget->m_pNewTabsInBackground->setChecked( ! (m_pConfig->readBoolEntry( "NewTabsInFront", false )) );
+     m_advancedWidget->m_pOpenAfterCurrentPage->setChecked( m_pConfig->readBoolEntry( "OpenAfterCurrentPage", false ) );
+     m_advancedWidget->m_pPermanentCloseButton->setChecked( m_pConfig->readBoolEntry( "PermanentCloseButton", false ) );
+     m_advancedWidget->m_pKonquerorTabforExternalURL->setChecked( m_pConfig->readBoolEntry( "KonquerorTabforExternalURL", false ) );
+@@ -92,7 +90,6 @@
+ void advancedTabDialog::save()
+ {
+     m_pConfig->setGroup("FMSettings");
+-    m_pConfig->writeEntry( "NewTabsInFront", !(m_advancedWidget->m_pNewTabsInBackground->isChecked()) );
+     m_pConfig->writeEntry( "OpenAfterCurrentPage", m_advancedWidget->m_pOpenAfterCurrentPage->isChecked() );
+     m_pConfig->writeEntry( "PermanentCloseButton", m_advancedWidget->m_pPermanentCloseButton->isChecked() );
+     m_pConfig->writeEntry( "KonquerorTabforExternalURL", m_advancedWidget->m_pKonquerorTabforExternalURL->isChecked() );
+diff -Nuar kcontrol.ORI/konqhtml/advancedTabOptions.ui kcontrol/konqhtml/advancedTabOptions.ui
+--- kdebase/kcontrol.ORI/konqhtml/advancedTabOptions.ui	2011-12-09 23:45:04.674267416 +0100
++++ kdebase/kcontrol/konqhtml/advancedTabOptions.ui	2011-12-09 23:56:01.440255647 +0100
+@@ -62,6 +62,17 @@
+                 </widget>
+                 <widget class="QCheckBox">
+                     <property name="name">
++                        <cstring>m_pNewTabsInBackground</cstring>
++                    </property>
++                    <property name="text">
++                        <string>O&amp;pen new tabs in the background</string>
++                    </property>
++                    <property name="whatsThis" stdset="0">
++                        <string>This will open a new tab in the background, instead of in the foreground.</string>
++                    </property>
++                </widget>
++                <widget class="QCheckBox">
++                    <property name="name">
+                         <cstring>m_pOpenAfterCurrentPage</cstring>
+                     </property>
+                     <property name="text">
+diff -Nuar konqueror.ORI/konq_guiclients.cc konqueror/konq_guiclients.cc
+--- kdebase/konqueror.ORI/konq_guiclients.cc	2011-12-09 23:44:28.950255993 +0100
++++ kdebase/konqueror/konq_guiclients.cc	2011-12-09 23:49:31.432261289 +0100
+@@ -115,6 +115,11 @@
+         openInTabElement.setAttribute( "group", "tabhandling" );
+         menu.appendChild( openInTabElement );
+ 
++        TQDomElement openInTabFrontElement = m_doc.createElement( "action" );
++        openInTabFrontElement.setAttribute( "name", "openintabfront" );
++        openInTabFrontElement.setAttribute( "group", "tabhandling" );
++        menu.appendChild( openInTabFrontElement );
++
+         TQDomElement separatorElement = m_doc.createElement( "separator" );
+         separatorElement.setAttribute( "group", "tabhandling" );
+         menu.appendChild( separatorElement );
+diff -Nuar konqueror.ORI/konq_mainwindow.cc konqueror/konq_mainwindow.cc
+--- kdebase/konqueror.ORI/konq_mainwindow.cc	2011-12-09 23:44:29.030265039 +0100
++++ kdebase/konqueror/konq_mainwindow.cc	2011-12-09 23:54:27.518255409 +0100
+@@ -2727,6 +2727,14 @@
+     openURL( 0L, popupItems.getFirst()->url() );
+ }
+ 
++void KonqMainWindow::slotPopupNewTabAtFront()
++{
++    KConfig *config = KGlobal::config();
++    KConfigGroupSaver cs( config, TQString::fromLatin1("FMSettings") );
++    bool openAfterCurrentPage = config->readBoolEntry( "OpenAfterCurrentPage", false );
++    popupNewTab(true, openAfterCurrentPage);
++}
++
+ void KonqMainWindow::slotPopupNewTab()
+ {
+     bool openAfterCurrentPage = KonqSettings::openAfterCurrentPage();
+@@ -2735,7 +2743,7 @@
+     if (KApplication::keyboardMouseState() & Qt::ShiftButton)
+       newTabsInFront = !newTabsInFront;
+ 
+-    popupNewTab(newTabsInFront, openAfterCurrentPage);
++    popupNewTab(false, openAfterCurrentPage);
+ }
+ 
+ void KonqMainWindow::slotPopupNewTabRight()
+@@ -2755,16 +2763,12 @@
+   KFileItemListIterator it ( popupItems );
+   KonqOpenURLRequest req;
+   req.newTab = true;
+-  req.newTabInFront = false;
++  req.newTabInFront = infront;
+   req.openAfterCurrentPage = openAfterCurrentPage;
+   req.args = popupUrlArgs;
+ 
+   for ( ; it.current(); ++it )
+   {
+-    if ( infront && it.atLast() )
+-    {
+-      req.newTabInFront = true;
+-    }
+     openURL( 0L, (*it)->url(), TQString::null, req );
+   }
+ }
+@@ -4783,8 +4787,14 @@
+       else
+         tab_new_x = "tab_new_bg" ;
+ 
+-      actNewTab = new KAction( i18n( "Open in &New Tab" ), tab_new_x, 0, this, TQT_SLOT( slotPopupNewTab() ), konqyMenuClient->actionCollection(), "openintab" );
+-      actNewTab->setToolTip( i18n( "Open the document in a new tab" ) );
++      KAction *actNewTab = new KAction( i18n( "Open in &Background Tab" ), "tab_new_bg", 0, this, TQT_SLOT( slotPopupNewTab() ), actionCollection(), "openintab" );
++      actNewTab->setStatusText( i18n( "Open the document in a new background tab" ) );
++      KAction *actNewTabFront = new KAction( i18n( "Open in &New Tab" ), "tab_new", 0, this, TQT_SLOT( slotPopupNewTabAtFront() ), actionCollection(), "openintabfront" );
++      actNewTabFront->setStatusText( i18n( "Open the document in a new foreground tab" ) );
++      actNewTab = new KAction( i18n( "Open in &Background Tab" ), tab_new_x, 0, this, TQT_SLOT( slotPopupNewTab() ), konqyMenuClient->actionCollection(), "openintab" );
++      actNewTabFront = new KAction( i18n( "Open in &New Tab" ), tab_new_x, 0, this, TQT_SLOT( slotPopupNewTabAtFront() ), konqyMenuClient->actionCollection(), "openintabfront" );
++      actNewTab->setToolTip( i18n( "Open the document in a new background tab" ) );
++      actNewTabFront->setToolTip( i18n( "Open the document in a new foreground tab" ) );
+       doTabHandling = true;
+   }
+ 
+diff -Nuar konqueror.ORI/konq_mainwindow.h konqueror/konq_mainwindow.h
+--- kdebase/konqueror.ORI/konq_mainwindow.h	2011-12-09 23:44:28.941260682 +0100
++++ kdebase/konqueror/konq_mainwindow.h	2011-12-09 23:54:57.772255487 +0100
+@@ -444,6 +444,7 @@
+   void slotPopupNewWindow();
+   void slotPopupThisWindow();
+   void slotPopupNewTab();
++  void slotPopupNewTabAtFront();
+   void slotPopupNewTabRight();
+   void slotPopupPasteTo();
+   void slotRemoveView();
diff --git a/redhat/kdebase/kdebase-3.5.12-startkde_directories.patch b/redhat/kdebase/kdebase-3.5.12-startkde_directories.patch
new file mode 100644
index 000000000..393903059
--- /dev/null
+++ b/redhat/kdebase/kdebase-3.5.12-startkde_directories.patch
@@ -0,0 +1,19 @@
+--- kdebase/startkde.ORI	2011-12-11 18:55:25.873027885 +0100
++++ kdebase/startkde	2011-12-11 18:56:37.885065246 +0100
+@@ -144,14 +144,14 @@
+ fi
+ if [ -d /opt/kde3 ]; then
+   if [ -n "$KDEDIRS" ]; then
+-    export KDEDIRS=$KDEDIRS:/opt/kde3/:/usr/
++    export KDEDIRS=/opt/kde3/:$KDEDIRS:/usr/
+   else
+     export KDEDIRS=/opt/kde3/:/usr/
+   fi
+ fi
+ if [ -d /opt/trinity ]; then
+   if [ -n "$KDEDIRS" ]; then
+-    export KDEDIRS=$KDEDIRS:/opt/trinity/:/usr/
++    export KDEDIRS=/opt/trinity/:$KDEDIRS:/usr/
+   else
+     export KDEDIRS=/opt/trinity/:/usr/
+   fi
diff --git a/redhat/kdebase/kdebase-3.5.13-kickoff_unstable.patch b/redhat/kdebase/kdebase-3.5.13-kickoff_unstable.patch
index 7b8b649e1..00a0d4b64 100644
--- a/redhat/kdebase/kdebase-3.5.13-kickoff_unstable.patch
+++ b/redhat/kdebase/kdebase-3.5.13-kickoff_unstable.patch
@@ -1,4 +1,3 @@
-Binary files kdebase/kicker/data/kickoff/resize_handle.png and kdebase1/kicker/data/kickoff/resize_handle.png differ
 diff -ur kdebase/kicker/kicker/buttons/knewbutton.cpp kdebase1/kicker/kicker/buttons/knewbutton.cpp
 --- kdebase/kicker/kicker/buttons/knewbutton.cpp	2011-08-11 01:25:50.000000000 -0400
 +++ kdebase1/kicker/kicker/buttons/knewbutton.cpp	2011-11-18 12:54:22.380404540 -0500
@@ -34,7 +33,7 @@ diff -ur kdebase/kicker/kicker/buttons/knewbutton.cpp kdebase1/kicker/kicker/but
      TQApplication::desktop()->screen()->installEventFilter(this);
 -    setMouseTracking(true);
 +
-+  if (KickerSettings::showKMenuText())
++    if (KickerSettings::showKMenuText())
 +    {
 +        setButtonText(KickerSettings::kMenuText());
 +        setFont(KickerSettings::buttonFont());
diff --git a/redhat/kdebase/kdebase-3.5.13-kio_man_utf8.patch b/redhat/kdebase/kdebase-3.5.13-kio_man_utf8.patch
new file mode 100644
index 000000000..dfe65563a
--- /dev/null
+++ b/redhat/kdebase/kdebase-3.5.13-kio_man_utf8.patch
@@ -0,0 +1,40 @@
+--- kdebase/kioslave/man/kio_man.cpp.ORI	2011-12-03 00:22:28.400423296 +0100
++++ kdebase/kioslave/man/kio_man.cpp	2011-12-03 00:25:59.127173102 +0100
+@@ -569,20 +569,24 @@
+         }
+         lastdir = filename.left(filename.findRev('/'));
+     
+-        myStdStream = TQString::null;
+-        KProcess proc;
+-        /* TODO: detect availability of 'man --recode' so that this can go
+-         * upstream */
+-        proc << "man" << "--recode" << "UTF-8" << filename;
+-
+-        TQApplication::connect(&proc, TQT_SIGNAL(receivedStdout (KProcess *, char *, int)),
+-                              this, TQT_SLOT(slotGetStdOutputUtf8(KProcess *, char *, int)));
+-        proc.start(KProcess::Block, KProcess::All);
+-
+-        const TQCString cstr=myStdStream.utf8();
+-        const int len = cstr.size()-1;
++        TQIODevice *fd= KFilterDev::deviceForFile(filename);
++    
++        if ( !fd || !fd->open(IO_ReadOnly))
++        {
++           delete fd;
++           return 0;
++        }
++        TQByteArray array(fd->readAll());
++        kdDebug(7107) << "read " << array.size() << endl;
++        fd->close();
++        delete fd;
++        
++        if (array.isEmpty())
++            return 0;
++    
++        const int len = array.size();
+         buf = new char[len + 4];
+-        tqmemmove(buf + 1, cstr.data(), len);
++        tqmemmove(buf + 1, array.data(), len);
+         buf[0]=buf[len]='\n'; // Start and end with a end of line
+         buf[len+1]=buf[len+2]='\0'; // Two NUL characters at end
+     }
diff --git a/redhat/kdebase/kdebase-3.5.13-konq_menu_tab_background.patch b/redhat/kdebase/kdebase-3.5.13-konq_menu_tab_background.patch
new file mode 100644
index 000000000..483b259c1
--- /dev/null
+++ b/redhat/kdebase/kdebase-3.5.13-konq_menu_tab_background.patch
@@ -0,0 +1,160 @@
+diff -urN /dev/shm/kdebase/kcontrol/konqhtml/advancedTabDialog.cpp /dev/shm/kdebase.new/kcontrol/konqhtml/advancedTabDialog.cpp
+--- kdebase/kcontrol/konqhtml/advancedTabDialog.cpp	2011-03-12 00:57:45.000000000 -0600
++++ kdebase.new/kcontrol/konqhtml/advancedTabDialog.cpp	2011-12-03 17:25:40.297586593 -0600
+@@ -58,7 +58,6 @@
+     layout->addSpacing( 20 );
+     layout->addStretch();
+ 
+-    connect(m_advancedWidget->m_pNewTabsInBackground, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+     connect(m_advancedWidget->m_pOpenAfterCurrentPage, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+     connect(m_advancedWidget->m_pTabConfirm, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+     connect(m_advancedWidget->m_pTabCloseActivatePrevious, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+@@ -76,7 +75,6 @@
+ void advancedTabDialog::load()
+ {
+     m_pConfig->setGroup("FMSettings");
+-    m_advancedWidget->m_pNewTabsInBackground->setChecked( ! (m_pConfig->readBoolEntry( "NewTabsInFront", false )) );
+     m_advancedWidget->m_pOpenAfterCurrentPage->setChecked( m_pConfig->readBoolEntry( "OpenAfterCurrentPage", false ) );
+     m_advancedWidget->m_pPermanentCloseButton->setChecked( m_pConfig->readBoolEntry( "PermanentCloseButton", false ) );
+     m_advancedWidget->m_pKonquerorTabforExternalURL->setChecked( m_pConfig->readBoolEntry( "KonquerorTabforExternalURL", false ) );
+@@ -92,7 +90,6 @@
+ void advancedTabDialog::save()
+ {
+     m_pConfig->setGroup("FMSettings");
+-    m_pConfig->writeEntry( "NewTabsInFront", !(m_advancedWidget->m_pNewTabsInBackground->isChecked()) );
+     m_pConfig->writeEntry( "OpenAfterCurrentPage", m_advancedWidget->m_pOpenAfterCurrentPage->isChecked() );
+     m_pConfig->writeEntry( "PermanentCloseButton", m_advancedWidget->m_pPermanentCloseButton->isChecked() );
+     m_pConfig->writeEntry( "KonquerorTabforExternalURL", m_advancedWidget->m_pKonquerorTabforExternalURL->isChecked() );
+diff -urN /dev/shm/kdebase/kcontrol/konqhtml/advancedTabOptions.ui /dev/shm/kdebase.new/kcontrol/konqhtml/advancedTabOptions.ui
+--- kdebase/kcontrol/konqhtml/advancedTabOptions.ui	2011-03-12 00:57:45.000000000 -0600
++++ kdebase.new/kcontrol/konqhtml/advancedTabOptions.ui	2011-12-03 17:24:25.987334444 -0600
+@@ -51,17 +51,6 @@
+                 </property>
+                 <widget class="TQCheckBox">
+                     <property name="name">
+-                        <cstring>m_pNewTabsInBackground</cstring>
+-                    </property>
+-                    <property name="text">
+-                        <string>O&amp;pen new tabs in the background</string>
+-                    </property>
+-                    <property name="whatsThis" stdset="0">
+-                        <string>This will open a new tab in the background, instead of in the foreground.</string>
+-                    </property>
+-                </widget>
+-                <widget class="TQCheckBox">
+-                    <property name="name">
+                         <cstring>m_pOpenAfterCurrentPage</cstring>
+                     </property>
+                     <property name="text">
+diff -urN /dev/shm/kdebase/konqueror/konq_guiclients.cc /dev/shm/kdebase.new/konqueror/konq_guiclients.cc
+--- kdebase/konqueror/konq_guiclients.cc	2011-08-11 00:25:53.000000000 -0500
++++ kdebase.new/konqueror/konq_guiclients.cc	2011-12-03 17:24:25.987334444 -0600
+@@ -104,8 +104,8 @@
+         openInSameWindow.setAttribute( "name", "sameview" );
+         openInSameWindow.setAttribute( "group", "tabhandling" );
+         menu.appendChild( openInSameWindow );
+-        
+-	TQDomElement openInWindow = m_doc.createElement( "action" );
++
++	      TQDomElement openInWindow = m_doc.createElement( "action" );
+         openInWindow.setAttribute( "name", "newview" );
+         openInWindow.setAttribute( "group", "tabhandling" );
+         menu.appendChild( openInWindow );
+@@ -115,6 +115,11 @@
+         openInTabElement.setAttribute( "group", "tabhandling" );
+         menu.appendChild( openInTabElement );
+ 
++        TQDomElement openInTabFrontElement = m_doc.createElement( "action" );
++        openInTabFrontElement.setAttribute( "name", "openintabfront" );
++        openInTabFrontElement.setAttribute( "group", "tabhandling" );
++        menu.appendChild( openInTabFrontElement );
++
+         TQDomElement separatorElement = m_doc.createElement( "separator" );
+         separatorElement.setAttribute( "group", "tabhandling" );
+         menu.appendChild( separatorElement );
+diff -urN /dev/shm/kdebase/konqueror/konq_mainwindow.cc /dev/shm/kdebase.new/konqueror/konq_mainwindow.cc
+--- kdebase/konqueror/konq_mainwindow.cc	2011-08-20 02:14:06.000000000 -0500
++++ kdebase.new/konqueror/konq_mainwindow.cc	2011-12-03 17:24:25.994334609 -0600
+@@ -2726,15 +2726,23 @@
+     openURL( 0L, popupItems.getFirst()->url() );
+ }
+ 
++void KonqMainWindow::slotPopupNewTabAtFront()
++{
++    KConfig *config = KGlobal::config();
++    KConfigGroupSaver cs( config, TQString::fromLatin1("FMSettings") );
++    bool openAfterCurrentPage = config->readBoolEntry( "OpenAfterCurrentPage", false );
++    popupNewTab(true, openAfterCurrentPage);
++}
++
+ void KonqMainWindow::slotPopupNewTab()
+ {
+     bool openAfterCurrentPage = KonqSettings::openAfterCurrentPage();
+     bool newTabsInFront = KonqSettings::newTabsInFront();
+ 
+-    if (KApplication::keyboardMouseState() & TQt::ShiftButton)
++    if (KApplication::keyboardMouseState() & ShiftButton)
+       newTabsInFront = !newTabsInFront;
+ 
+-    popupNewTab(newTabsInFront, openAfterCurrentPage);
++    popupNewTab(false, openAfterCurrentPage);
+ }
+ 
+ void KonqMainWindow::slotPopupNewTabRight()
+@@ -2754,17 +2762,13 @@
+   KFileItemListIterator it ( popupItems );
+   KonqOpenURLRequest req;
+   req.newTab = true;
+-  req.newTabInFront = false;
++  req.newTabInFront = infront;
+   req.openAfterCurrentPage = openAfterCurrentPage;
+   req.args = popupUrlArgs;
+ 
+   for ( ; it.current(); ++it )
+   {
+-    if ( infront && it.atLast() )
+-    {
+-      req.newTabInFront = true;
+-    }
+-    openURL( 0L, (*it)->url(), TQString::null, req );
++    openURL( 0L, (*it)->url(), QString::null, req );
+   }
+ }
+ 
+@@ -3926,7 +3930,7 @@
+   reloadShortcut.append(KKey(CTRL + Key_R));
+   m_paReload = new KAction( i18n( "&Reload" ), "reload", reloadShortcut, TQT_TQOBJECT(this), TQT_SLOT( slotReload() ), actionCollection(), "reload" );
+   m_paReloadAllTabs = new KAction( i18n( "&Reload All Tabs" ), "reload_all_tabs", SHIFT+Key_F5, TQT_TQOBJECT(this), TQT_SLOT( slotReloadAllTabs() ), actionCollection(), "reload_all_tabs" );
+-  
++
+   m_paReloadStop = new KAction( i18n( "&Reload/Stop" ), "reload", 0, TQT_TQOBJECT(this), TQT_SLOT( slotReloadStop() ), actionCollection(), "reload_stop" );
+ 
+   m_paUndo = KStdAction::undo( KonqUndoManager::self(), TQT_SLOT( undo() ), actionCollection(), "undo" );
+@@ -4782,8 +4786,14 @@
+       else
+         tab_new_x = "tab_new_bg" ;
+ 
+-      actNewTab = new KAction( i18n( "Open in &New Tab" ), tab_new_x, 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTab() ), konqyMenuClient->actionCollection(), "openintab" );
+-      actNewTab->setToolTip( i18n( "Open the document in a new tab" ) );
++      KAction *actNewTab = new KAction( i18n( "Open in &Background Tab" ), "tab_new_bg", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTab() ), actionCollection(), "openintab" );
++      actNewTab->setStatusText( i18n( "Open the document in a new background tab" ) );
++      KAction *actNewTabFront = new KAction( i18n( "Open in &New Tab" ), "tab_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTabAtFront() ), actionCollection(), "openintabfront" );
++      actNewTabFront->setStatusText( i18n( "Open the document in a new foreground tab" ) );
++      actNewTab = new KAction( i18n( "Open in &Background Tab" ), tab_new_x, 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTab() ), konqyMenuClient->actionCollection(), "openintab" );
++      actNewTabFront = new KAction( i18n( "Open in &New Tab" ), tab_new_x, 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTabAtFront() ), konqyMenuClient->actionCollection(), "openintabfront" );
++      actNewTab->setToolTip( i18n( "Open the document in a new background tab" ) );
++      actNewTabFront->setToolTip( i18n( "Open the document in a new foreground tab" ) );
+       doTabHandling = true;
+   }
+ 
+diff -urN /dev/shm/kdebase/konqueror/konq_mainwindow.h /dev/shm/kdebase.new/konqueror/konq_mainwindow.h
+--- kdebase/konqueror/konq_mainwindow.h	2011-03-12 00:58:18.000000000 -0600
++++ kdebase.new/konqueror/konq_mainwindow.h	2011-12-03 17:24:25.995334564 -0600
+@@ -444,6 +444,7 @@
+   void slotPopupNewWindow();
+   void slotPopupThisWindow();
+   void slotPopupNewTab();
++  void slotPopupNewTabAtFront();
+   void slotPopupNewTabRight();
+   void slotPopupPasteTo();
+   void slotRemoveView();
diff --git a/redhat/kdebase/kdebase-3.5.13-konqsidebar_documents.patch b/redhat/kdebase/kdebase-3.5.13-konqsidebar_documents.patch
new file mode 100644
index 000000000..e6076a12e
--- /dev/null
+++ b/redhat/kdebase/kdebase-3.5.13-konqsidebar_documents.patch
@@ -0,0 +1,11 @@
+--- kdebase/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp.ORI	2011-12-10 15:07:43.171011925 +0100
++++ kdebase/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp	2011-12-10 15:07:48.000797355 +0100
+@@ -400,7 +400,7 @@
+     kdDebug(1201) << this << " KonqSidebarDirTreeModule::slotNewItems " << entries.count() << endl;
+ 
+     Q_ASSERT(entries.count());
+-    KFileItem * firstItem = const_cast<KFileItemList&>(entries).first(); // qlist sucks for constness
++    KFileItem * firstItem = const_cast<KFileItemList&>(entries).last(); // qlist sucks for constness
+ 
+     // Find parent item - it's the same for all the items
+     KURL dir( firstItem->url().url(-1) );
diff --git a/redhat/kdebase/kdebase-3.5.13-startkde_directories.patch b/redhat/kdebase/kdebase-3.5.13-startkde_directories.patch
new file mode 100644
index 000000000..27826bda2
--- /dev/null
+++ b/redhat/kdebase/kdebase-3.5.13-startkde_directories.patch
@@ -0,0 +1,95 @@
+--- kdebase/startkde.ORI	2011-12-11 18:17:16.287267447 +0100
++++ kdebase/startkde	2011-12-11 18:35:05.876764598 +0100
+@@ -74,39 +74,10 @@
+   echo "[startkde] KDEHOME is preset to $KDEHOME." 1>&2
+   export KDEHOME=$KDEHOME
+ else
+-  # $KDEHOME is NOT already preset in the environment. Try to help.
+-  # This might be overkill but does provide flexibility.
++  # $KDEHOME is NOT already preset in the environment.
++  # We always use ~/.trinity as default.
+   echo "[startkde] KDEHOME is not set." 1>&2
+-  if [ -d $HOME/.trinity ]; then
+-    # OK, this one is obvious.
+-    export KDEHOME=$HOME/.trinity
+-  elif [ -d $HOME/.trinity ]; then
+-    # Looks like the user had an old version of Trinity installed at last login
+-    echo "[startkde] Migrating old ~/.trinity directory to new ~/.trinity name." 1>&2
+-    mv $HOME/.trinity $HOME/.trinity
+-    export KDEHOME=$HOME/.trinity
+-  elif [ -f /usr/bin/kde4-config ]; then
+-    # Looks like KDE4 is installed.
+-    if [ -d $HOME/.kde ] && [ ! -d $HOME/.trinity ]; then
+-      # Presume $HOME/.kde is being used for KDE4 as it already exists.
+-      export KDEHOME=$HOME/.trinity
+-    else
+-      # Presume $HOME/.kde is being used for KDE4 to be on the safe side.
+-      export KDEHOME=$HOME/.trinity
+-    fi
+-  elif [ -f /opt/trinity/bin/kde-config ]; then
+-    # Looks like KDE3 or Trinity is installed and playing second fiddle to KDE4.
+-    export KDEHOME=$HOME/.trinity
+-  elif [ -f /opt/trinity/bin/kde-config ]; then
+-    # Looks like KDE3 or Trinity is installed and playing second fiddle to KDE4.
+-    export KDEHOME=$HOME/.trinity
+-  elif [ -f /usr/bin/kde-config ] && [ -d $HOME/.kde ]; then
+-    # Looks like KDE3 or Trinity is installed and not playing second fiddle to KDE4.
+-    export KDEHOME=$HOME/.kde
+-  else
+-    # Resort to this and hope for the best!
+-    export KDEHOME=$HOME/.trinity
+-  fi
++  export KDEHOME=$HOME/.trinity
+   echo "[startkde] Set KDEHOME to $KDEHOME." 1>&2
+ fi
+ 
+@@ -123,43 +94,20 @@
+ if [ -d /opt/trinity/bin ]; then
+   export PATH=/opt/trinity/bin:$PATH
+ fi
+-if [ -d /opt/trinity/games ]; then
+-  export PATH=/opt/trinity/games:$PATH
+-fi
+-if [ -d /opt/trinity/bin ]; then
+-  export PATH=/opt/trinity/bin:$PATH
+-fi
+-if [ -d /opt/trinity/share ]; then
+-  export XDG_DATA_DIRS=$XDG_DATA_DIRS:/opt/trinity/share/:/usr/share/
+-fi
+ if [ -d /opt/trinity/share ]; then
+-  export XDG_DATA_DIRS=$XDG_DATA_DIRS:/opt/trinity/share/:/usr/share/
++  # Do NOT add /usr/share, it is supposed to be already there !
++  export XDG_DATA_DIRS=$XDG_DATA_DIRS:/opt/trinity/share/
+ fi
+ if [ -d /opt/trinity/etc/xdg ]; then
+-  export XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:/opt/trinity/etc/xdg/:/etc/xdg/
+-fi
+-if [ -d /opt/trinity/etc/xdg ]; then
+-  export XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:/opt/trinity/etc/xdg/:/etc/xdg/
++  # Do NOT add /etc/xdg, it is supposed to be already there !
++  export XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:/opt/trinity/etc/xdg/
+ fi
+ if [ -d /opt/trinity/share/man ]; then
+   export MANPATH=/opt/trinity/share/man:$MANPATH
+ fi
+-if [ -d /opt/trinity/share/man ]; then
+-  export MANPATH=/opt/trinity/share/man:$MANPATH
+-fi
+-if [ -d /opt/trinity ]; then
+-  if [ -n "$KDEDIRS" ]; then
+-    export KDEDIRS=$KDEDIRS:/opt/trinity/:/usr/
+-  else
+-    export KDEDIRS=/opt/trinity/:/usr/
+-  fi
+-fi
+ if [ -d /opt/trinity ]; then
+-  if [ -n "$KDEDIRS" ]; then
+-    export KDEDIRS=$KDEDIRS:/opt/trinity/:/usr/
+-  else
+-    export KDEDIRS=/opt/trinity/:/usr/
+-  fi
++  # The TDE directory should appear BEFORE '/usr' in KDEDIRS variable !
++  export KDEDIRS=${KDEDIR}/:${KDEDIRS}
+ fi
+ 
+ test -n "$KDEHOME" && kdehome=`echo "$KDEHOME" | sed "s,^~/,$HOME/,"`
diff --git a/redhat/kdebase/trinity-kdebase-3.5.12.spec b/redhat/kdebase/trinity-kdebase-3.5.12.spec
index 1e0b0e18b..721c1d781 100644
--- a/redhat/kdebase/trinity-kdebase-3.5.12.spec
+++ b/redhat/kdebase/trinity-kdebase-3.5.12.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.12
 %endif
-%define release 12
+%define release 13
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -53,57 +53,86 @@ Patch1:		http://www.trinitydesktop.org/patches/r1201523.diff
 # [kdebase/kcontrol] make it compatible with openssl < 1.0 
 Patch2:		http://www.trinitydesktop.org/patches/r1201705.diff
 # Fix My Documents shortcut on desktop
-Patch4:		http://www.trinitydesktop.org/patches/r1182808.diff
+Patch3:		http://www.trinitydesktop.org/patches/r1182808.diff
 # [kdebase] fixed an incompatibility with gcc 4.5 
-Patch8:		http://www.trinitydesktop.org/patches/r1221326.diff
+Patch4:		http://www.trinitydesktop.org/patches/r1221326.diff
 
 # TDE Official patches (from SVN), modified
 # [kdebase/ksmserver/shutdowndlg.cpp] Fixed invalid constructor per GCC 4.5.2
-Patch12:	kdebase-3.5.12-r1220975.patch
+Patch5:	kdebase-3.5.12-r1220975.patch
 # [kdebase] Another invalid constructor per gcc 4.5
-Patch9:		kdebase-3.5.12-r1220927.patch
+Patch6:		kdebase-3.5.12-r1220927.patch
+
+# TDE unofficial patches, fixing FTBFS
+## Fix for DBUS include files in RHEL6
+Patch7:		kdebase-3.5.12-shutdowndlg-dbus-include.patch
+## [kdebase/kcontrol]: disable components that depends of krandr (old distros)
+Patch8:		kdebase-3.5.12-disable-krandr.patch
 
 # TDE for RHEL/Fedora specific patches
 ## [kdebase/kdesu] Remove 'ignore' button on 'kdesu' dialog box
-Patch3:		kdebase-3.5.12-kdesu-noignorebutton.patch
-## [kdebase/kdesktop] Modifies "open terminal here" on desktop
-Patch5:		kdebase-3.5.12-desktop-openterminalhere.patch
+Patch10:	kdebase-3.5.12-kdesu-noignorebutton.patch
+## [kdebase/kdesktop] Modifies 'open terminal here' on desktop
+Patch11:	kdebase-3.5.12-desktop-openterminalhere.patch
 ## [kdebase/kioslave] Forces HAL backend to use HAL mount options
-Patch6:		kdebase-3.5.12-halmountoptions.patch
+Patch12:	kdebase-3.5.12-halmountoptions.patch
 ## [kdebase/kdm/kfrontend] Global Xsession file is '/etc/X11/xinit/Xsession'
-Patch7:		kdebase-3.5.13-genkdmconf_Xsession_location.patch
+Patch13:	kdebase-3.5.13-genkdmconf_Xsession_location.patch
+## [kdebase/kicker/kicker/ui] Fix kickoff menu issues
+Patch14:	kdebase-3.5.12-kickoff_unstable.patch
 ## [kdebase/startkde] Sets default Start Icon in 'kickerrc'
-Patch11:	kdebase-3.5.13-startkde_icon.patch
-
-# TDE 3.5.12 patches
-# Fix for DBUS include files in RHEL6
-Patch0:		kdebase-3.5.12-shutdowndlg-dbus-include.patch
-# [kdebase/kcontrol]: disable components that depends of krandr (old distros)
-Patch100:	kdebase-3.5.12-disable-krandr.patch
-
+Patch15:	kdebase-3.5.13-startkde_icon.patch
+## [kdebase/startkde] Fixes duplicate and incorrect TDE directories location
+Patch16:	kdebase-3.5.12-startkde_directories.patch
+
+# TDE unofficial patches for enhanced features
+## [kdebase/kate] Restores the 'number of files' and sorting widgets to the Kate configuration
+Patch20:	kdebase-3.5.13-kate_mru.patch
+## [kdebase/kioslave/man] Fix kio_man for older distros without 'man-db'
+Patch21:	kdebase-3.5.12-kio_man_utf8.patch
+## [kdebase/konqueror] Re-enable 'open tab in background'
+Patch22:	kdebase-3.5.12-konq_menu_tab_background.patch
+## [kdebase/konqueror/sidebar] Fix error message on documents parent folder
+Patch23:	kdebase-3.5.13-konqsidebar_documents.patch
 
 # Fedora 15 Theme: "Lovelock"
 %if 0%{?fedora} == 15
 Requires:	lovelock-backgrounds-single
 %define tde_bg /usr/share/backgrounds/lovelock/default/standard/lovelock.png
+
+Requires:	fedora-release-notes
+%define tde_aboutlabel Fedora 15
+%define tde_aboutpage /usr/share/doc/HTML/fedora-release-notes/index.html
 %endif
 
 # Fedora 16 Theme: "Verne"
 %if 0%{?fedora} == 16
 Requires:	verne-backgrounds-single
 %define tde_bg /usr/share/backgrounds/verne/default/standard/verne.png
+
+Requires:	fedora-release-notes
+%define tde_aboutlabel Fedora 16
+%define tde_aboutpage /usr/share/doc/HTML/fedora-release-notes/index.html
 %endif
 
 # RHEL 5 Theme
 %if 0%{?rhel} == 5
 Requires:	desktop-backgrounds-basic
 %define tde_bg /usr/share/backgrounds/images/default.jpg
+
+Requires:	indexhtml
+%define tde_aboutlabel Enterprise Linux 5
+%define tde_aboutpage /usr/share/doc/HTML/index.html
 %endif
 
 # RHEL 6 Theme
 %if 0%{?rhel} == 6
 Requires:	redhat-logos
 %define tde_bg /usr/share/backgrounds/default.png
+
+Requires:	redhat-indexhtml
+%define tde_aboutlabel Enterprise Linux 6
+%define tde_aboutpage /usr/share/doc/HTML/index.html
 %endif
 
 BuildRequires:	tqtinterface-devel
@@ -159,7 +188,7 @@ Requires:	kde-settings-kdm
 %endif
 Requires:	redhat-menus
 
-Provides:	kdebase%{?_qt_suffix} = %{version}
+#Provides:	kdebase%{?_qt_suffix} = %{version}
 %if "%{?_prefix}" == "/usr"
 Obsoletes:		kdebase%{?_qt_suffix} <= 3.5.10
 %endif
@@ -185,7 +214,7 @@ Requires:	%{name}
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	trinity-kdelibs-devel
 Summary:	%{summary} - Development files
-Provides:	kdebase%{?_qt_suffix}-devel = %{version}
+#Provides:	kdebase%{?_qt_suffix}-devel = %{version}
 %if "%{?_prefix}" == "/usr"
 Obsoletes:		kdebase%{?_qt_suffix}-devel <= 3.5.10
 %endif
@@ -201,7 +230,7 @@ Kate plugins or KWin styles.
 Summary: Extra applications from %{name}
 Group: User Interface/Desktops
 Requires: %{name} = %{version}-%{release}
-Provides:	kdebase%{?_qt_suffix}-extras = %{version}
+#Provides:	kdebase%{?_qt_suffix}-extras = %{version}
 %if "%{?_prefix}" == "/usr"
 Obsoletes: kdebase%{?_qt_suffix}-extras <= 3.5.10
 %endif
@@ -217,7 +246,7 @@ Obsoletes: kdebase%{?_qt_suffix}-extras <= 3.5.10
 Summary: %{name} runtime libraries
 Group:   System Environment/Libraries
 Requires: trinity-kdelibs
-Provides:	kdebase%{?_qt_suffix}-libs = %{version}
+#Provides:	kdebase%{?_qt_suffix}-libs = %{version}
 %if "%{?_prefix}" == "/usr"
 Obsoletes: kdebase%{?_qt_suffix}-libs <= 3.5.10
 %endif
@@ -243,7 +272,6 @@ Protocol handlers (KIOslaves) for personal information management, including:
 
 %prep
 %setup -q -n kdebase
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -251,13 +279,24 @@ Protocol handlers (KIOslaves) for personal information management, including:
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%if 0%{?rhel} && 0%{?rhel} < 6
 %patch8 -p1
-%patch9 -p1
+%endif
+
+%patch10 -p1
 %patch11 -p1
 %patch12 -p1
-%if 0%{?rhel} && 0%{?rhel} < 6
-%patch100 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+
+%patch20 -p4
+%if 0%{?rhel} > 0
+%patch21 -p1
 %endif
+%patch22 -p1
+%patch23 -p1
 
 # Applies an optional distro-specific graphical theme
 %if "%{?tde_bg}" != ""
@@ -268,7 +307,6 @@ Protocol handlers (KIOslaves) for personal information management, including:
 # TDE user default background
 %__sed -i "kpersonalizer/keyecandypage.cpp" \
 	-e 's,#define DEFAULT_WALLPAPER "isadora.png",#define DEFAULT_WALLPAPER "%{tde_bg}",'
-
 %__sed -i "startkde" \
 	-e 's,/usr/share/wallpapers/isadora.png.desktop,%{tde_bg},' \
 	-e 's,Wallpaper=isadora.png,Wallpaper=%{tde_bg},'
@@ -278,6 +316,17 @@ Protocol handlers (KIOslaves) for personal information management, including:
 %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
+# TDE branding: removes KUbuntu references
+%__sed -i "kcontrol/kdm/kdm-appear.cpp" \
+	-e "s|Welcome to Kubuntu |Welcome to %{tde_aboutlabel} |"
+%__sed -i "konqueror/about/konq_aboutpage.cc" \
+	-e "s|About Kubuntu|About %{tde_aboutlabel}|" \
+	-e "s|help:/kubuntu/|%{tde_aboutpage}|" \
+	-e "s|Kubuntu Documentation|%{tde_aboutlabel} Documentation|"
+%__sed -i "konqueror/about/launch.html" \
+	-e "s|help:/kubuntu/about-kubuntu/index.html|%{tde_aboutpage}|"
+%__sed -i "kdm/config.def" \
+	-e "s|Welcome to Trinity |Welcome to %{tde_aboutlabel} |"
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -321,7 +370,7 @@ export IMAKEINCLUDE="-I/usr/share/X11/config"
 
 # Modifies 'startkde' to set KDEDIR and KDEHOME hardcoded specific for TDE
 %__sed -i "%{?buildroot}%{_bindir}/startkde" \
-  -e '/^echo "\[startkde\] Starting startkde.".*/ s,$,\nexport KDEDIR=%{_prefix}\nexport KDEHOME=~/.trinity,'
+	-e '/^echo "\[startkde\] Starting startkde.".*/ s,$,\nexport KDEDIR=%{_prefix}\nexport KDEHOME=~/.trinity,'
 
 # Renames '/etc/ksysguarddrc' to avoid conflict with KDE4 'ksysguard'
 %__mv -f %{?buildroot}%{_sysconfdir}/ksysguarddrc %{?buildroot}%{_sysconfdir}/ksysguarddrc.tde
@@ -442,7 +491,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 # Pam configuration
 %{_sysconfdir}/pam.d/*
 
-%doc AUTHORS COPYING README
+%doc AUTHORS COPYING COPYING-DOCS README README.pam
 %{tde_docdir}/HTML/en/*
 %config(noreplace) %{_sysconfdir}/ksysguarddrc.tde
 %{_bindir}/genkdmconf
@@ -584,7 +633,8 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 # TDE 3.5.12 specific
 %{_bindir}/kde3
-%exclude %{_datadir}/applications/kde/display.desktop
+#%exclude 
+%{_datadir}/applications/kde/display.desktop
 %exclude %{_datadir}/fonts/override/fonts.dir
 %{_docdir}/kdm/README
 
@@ -620,6 +670,15 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %exclude %{_libdir}/libkdeinit_*.*
 
 %changelog
+* Thu Dec 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-13
+- Backports patches from TDE 3.5.13-10
+- Removes Kubuntu branding [TDE Bug #449]
+- Fix 'kio_man' on RHEL 5 and RHEL 6 [TDE Bug #714]
+- Restores the 'number of files' and sorting widgets to the Kate configuration [TDE Bug #244]
+- Re-enables 'open tab in background' konqueror feature [TDE Bug #245]
+- Fix error message 'cannot find parent folder' on konqueror sidebar
+- Fix KDEDIRS and other variables in 'startkde', that messes up translations.
+
 * Sun Nov 20 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-12
 - Updates Kickoff menu Fix [TDE Bugs #281, #508]
 - Add distribution-specific start button icon
diff --git a/redhat/kdebase/trinity-kdebase-3.5.13.spec b/redhat/kdebase/trinity-kdebase-3.5.13.spec
index e2a6aeaec..bde17d9a5 100644
--- a/redhat/kdebase/trinity-kdebase-3.5.13.spec
+++ b/redhat/kdebase/trinity-kdebase-3.5.13.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.13
 %endif
-%define release 9
+%define release 12
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -53,52 +53,78 @@ Source5:	pamd.kscreensaver-trinity%{?dist}
 # TDE Official patches (from SVN), modified
 # (none)
 
+# TDE unofficial patches, fixing FTBFS
+## [kdebase/kdm] adds gcrypt support
+Patch7:		kdebase-3.5.13-kdm-crypt.patch
+## [kdebase/kioslave/media/mediamanager] FTBFS missing dbus-tqt includes
+Patch8:		kdebase-3.5.13-mediamanager_ftbfs.patch
+## [kdebase/startkde] Hardcoded path '/usr/lib/xxx' in startkde, not suitable for x86_64
+Patch9:		kdebase-3.5.13-startkde_ldpreload.patch
+
 # TDE for RHEL/Fedora specific patches
 ## [kdebase/kdesu] Remove 'ignore' button on 'kdesu' dialog box
-Patch3:		kdebase-3.5.13-kdesu-noignorebutton.patch
-## [kdebase/kdesktop] Modifies "open terminal here" on desktop
-Patch5:		kdebase-3.5.12-desktop-openterminalhere.patch
+Patch10:	kdebase-3.5.13-kdesu-noignorebutton.patch
+## [kdebase/kdesktop] Modifies 'open terminal here' on desktop
+Patch11:	kdebase-3.5.12-desktop-openterminalhere.patch
 ## [kdebase/kioslave] Forces HAL backend to use HAL mount options
-Patch6:		kdebase-3.5.12-halmountoptions.patch
+Patch12:	kdebase-3.5.12-halmountoptions.patch
 ## [kdebase/kdm/kfrontend] Global Xsession file is '/etc/X11/xinit/Xsession'
-Patch7:		kdebase-3.5.13-genkdmconf_Xsession_location.patch
-## [kdebase/kicker/kicker/ui]
-Patch10:	kdebase-3.5.13-kickoff_unstable.patch
+Patch13:	kdebase-3.5.13-genkdmconf_Xsession_location.patch
+## [kdebase/kicker/kicker/ui] Fix kickoff menu issues
+Patch14:	kdebase-3.5.13-kickoff_unstable.patch
 ## [kdebase/startkde] Sets default Start Icon in 'kickerrc'
-Patch11:	kdebase-3.5.13-startkde_icon.patch
+Patch15:	kdebase-3.5.13-startkde_icon.patch
+## [kdebase/startkde] Fixes duplicate and incorrect TDE directories location
+Patch16:	kdebase-3.5.13-startkde_directories.patch
 
-# TDE 3.5.13 patches
-## [kdebase/kdm] adds gcrypt support
-Patch12:	kdebase-3.5.13-kdm-crypt.patch
-## [kdebase/startkde] Hardcoded path '/usr/lib/xxx' in startkde, not suitable for x86_64
-Patch8:		kdebase-3.5.13-startkde_ldpreload.patch
-## [kdebase/kioslave/media/mediamanager] FTBFS missing dbus-tqt includes
-Patch9:		kdebase-3.5.13-mediamanager_ftbfs.patch
+# TDE unofficial patches for enhanced features
 ## [kdebase/kate] Restores the 'number of files' and sorting widgets to the Kate configuration
-Patch13:	kdebase-3.5.13-kate_mru.patch
+Patch20:	kdebase-3.5.13-kate_mru.patch
+## [kdebase/kioslave/man] Fix kio_man for older distros without 'man-db'
+Patch21:	kdebase-3.5.13-kio_man_utf8.patch
+## [kdebase/konqueror] Re-enable 'open tab in background'
+Patch22:	kdebase-3.5.13-konq_menu_tab_background.patch
+## [kdebase/konqueror/sidebar] Fix error message on documents parent folder
+Patch23:	kdebase-3.5.13-konqsidebar_documents.patch
 
 # Fedora 15 Theme: "Lovelock"
 %if 0%{?fedora} == 15
 Requires:	lovelock-backgrounds-single
 %define tde_bg /usr/share/backgrounds/lovelock/default/standard/lovelock.png
+
+Requires:	fedora-release-notes
+%define tde_aboutlabel Fedora 15
+%define tde_aboutpage /usr/share/doc/HTML/fedora-release-notes/index.html
 %endif
 
 # Fedora 16 Theme: "Verne"
 %if 0%{?fedora} == 16
 Requires:	verne-backgrounds-single
 %define tde_bg /usr/share/backgrounds/verne/default/standard/verne.png
+
+Requires:	fedora-release-notes
+%define tde_aboutlabel Fedora 16
+%define tde_aboutpage /usr/share/doc/HTML/fedora-release-notes/index.html
 %endif
 
 # RHEL 5 Theme
 %if 0%{?rhel} == 5
 Requires:	desktop-backgrounds-basic
 %define tde_bg /usr/share/backgrounds/images/default.jpg
+
+Requires:	indexhtml
+%define tde_aboutlabel Enterprise Linux 5
+%define tde_aboutpage /usr/share/doc/HTML/index.html
 %endif
 
 # RHEL 6 Theme
 %if 0%{?rhel} == 6
 Requires:	redhat-logos
 %define tde_bg /usr/share/backgrounds/default.png
+
+Requires:	redhat-indexhtml
+%define tde_aboutlabel Enterprise Linux 6
+%define tde_aboutpage /usr/share/doc/HTML/index.html
 %endif
 
 BuildRequires:	tqtinterface-devel
@@ -154,7 +180,7 @@ Requires:	kde-settings-kdm
 %endif
 Requires:	redhat-menus
 
-Provides:	kdebase%{?_qt_suffix} = %{version}
+#Provides:	kdebase%{?_qt_suffix} = %{version}
 %if "%{?_prefix}" == "/usr"
 Obsoletes:		kdebase%{?_qt_suffix} <= 3.5.10
 %endif
@@ -180,7 +206,7 @@ Requires:	%{name}
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	trinity-kdelibs-devel
 Summary:	%{summary} - Development files
-Provides:	kdebase%{?_qt_suffix}-devel = %{version}
+#Provides:	kdebase%{?_qt_suffix}-devel = %{version}
 %if "%{?_prefix}" == "/usr"
 Obsoletes:		kdebase%{?_qt_suffix}-devel <= 3.5.10
 %endif
@@ -196,7 +222,7 @@ Kate plugins or KWin styles.
 Summary: Extra applications from %{name}
 Group: User Interface/Desktops
 Requires: %{name} = %{version}-%{release}
-Provides:	kdebase%{?_qt_suffix}-extras = %{version}
+#Provides:	kdebase%{?_qt_suffix}-extras = %{version}
 %if "%{?_prefix}" == "/usr"
 Obsoletes: kdebase%{?_qt_suffix}-extras <= 3.5.10
 %endif
@@ -212,7 +238,7 @@ Obsoletes: kdebase%{?_qt_suffix}-extras <= 3.5.10
 Summary: %{name} runtime libraries
 Group:   System Environment/Libraries
 Requires: trinity-kdelibs
-Provides:	kdebase%{?_qt_suffix}-libs = %{version}
+#Provides:	kdebase%{?_qt_suffix}-libs = %{version}
 %if "%{?_prefix}" == "/usr"
 Obsoletes: kdebase%{?_qt_suffix}-libs <= 3.5.10
 %endif
@@ -224,7 +250,7 @@ Requires: %{name} = %{version}-%{release}
 %package pim-ioslaves
 Summary: PIM KIOslaves from %{name}
 Group: System Environment/Libraries
-Provides:	kdebase%{?_qt_suffix}-pim-ioslaves = %{version}
+#Provides:	kdebase%{?_qt_suffix}-pim-ioslaves = %{version}
 %if "%{?_prefix}" == "/usr"
 Obsoletes: kdebase%{?_qt_suffix}-pim-ioslaves <= 3.5.10
 %endif
@@ -238,16 +264,24 @@ Protocol handlers (KIOslaves) for personal information management, including:
 
 %prep
 %setup -q -n kdebase
-%patch3 -p1
-%patch5 -p1
-%patch6 -p1
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
-%patch13 -p4
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+
+%patch20 -p4
+%if 0%{?rhel} > 0
+%patch21 -p1
+%endif
+%patch22 -p1
+%patch23 -p1
 
 # Applies an optional distro-specific graphical theme
 %if "%{?tde_bg}" != ""
@@ -258,12 +292,22 @@ Protocol handlers (KIOslaves) for personal information management, including:
 # TDE user default background
 %__sed -i "kpersonalizer/keyecandypage.cpp" \
 	-e 's,#define DEFAULT_WALLPAPER "isadora.png",#define DEFAULT_WALLPAPER "%{tde_bg}",'
-
 %__sed -i "startkde" \
 	-e 's,/usr/share/wallpapers/isadora.png.desktop,%{tde_bg},' \
 	-e 's,Wallpaper=isadora.png,Wallpaper=%{tde_bg},'
 %endif
 
+# TDE branding: removes KUbuntu references
+%__sed -i "kcontrol/kdm/kdm-appear.cpp" \
+	-e "s|Welcome to Kubuntu |Welcome to %{tde_aboutlabel} |"
+%__sed -i "konqueror/about/konq_aboutpage.cc" \
+	-e "s|About Kubuntu|About %{tde_aboutlabel}|" \
+	-e "s|help:/kubuntu/|%{tde_aboutpage}|" \
+	-e "s|Kubuntu Documentation|%{tde_aboutlabel} Documentation|"
+%__sed -i "konqueror/about/launch.html" \
+	-e "s|help:/kubuntu/about-kubuntu/index.html|%{tde_aboutpage}|"
+%__sed -i "kdm/config.def" \
+	-e "s|Welcome to Trinity |Welcome to %{tde_aboutlabel} |"
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -322,7 +366,7 @@ cd build
 
 # Modifies 'startkde' to set KDEDIR and KDEHOME hardcoded specific for TDE
 %__sed -i "%{?buildroot}%{_bindir}/startkde" \
-  -e '/^echo "\[startkde\] Starting startkde.".*/ s,$,\nexport KDEDIR=%{_prefix}\nexport KDEHOME=~/.trinity,'
+	-e '/^echo "\[startkde\] Starting startkde.".*/ s,$,\nexport KDEDIR=%{_prefix}\nexport KDEHOME=~/.trinity,'
 
 # Renames '/etc/ksysguarddrc' to avoid conflict with KDE4 'ksysguard'
 %__mv -f %{?buildroot}%{_sysconfdir}/ksysguarddrc %{?buildroot}%{_sysconfdir}/ksysguarddrc.tde
@@ -443,7 +487,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 # Pam configuration
 %{_sysconfdir}/pam.d/*
 
-%doc AUTHORS COPYING README
+%doc AUTHORS COPYING COPYING-DOCS README README.pam
 %{tde_docdir}/HTML/en/*
 %config(noreplace) %{_sysconfdir}/ksysguarddrc.tde
 %{_bindir}/genkdmconf
@@ -622,7 +666,18 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %{_datadir}/cmake/*.cmake
 
 %changelog
+* Sun Dec 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-12
+- Fix KDEDIRS and other variables in 'startkde', that messes up translations.
+
+* Sat Dec 10 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-11
+- Fix error message 'cannot find parent folder' on konqueror sidebar.
+
+* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-10
+- Removes Kubuntu branding [TDE Bug #449]
+- Re-enables 'open tab in background' konqueror feature [TDE Bug #245]
+
 * Wed Nov 29 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-9
+- Fix 'kio_man' on RHEL 5 and RHEL 6 [TDE Bug #714]
 - Restores the 'number of files' and sorting widgets to the Kate configuration [TDE Bug #244]
 
 * Fri Nov 18 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-8
diff --git a/redhat/kdegames/kdegames-3.5.13-ktuberling_fail_load_picture.patch b/redhat/kdegames/kdegames-3.5.13-ktuberling_fail_load_picture.patch
new file mode 100644
index 000000000..52fecb052
--- /dev/null
+++ b/redhat/kdegames/kdegames-3.5.13-ktuberling_fail_load_picture.patch
@@ -0,0 +1,11 @@
+--- kdegames/ktuberling/toplevel.cpp.ORI	2011-12-04 05:49:35.462097224 -0500
++++ kdegames/ktuberling/toplevel.cpp	2011-12-04 05:49:38.089040247 -0500
+@@ -189,7 +189,7 @@
+ // Load the layouts file
+ bool TopLevel::loadLayout(TQDomDocument &layoutDocument)
+ {
+-  TQFile layoutFile(TQFile::encodeName(locate("data", "ktuberling/pics/tqlayout.xml")));
++  TQFile layoutFile(TQFile::encodeName(locate("data", "ktuberling/pics/layout.xml")));
+   if (!layoutFile.open(IO_ReadOnly))
+      return false;
+ 
diff --git a/redhat/kdegames/trinity-kdegames-3.5.13.spec b/redhat/kdegames/trinity-kdegames-3.5.13.spec
index 1595a17f5..a3d0206a3 100644
--- a/redhat/kdegames/trinity-kdegames-3.5.13.spec
+++ b/redhat/kdegames/trinity-kdegames-3.5.13.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.13
 %endif
-%define release 2
+%define release 3
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -32,7 +32,10 @@ URL:		http://www.trinitydesktop.org/
 Prefix:    %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source: kdegames-%{version}.tar.gz
+Source: 	kdegames-%{version}.tar.gz
+
+# [kdegames/ktuberling] Fix ktuberling pictures loading
+Patch0:		kdegames-3.5.13-ktuberling_fail_load_picture.patch
 
 Provides: kdegames3 = %{version}-%{release}
 
@@ -72,6 +75,7 @@ License: LGPLv2
 
 %prep
 %setup -q -n kdegames
+%patch0 -p1
 
 # Ugly hack to modify TQT include directory inside autoconf files.
 # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
@@ -89,10 +93,6 @@ unset QTDIR || : ; . /etc/profile.d/qt.sh
 export PATH="%{_bindir}:${PATH}"
 export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 
-%if 0%{?fedora} > 0
-export CXXFLAGS="${CXXFLAGS} -lkio"
-%endif
-
 %configure \
    --enable-new-ldflags \
    --disable-dependency-tracking \
@@ -192,6 +192,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %changelog
+* Sun Dec 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
+- Fix ktuberling picture loading [TDE Bug #638]
+
 * Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
 - Fix HTML directory location
 
diff --git a/redhat/kdelibs/kdelibs-3.5.12-fixx11h.patch b/redhat/kdelibs/kdelibs-3.5.12-fixx11h.patch
new file mode 100644
index 000000000..64fc9b841
--- /dev/null
+++ b/redhat/kdelibs/kdelibs-3.5.12-fixx11h.patch
@@ -0,0 +1,21 @@
+--- branches/trinity/kdelibs/kdecore/fixx11h.h	2011/01/03 05:50:03	1211108
++++ branches/trinity/kdelibs/kdecore/fixx11h.h	2011/01/12 22:19:14	1214091
+@@ -57,15 +57,18 @@
+ 
+ // template --->
+ // Affects: Should be without side effects.
++#ifndef _XTYPEDEF_BOOL
+ #ifdef Bool
+ #ifndef FIXX11H_Bool
+ #define FIXX11H_Bool
+ typedef Bool XBool;
+ #undef Bool
++#define _XTYPEDEF_BOOL
+ typedef XBool Bool;
+ #endif
+ #undef Bool
+ #endif
++#endif // _XTYPEDEF_BOOL
+ // template <---
+ 
+ // Affects: Should be without side effects.
diff --git a/redhat/kdelibs/kdelibs-3.5.12-kstandarddirs_trinity.patch b/redhat/kdelibs/kdelibs-3.5.12-kstandarddirs_trinity.patch
new file mode 100644
index 000000000..e19aa739f
--- /dev/null
+++ b/redhat/kdelibs/kdelibs-3.5.12-kstandarddirs_trinity.patch
@@ -0,0 +1,29 @@
+--- kdelibs/kdecore/kstandarddirs.cpp.ORI	2011-12-09 23:13:50.089238165 +0100
++++ kdelibs/kdecore/kstandarddirs.cpp	2011-12-09 23:16:23.133210143 +0100
+@@ -839,7 +839,7 @@
+                 }
+ 		// UGLY HACK - Chris CHeney
+ 		if (local && (!strcmp("config", type)))
+-		  candidates->append("/etc/kde3/");
++		  candidates->append("/etc/trinity/");
+ 		//
+                 local = false;
+             }
+@@ -1030,7 +1030,7 @@
+     if (!strcmp(type, "html-bundle"))
+ 	return "share/doc-bundle/HTML/";
+     if (!strcmp(type, "html"))
+-	return "share/doc/kde/HTML/";
++	return "share/doc/HTML/";
+     if (!strcmp(type, "icon"))
+ 	return "share/icons/";
+     if (!strcmp(type, "config"))
+@@ -1336,7 +1336,7 @@
+     }
+     else
+     {
+-       localKdeDir =  TQDir::homeDirPath() + "/.kde3/";
++       localKdeDir =  TQDir::homeDirPath() + "/.trinity/";
+     }
+ 
+     if (localKdeDir != QString("-/"))
diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.12.spec b/redhat/kdelibs/trinity-kdelibs-3.5.12.spec
index 30cb449a1..7732731f0 100755
--- a/redhat/kdelibs/trinity-kdelibs-3.5.12.spec
+++ b/redhat/kdelibs/trinity-kdelibs-3.5.12.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.12
 %endif
-%define release 9
+%define release 10
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -37,7 +37,14 @@ Prefix:		%{_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	kdelibs-%{version}.tar.gz
+
+# TDE 3.5.12 patches for RHEL/Fedora build
+## [kdelibs/kio/kio] Removes the maximum line length detection
 Patch0:		kdelibs-3.5.13-maxlinelength.patch
+## [kdecore] sets TDE 3.5.12 defaults directories
+Patch1:		kdelibs-3.5.12-kstandarddirs_trinity.patch
+## [kdelibs/kdecore] fixed a conflict between fixx11h.h and Xdefs.h
+Patch2:		kdelibs-3.5.12-fixx11h.patch
 
 BuildRequires:	libtool
 BuildRequires:	tqtinterface-devel
@@ -66,7 +73,7 @@ Requires:		qt%{?_qt_suffix}
 Requires:		avahi-qt3
 
 
-Provides:	kdelibs%{?_qt_suffix} = %{version}
+#Provides:	kdelibs%{?_qt_suffix} = %{version}
 %if "%{?_prefix}" == "/usr"
 Obsoletes:		kdelibs%{?_qt_suffix} <= 3.5.10
 %endif
@@ -109,6 +116,8 @@ format for easy browsing
 %prep
 %setup -q -n kdelibs
 %patch0 -p1
+%patch1 -p1
+%patch2 -p3
 
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
 %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
@@ -123,7 +132,7 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 
 # On older RHEL, libXrandr is too old so krandr cannot be compiled.
 # Kspell2 does not compile either.
-%if 0%{?rhel} && 0%{?rhel} < 6
+%if 0%{?rhel} && 0%{?rhel} <= 5
 export DO_NOT_COMPILE="krandr"
 %endif
 
@@ -159,13 +168,12 @@ export DO_NOT_COMPILE="krandr"
 %__rm -rf %{?buildroot}
 %__make install DESTDIR=%{?buildroot}
 
-%__mkdir_p %{?buildroot}%{_sysconfdir}/ld.so.conf.d
-cat <<EOF >%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf
 %if "%{?_prefix}" != "/usr"
+%__mkdir_p "%{?buildroot}%{_sysconfdir}/ld.so.conf.d"
+cat <<EOF >"%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf"
 %{_libdir}
-%endif
-%{tde_libdir}
 EOF
+%endif
 
 # Moves the XDG configuration files to TDE directory
 %if "%{_prefix}" != "/usr"
@@ -189,8 +197,7 @@ EOF
 
 %files
 %defattr(-,root,root,-)
-%doc README
-%doc COPYING.LIB
+%doc AUTHORS COPYING* README TODO
 %{_bindir}/artsmessage
 %{_bindir}/cupsdconf
 %{_bindir}/cupsdoprint
@@ -288,7 +295,10 @@ EOF
 %exclude %{_datadir}/locale/all_languages
 %exclude %{tde_docdir}/HTML/en/common/*
 %endif
+# ld.so.conf needed only if installed under '/opt/trinity'
+%if "%{?_prefix}" != "/usr"
 %{_sysconfdir}/ld.so.conf.d/trinity.conf
+%endif
 
 # Avoid conflict with 'redhat-menus' package
 %if "%{_prefix}" == "/usr"
@@ -315,11 +325,16 @@ EOF
 
 
 %changelog
-* Sun Nov 29 2911 Francois Andriot <francois.andriot@free.fr> - 3.5.12-9
+* Fri Dec 09 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-10
+- Fix conflict with distro-provided KDE
+- Fix HTML directory location
+- Change defaults TDE directory to '/etc/trinity' and '~/.trinity'
+- Removes 'ld.so.conf.d' when installed under '/usr'
+
+* Sun Nov 29 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-9
 - Moves XDG files in TDE prefix to avoid conflict with distro-provided KDE
 - Disable 'max line length' detection
 - Add missing BuildRequires
-- Disable 'max line length' detection
 
 * Fri Sep 16 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-8
 - Add support for RHEL 5.
@@ -350,4 +365,3 @@ EOF
 
 * Wed Dec 14 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-0
 - Initial version
-
diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
index faea11948..827a2523d 100755
--- a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
+++ b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
@@ -66,7 +66,7 @@ Requires:		qt%{?_qt_suffix}
 Requires:		avahi-qt3
 
 
-Provides:	kdelibs%{?_qt_suffix} = %{version}
+#Provides:	kdelibs%{?_qt_suffix} = %{version}
 %if "%{?_prefix}" == "/usr"
 Obsoletes:		kdelibs%{?_qt_suffix} <= 3.5.10
 %endif
@@ -111,6 +111,7 @@ format for easy browsing
 %patch0 -p1
 
 
+
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 export PATH="%{_bindir}:${PATH}"
diff --git a/redhat/libraries/pykdeextensions/trinity-pykdeextensions.spec b/redhat/libraries/pykdeextensions/trinity-pykdeextensions.spec
new file mode 100644
index 000000000..dd0ad0c51
--- /dev/null
+++ b/redhat/libraries/pykdeextensions/trinity-pykdeextensions.spec
@@ -0,0 +1,149 @@
+# Default version for this component
+%define kdecomp pykdeextensions
+%define version 0.4.0
+%define release 1
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%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
+
+
+Name:		trinity-%{kdecomp}
+Summary:	Python packages to support KDE applications (scripts) [Trinity]
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.simonzone.com/software/pykdeextensions
+
+Prefix:    %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+
+BuildRequires:	tqtinterface-devel
+BuildRequires:	trinity-kdelibs-devel
+BuildRequires:	trinity-kdebase-devel
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	PyQt-devel
+BuildRequires:	python-trinity-devel
+
+%description
+PyKDE Extensions is a collection of software and Python packages
+to support the creation and installation of KDE applications.
+
+
+%package -n trinity-libpythonize0
+Summary:		Python packages to support KDE applications (library) [Trinity]	
+Group:			Environment/Libraries
+
+%description -n trinity-libpythonize0
+PyKDE Extensions is a collection of software and Python packages
+to support the creation and installation of KDE applications.
+
+This package contains the libpythonize library files.
+
+
+%package -n trinity-libpythonize0-devel
+Summary:		Python packages to support KDE applications (development) [Trinity]
+Group:			Development/Libraries
+Requires:		trinity-libpythonize0
+
+%description -n trinity-libpythonize0-devel
+PyKDE Extensions is a collection of software and Python packages
+to support the creation and installation of KDE applications.
+
+This package contains the libpythonize development files.
+
+
+%prep
+%setup -q -n libraries/%{kdecomp}
+
+# Changes library directory to 'lib64'
+for f in src/*.py; do
+  %__sed -i "${f}" \
+    -e "s,%{_prefix}/lib,%{_libdir},g" \
+    -e "s,/usr/lib/pyshared/python2.6,%{python_sitearch},g" \
+    -e "s|'pykde-dir=',None,|'pykde-dir=','%{python_sitearch}',|g" \
+    -e "s|self.pykde_dir = None|self.pykde_dir = \"%{python_sitearch}\"|g" \
+    -e "s|/usr/include/tqt|%{_includedir}/tqt|g"
+done
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+./setup.py build_libpythonize
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+./setup.py install \
+	--root=%{buildroot} \
+	--prefix=%{_prefix} \
+	--install-clib=%{_libdir} \
+	--install-cheaders=%{tde_includedir}
+
+# Removes BUILDROOT directory reference in installed files
+for f in \
+	%{buildroot}%{_libdir}/libpythonize.la \
+	%{buildroot}%{_datadir}/apps/pykdeextensions/app_templates/kcontrol_module/src/KcontrolModuleWidgetUI.py \
+	%{buildroot}%{_datadir}/apps/pykdeextensions/app_templates/kdeutility/src/KDEUtilityDialogUI.py \
+; do
+	%__sed -i "${f}" -e "s,%{buildroot},,g"
+:
+done
+
+# Moves PYTHON libraries to distribution directory
+%__mkdir_p %{buildroot}%{python_sitearch}
+%__mv -f %{buildroot}%{_prefix}/lib/python*/site-packages/* %{buildroot}%{python_sitearch}
+%__rm -rf %{buildroot}%{_prefix}/lib/python2.7/site-packages
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post -n trinity-libpythonize0 -p /sbin/ldconfig
+%postun -n trinity-libpythonize0 -p /sbin/ldconfig
+
+%post -n trinity-libpythonize0-devel -p /sbin/ldconfig
+%postun -n trinity-libpythonize0-devel -p /sbin/ldconfig
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%{_datadir}/apps/pykdeextensions
+%{tde_docdir}/HTML/en/pykdeextensions
+%{python_sitearch}/*
+
+%files -n trinity-libpythonize0
+%defattr(-,root,root,-)
+%{_libdir}/libpythonize.so.*
+
+%files -n trinity-libpythonize0-devel
+%defattr(-,root,root,-)
+%{tde_includedir}/*.h
+%{_libdir}/libpythonize.a
+%{_libdir}/libpythonize.la
+%{_libdir}/libpythonize.so
+
+
+%Changelog
+* Thu Dec 01 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.0svn20080103-1
+- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/libraries/python-trinity/python-trinity-3.5.13-install_directories.patch b/redhat/libraries/python-trinity/python-trinity-3.5.13-install_directories.patch
new file mode 100644
index 000000000..a2949fc2b
--- /dev/null
+++ b/redhat/libraries/python-trinity/python-trinity-3.5.13-install_directories.patch
@@ -0,0 +1,11 @@
+--- configure.py.ORI	2011-12-03 17:07:41.589390850 +0100
++++ configure.py	2011-12-03 17:14:35.226888035 +0100
+@@ -786,7 +786,7 @@
+     sipconfig.ParentMakefile(
+         configuration = pyqtcfg,
+         subdirs = subdirs,
+-        installs= [("pykdeconfig.py", opt_pykdemoddir), (srcPath("contrib/kdepyuic"), sipcfg.default_bin_dir)]
++        installs= [("pykdeconfig.py", opt_pykdemoddir), (srcPath("contrib/kdepyuic"), opt_kdebasedir + "/bin")]
+     ).generate()
+ 
+ 
diff --git a/redhat/libraries/python-trinity/python-trinity.spec b/redhat/libraries/python-trinity/python-trinity.spec
new file mode 100644
index 000000000..dec9a719a
--- /dev/null
+++ b/redhat/libraries/python-trinity/python-trinity.spec
@@ -0,0 +1,129 @@
+# Default version for this component
+%define kdecomp python-trinity
+%define version 3.16.3
+%define release 1
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%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
+
+
+Name:		%{kdecomp}
+Summary:	Trinity bindings for Python [Trinity]
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.simonzone.com/software/pykdeextensions
+
+Prefix:    %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+
+## RHEL/Fedora patches
+Patch0:		python-trinity-3.5.13-install_directories.patch
+
+BuildRequires:	tqtinterface-devel
+BuildRequires:	trinity-kdelibs-devel
+BuildRequires:	trinity-kdebase-devel
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	python
+BuildRequires:	PyQt-devel
+
+
+%description
+Python binding module that provides wide access to the Trinity API,
+also known as PyKDE. Using this, you'll get (for example) classes
+from kio, kjs, khtml and kprint.
+
+
+%package devel
+Summary:		Trinity bindings for Python - Development files and scripts [Trinity]
+Group:			Development/Libraries
+
+%description devel
+Development .sip files with definitions of PyKDE classes. They
+are needed to build PyKDE, but also as building blocks of other
+packages based on them. 
+The package also contains kdepyuic, a wrapper script around PyQt's 
+user interface compiler.
+
+
+%package doc
+Summary:		Documentation and examples for PyKDE [Trinity]
+Group:			Development/Libraries
+
+%description doc
+General documentation and examples for PyKDE providing programming
+tips and working code you can use to learn from.
+
+
+%prep
+%setup -q -n libraries/%{kdecomp}
+%patch0 -p0
+
+# Hack to get TQT include files under /opt
+%__sed -i "configure.py" \
+	-e "s,/usr/include/tqt,%{_includedir}/tqt,g"
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%__python configure.py \
+	-k %{_prefix} \
+	-L %{_lib} \
+	-v %{_datadir}/sip/trinity
+%__make %{_smp_mflags}
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+# Install documentation
+%__mkdir_p %{buildroot}%{tde_docdir}/HTML/en
+%__cp -rf doc %{buildroot}%{tde_docdir}/HTML/en/%{name}
+
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README
+%{python_sitearch}/*.so
+%{python_sitearch}/dcop*.py*
+%{python_sitearch}/pykde*.py*
+
+%files devel
+%defattr(-,root,root,-)
+%{_bindir}/kdepyuic
+%{_datadir}/sip/trinity
+
+%files doc
+%defattr(-,root,root,-)
+%{tde_docdir}/HTML/en/%{name}
+
+
+%Changelog
+* Fri Dec 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.16.3-1
+- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16