RPM Packaging: update existing SPEC files

46 files changed, 141 insertions, 1385 deletions

diff --git a/redhat/applications/abakus/trinity-abakus-3.5.12.spec b/redhat/applications/abakus/trinity-abakus-3.5.12.spec
index 52cc67029..54880e8ae 100644
--- a/redhat/applications/abakus/trinity-abakus-3.5.12.spec
+++ b/redhat/applications/abakus/trinity-abakus-3.5.12.spec
@@ -87,7 +87,7 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %{tde_docdir}/HTML/*/*/
 %{_datadir}/applnk/Utilities/abakus.desktop
 
-%Changelog
+%changelog
 * Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.91-1
 - Initial build for RHEL 6 and Fedora 15
 - Import to GIT
diff --git a/redhat/applications/abakus/trinity-abakus-3.5.13.1.spec b/redhat/applications/abakus/trinity-abakus-3.5.13.1.spec
index 527cc4a6e..3a5e75aad 100644
--- a/redhat/applications/abakus/trinity-abakus-3.5.13.1.spec
+++ b/redhat/applications/abakus/trinity-abakus-3.5.13.1.spec
@@ -76,7 +76,7 @@ export KDEDIR=%{tde_prefix}
 
 # Specific path for RHEL4
 if [ -d /usr/X11R6 ]; then
-  export CXXFLAGS="${CXXFLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+  export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
 fi
 
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
@@ -121,6 +121,6 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 %{tde_tdedocdir}/HTML/en/abakus/
 %{tde_datadir}/applnk/Utilities/abakus.desktop
 
-%Changelog
+%changelog
 * Tue Oct 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.91-4
 - Initial release for TDE 3.5.13.1
diff --git a/redhat/applications/abakus/trinity-abakus-3.5.13.spec b/redhat/applications/abakus/trinity-abakus-3.5.13.spec
index b73e50c1e..881134d4e 100644
--- a/redhat/applications/abakus/trinity-abakus-3.5.13.spec
+++ b/redhat/applications/abakus/trinity-abakus-3.5.13.spec
@@ -95,7 +95,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 %{tde_tdedocdir}/HTML/en/abakus/
 %{tde_datadir}/applnk/Utilities/abakus.desktop
 
-%Changelog
+%changelog
 * Wed Apr 25 2012 Francois Andriot <francois.andriot@free.fr> - 0.91-3
 - Fix postinstall
 
diff --git a/redhat/applications/amarok/trinity-amarok-3.5.13.1.spec b/redhat/applications/amarok/trinity-amarok-3.5.13.1.spec
index f5e901e6b..08d594486 100644
--- a/redhat/applications/amarok/trinity-amarok-3.5.13.1.spec
+++ b/redhat/applications/amarok/trinity-amarok-3.5.13.1.spec
@@ -337,7 +337,7 @@ export KDEDIR=%{tde_prefix}
 
 # Specific path for RHEL4
 if [ -d /usr/X11R6 ]; then
-  export CXXFLAGS="${CXXFLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+  export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
 fi
 
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
diff --git a/redhat/applications/gwenview/trinity-gwenview-3.5.13.1.spec b/redhat/applications/gwenview/trinity-gwenview-3.5.13.1.spec
index f2541280c..8cd9660bd 100644
--- a/redhat/applications/gwenview/trinity-gwenview-3.5.13.1.spec
+++ b/redhat/applications/gwenview/trinity-gwenview-3.5.13.1.spec
@@ -40,10 +40,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.1.tar.gz
 
-# [gwenview] Rename a few stragglers [Commit #b4881a61]
-Patch4:	gwenview-3.5.13-rename_a_few_stragglers.patch
-# [gwenview] Fix FTBFS [Commit #1ca2f739]
-Patch5:	gwenview-3.5.13-fix_ftbfs.patch
 # [gwenview] Define QT_CLEAN_NAMESPACE during libmng checks [Commit #59c7639f]
 Patch11:	gwenview-3.5.13-fix_libmng_check.patch
 
diff --git a/redhat/applications/kcmautostart/trinity-kcmautostart-3.5.13.1.spec b/redhat/applications/kcmautostart/trinity-kcmautostart-3.5.13.1.spec
deleted file mode 100644
index b63ede854..000000000
--- a/redhat/applications/kcmautostart/trinity-kcmautostart-3.5.13.1.spec
+++ /dev/null
@@ -1,125 +0,0 @@
-# Default version for this component
-%define kdecomp kchmviewer
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-kcmautostart
-Summary:	Manage applications automatic startup.
-Version:	1.0
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	kcmautostart-3.5.13.tar.gz
-
-# [kcmautostart] Fix FTBFS with TDE 3.5.13
-Patch1:		kcmautostart-3.5.13-ftbfs.patch
-# [kcmautostart] Add French support
-Patch2:		kcmautostart-3.5.13-add_french.patch
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-arts-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires: desktop-file-utils
-BuildRequires: gcc-c++
-
-Requires:		trinity-kdebase
-
-%description
-%{summary}
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -a 0 -n applications/kcmautostart
-%patch1 -p1
-%patch2 -p1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --disable-static
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang autostart
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f autostart.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO
-%{tde_tdelibdir}/kcm_autostart.la
-%{tde_tdelibdir}/kcm_autostart.so
-%{tde_tdeappdir}/autostart.desktop
-%{tde_tdedocdir}/HTML/en/autostart/
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-2
-- Initial build for TDE 3.5.13.1
-
-* Thu May 10 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-1
-- Initial build for TDE 3.5.13
diff --git a/redhat/applications/kcmautostart/trinity-kcmautostart-3.5.13.spec b/redhat/applications/kcmautostart/trinity-kcmautostart-3.5.13.spec
deleted file mode 100644
index 70db276de..000000000
--- a/redhat/applications/kcmautostart/trinity-kcmautostart-3.5.13.spec
+++ /dev/null
@@ -1,116 +0,0 @@
-# Default version for this component
-%define kdecomp kchmviewer
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-kcmautostart
-Summary:	Manage applications automatic startup.
-Version:	1.0
-Release:	1%{?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:	kcmautostart-3.5.13.tar.gz
-
-# [kcmautostart] Fix FTBFS with TDE 3.5.13
-Patch1:		kcmautostart-3.5.13-ftbfs.patch
-# [kcmautostart] Add French support
-Patch2:		kcmautostart-3.5.13-add_french.patch
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-arts-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
-BuildRequires: desktop-file-utils
-BuildRequires: gcc-c++
-
-Requires:		trinity-kdebase
-
-%description
-%{summary}
-
-%prep
-%setup -q -a 0 -n applications/kcmautostart
-%patch1 -p1
-%patch2 -p1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --disable-static
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang autostart
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f autostart.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO
-%{tde_tdelibdir}/kcm_autostart.la
-%{tde_tdelibdir}/kcm_autostart.so
-%{tde_tdeappdir}/autostart.desktop
-%{tde_tdedocdir}/HTML/en/autostart/
-
-
-%Changelog
-* Thu May 10 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-1
-- Initial build for TDE 3.5.13
diff --git a/redhat/applications/kpowersave/trinity-kpowersave-3.5.13-sru.spec b/redhat/applications/kpowersave/trinity-kpowersave-3.5.13-sru.spec
deleted file mode 100644
index c160aa2ea..000000000
--- a/redhat/applications/kpowersave/trinity-kpowersave-3.5.13-sru.spec
+++ /dev/null
@@ -1,158 +0,0 @@
-# Default version for this component
-%define kdecomp kpowersave
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Version:	0.7.3
-Release:	3%{?dist}%{?_variant}
-Summary:	HAL based power management applet for Trinityfiles or directories.
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-# [kpowersave] Switch to v3.5.13-sru branch
-Patch0:		kpowersave-3.5.13-sru-20120818.patch
-
-BuildRequires:	dbus-tqt-devel
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-
-%description
-KPowersave is a TDE systray applet which allows to control the power 
-management settings and policies of your computer.
-It relies on HAL to do the heavy lifting.
-
-Current feature list:
- * support for ACPI, APM and PMU
- * trigger suspend to disk/ram and standby
- * switch cpu frequency policy (between: performance, dynamic and powersave)
- * applet icon with information about AC state, battery fill and battery
-   (warning) states
- * applet tooltip with information about battery fill and remaining battery 
-   time/percentage
- * autosuspend (to suspend the machine if the user has been inactive for a 
-   defined time)
- * a global configurable blacklist with programs which prevent autosuspend
-   (e.g. videoplayer and cd burning tools)
- * trigger lock screen and select the lock method
- * KNotify support
- * online help
- * localisations for many languages
- 
-KPowersave supports schemes with following configurable specific 
-settings for:
- * screensaver
- * DPMS
- * autosuspend
- * scheme specific blacklist for autosuspend
- * notification settings
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch0 -p1
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-	
-%if 0%{?rhel} || 0%{?fedora}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  -DCMAKE_SKIP_RPATH="OFF" \
-	..
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-/sbin/ldconfig
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-/sbin/ldconfig
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_bindir}/kpowersave
-%{tde_libdir}/libkdeinit_kpowersave.la
-%{tde_libdir}/libkdeinit_kpowersave.so
-%{tde_tdelibdir}/kpowersave.la
-%{tde_tdelibdir}/kpowersave.so
-%{tde_tdeappdir}/kpowersave.desktop
-%{tde_datadir}/apps/kpowersave/eventsrc
-%{tde_datadir}/apps/kpowersave/icons/*/*/*/*.png
-%{tde_datadir}/icons/hicolor/*/*/*.png
-%{tde_datadir}/autostart/kpowersave-autostart.desktop
-%{tde_datadir}/config/kpowersaverc
-
-%Changelog
-* Sat Aug 18 2012 Francois Andriot <francois.andriot@free.fr> - 0.7.3-3
-- Rebuilt for tdelibs-3.5.13-11
-- Switch to v3.5.13-sru branch
-
-* Sat Nov 26 2011 Francois Andriot <francois.andriot@free.fr> - 0.7.3-2
-- Add missing /sbin/ldconfig
-- Add missing doc file
-
-* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.7.3-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kwin-style-crystal/trinity-kwin-style-crystal-3.5.12.spec b/redhat/applications/kwin-style-crystal/trinity-kwin-style-crystal-3.5.12.spec
deleted file mode 100644
index 624249bf0..000000000
--- a/redhat/applications/kwin-style-crystal/trinity-kwin-style-crystal-3.5.12.spec
+++ /dev/null
@@ -1,109 +0,0 @@
-# Default version for this component
-%define kdecomp kwin-style-crystal
-%define version 1.0.5
-%define release 1
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
-%define _variant .opt
-%define _docdir %{tde_prefix}/share/doc
-%endif
-
-# TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}
-%define tde_includedir %{tde_includedir}/kde
-%define tde_libdir %{tde_libdir}/kde3
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Semi transparant window decoration for 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:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.12.tar.gz
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-Crystal offers you pseudo transparent titlebar, buttons and borders
-transparent, so you can see more of your lovely background image
-Transparancy and buttons can be costumized to match your wishes.
-Offers rounded corners as well
-
-And it is of course nice to look at. Upstream says:
-"- Don't forget to breathe, while drooling."
-
-
-%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,%{tde_includedir}/tqt,g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-	--disable-rpath \
-    --with-extra-includes=%{tde_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_tdelibdir}/kwin3_crystal.la
-%{tde_tdelibdir}/kwin3_crystal.so
-%{tde_tdelibdir}/kwin_crystal_config.la
-%{tde_tdelibdir}/kwin_crystal_config.so
-%{tde_datadir}/apps/kwin/crystal.desktop
-
-
-%Changelog
-* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.5-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kwin-style-crystal/trinity-kwin-style-crystal-3.5.13.1.spec b/redhat/applications/kwin-style-crystal/trinity-kwin-style-crystal-3.5.13.1.spec
deleted file mode 100644
index 43e81df9c..000000000
--- a/redhat/applications/kwin-style-crystal/trinity-kwin-style-crystal-3.5.13.1.spec
+++ /dev/null
@@ -1,124 +0,0 @@
-# Default version for this component
-%define kdecomp kwin-style-crystal
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_tdedocdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Semi transparant window decoration for Trinity.
-Version:	1.0.5
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-Crystal offers you pseudo transparent titlebar, buttons and borders
-transparent, so you can see more of your lovely background image
-Transparancy and buttons can be costumized to match your wishes.
-Offers rounded corners as well
-
-And it is of course nice to look at. Upstream says:
-"- Don't forget to breathe, while drooling."
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_tdelibdir}/kwin3_crystal.la
-%{tde_tdelibdir}/kwin3_crystal.so
-%{tde_tdelibdir}/kwin_crystal_config.la
-%{tde_tdelibdir}/kwin_crystal_config.so
-%{tde_datadir}/apps/kwin/crystal.desktop
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-2
-- Initial build for TDE 3.5.13.1
-
-* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.5-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kwin-style-crystal/trinity-kwin-style-crystal-3.5.13.spec b/redhat/applications/kwin-style-crystal/trinity-kwin-style-crystal-3.5.13.spec
deleted file mode 100644
index 0febc8eb1..000000000
--- a/redhat/applications/kwin-style-crystal/trinity-kwin-style-crystal-3.5.13.spec
+++ /dev/null
@@ -1,116 +0,0 @@
-# Default version for this component
-%define kdecomp kwin-style-crystal
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_tdedocdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Semi transparant window decoration for Trinity.
-Version:	1.0.5
-Release:	1%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-Crystal offers you pseudo transparent titlebar, buttons and borders
-transparent, so you can see more of your lovely background image
-Transparancy and buttons can be costumized to match your wishes.
-Offers rounded corners as well
-
-And it is of course nice to look at. Upstream says:
-"- Don't forget to breathe, while drooling."
-
-
-%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|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_includedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_tdelibdir}/kwin3_crystal.la
-%{tde_tdelibdir}/kwin3_crystal.so
-%{tde_tdelibdir}/kwin_crystal_config.la
-%{tde_tdelibdir}/kwin_crystal_config.so
-%{tde_datadir}/apps/kwin/crystal.desktop
-
-
-%Changelog
-* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.5-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/dependencies/arts/trinity-arts-3.5.12.spec b/redhat/dependencies/arts/trinity-arts-3.5.12.spec
index 1a72133d6..1a72133d6 100755..100644
--- a/redhat/dependencies/arts/trinity-arts-3.5.12.spec
+++ b/redhat/dependencies/arts/trinity-arts-3.5.12.spec
diff --git a/redhat/dependencies/arts/trinity-arts-3.5.13.1.spec b/redhat/dependencies/arts/trinity-arts-3.5.13.1.spec
index 03a922e4e..03a922e4e 100755..100644
--- a/redhat/dependencies/arts/trinity-arts-3.5.13.1.spec
+++ b/redhat/dependencies/arts/trinity-arts-3.5.13.1.spec
diff --git a/redhat/dependencies/arts/trinity-arts-3.5.13.spec b/redhat/dependencies/arts/trinity-arts-3.5.13.spec
index af9fef33a..af9fef33a 100755..100644
--- a/redhat/dependencies/arts/trinity-arts-3.5.13.spec
+++ b/redhat/dependencies/arts/trinity-arts-3.5.13.spec
diff --git a/redhat/dependencies/arts/trinity-arts-r14.spec b/redhat/dependencies/arts/trinity-arts-r14.spec
index 4e9c33264..4e9c33264 100755..100644
--- a/redhat/dependencies/arts/trinity-arts-r14.spec
+++ b/redhat/dependencies/arts/trinity-arts-r14.spec
diff --git a/redhat/dependencies/libcaldav/libcaldav.spec b/redhat/dependencies/libcaldav/libcaldav.spec
index 9d41aba39..0d6745c90 100644
--- a/redhat/dependencies/libcaldav/libcaldav.spec
+++ b/redhat/dependencies/libcaldav/libcaldav.spec
@@ -103,10 +103,12 @@ autoreconf --force --install --symlink
 
 
 %files
+%defattr(-,root,root,-)
 %{tde_libdir}/*.so.*
 %{tde_docdir}/libcaldav/
 
 %files devel
+%defattr(-,root,root,-)
 %{tde_includedir}/caldav.h
 %{tde_libdir}/*.la
 %{tde_libdir}/*.so
diff --git a/redhat/dependencies/libcarddav/libcarddav.spec b/redhat/dependencies/libcarddav/libcarddav.spec
index ced6601c2..8c4f62ff7 100644
--- a/redhat/dependencies/libcarddav/libcarddav.spec
+++ b/redhat/dependencies/libcarddav/libcarddav.spec
@@ -100,9 +100,11 @@ autoreconf --force --install --symlink
 
 
 %files
+%defattr(-,root,root,-)
 %{tde_libdir}/*.so.*
 
 %files devel
+%defattr(-,root,root,-)
 %{tde_includedir}/*.h
 %{tde_libdir}/*.la
 %{tde_libdir}/*.so
diff --git a/redhat/dependencies/tqca-tls/tqca-tls.spec b/redhat/dependencies/tqca-tls/tqca-tls.spec
deleted file mode 100644
index f95290a0e..000000000
--- a/redhat/dependencies/tqca-tls/tqca-tls.spec
+++ /dev/null
@@ -1,65 +0,0 @@
-# Always build under "/usr"
-%define _prefix /usr
-
-Name:		tqca-tls
-Version:	r14
-Release:	1%{?dist}
-
-Summary:	TLS plugin for the Qt Cryptographic Architecture
-License:	LGPLv2+
-Group:		Applications/Internet
-
-URL:		http://delta.affinix.com/qca/
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{name}-%{version}.tar.gz
-
-# Fix build in mach for QT apps
-Patch0:		qca-tls-1.0-mach.patch
-# Build with openssl 1.0.0
-Patch2:     qca-tls-1.0-ossl10.patch
-# Allows building with TQT3 from TDE
-Patch10:	tqca-tls-qmake-tqt3.patch
-
-BuildRequires:	tqt3-devel >= 3.4.0
-BuildRequires:	openssl-devel >= 0.9.8
-
-
-%description
-This is a plugin to provide SSL/TLS capability to programs that use the TQt
-Cryptographic Architecture (TQCA).  TQCA is a library providing an easy API
-for several cryptographic algorithms to TQt programs.  This package only
-contains the TLS plugin.
-
-
-%prep
-%setup -q -n dependencies/%{name}
-%patch0 -p0 -b .mach
-%patch2 -p1 -b .ossl10
-%patch10 -p1
-
-%build
-./configure
-%__make %{?_smp_mflags}
-
-%install
-%__rm -rf %{?buildroot}
-%__make install INSTALL_ROOT=%{?buildroot}
-
-%clean
-%__rm -rf %{?buildroot}
-
-
-%files
-%defattr(0644,root,root,0755)
-%doc README COPYING
-%attr(755,root,root) %{_libdir}/tqt3/plugins/crypto
-
-
-%changelog
-* Sat Feb 18 2012 Francois Andriot <francois.andriot@free.fr> - r14-1
-- Initial build for TDE R14
-- Spec file based on Fedora 12 'qca-tls-1.0-18'
diff --git a/redhat/dependencies/tqca/tqca.spec b/redhat/dependencies/tqca/tqca.spec
deleted file mode 100644
index 5d5f57670..000000000
--- a/redhat/dependencies/tqca/tqca.spec
+++ /dev/null
@@ -1,120 +0,0 @@
-%define _prefix /opt/trinity
-
-Name:           tqca
-Version:        1.0
-Release:        r14.1%{?dist}
-
-Summary:        TQt Cryptographic Architecture
-
-Group:          System Environment/Libraries
-License:        LGPLv2+
-URL:            http://delta.affinix.com/qca
-Source0:        %{name}-r14.tar.gz
-Patch0:         qca-1.0-mach.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Patch1:			tqca-1.0-fix_tqt3_detection.patch
-
-BuildRequires:  tqt3-devel
-BuildRequires:  tqtinterface-devel
-
-%description
-Taking a hint from the similarly-named Java Cryptography Architecture,
-QCA aims to provide a straightforward and cross-platform crypto API,
-using Qt datatypes and conventions. QCA separates the API from the
-implementation, using plugins known as Providers. The advantage of this
-model is to allow applications to avoid linking to or explicitly depending
-on any particular cryptographic library. This allows one to easily change
-or upgrade crypto implementations without even needing to recompile the
-application!
-
-%package        devel
-Summary:        Qt Cryptographic Architecture development files
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-
-%description    devel
-This packages contains the development files for QCA
-
-%prep
-%setup -q -n dependencies/tqca
-%patch0 -p0 -b .mach
-%patch1 -p1
-perl -pi -e 's,target\.path=\$PREFIX/lib,target.path=\$PREFIX/%{_lib},g' qcextra
-
-
-%build
-./configure \
-  --prefix=%{_prefix}
-
-sed -i -e /strip/d Makefile
-make %{?_smp_mflags}
-
-
-%install
-rm -rf $RPM_BUILD_ROOT
-make install INSTALL_ROOT=$RPM_BUILD_ROOT
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%post
-/sbin/ldconfig
-
-%postun
-/sbin/ldconfig
-
-
-%files
-%defattr(-,root,root,-)
-%doc COPYING README TODO
-%{_libdir}/*.so.*
-
-%files devel
-%defattr(-,root,root,-)
-%{_includedir}/*.h
-%{_libdir}/*.so
-
-
-%changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Thu Jun 05 2008 Aurelien Bompard <abompard@fedoraproject.org> 1.0-11
-- fix build
-
-* Mon Feb 18 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.0-10
-- Autorebuild for GCC 4.3
-
-* Sun Aug 26 2007 Aurelien Bompard <abompard@fedoraproject.org> 1.0-9
-- fix license tag
-
-* Wed Aug 30 2006 Aurelien Bompard <abompard@fedoraproject.org> 1.0-8
-- rebuild
-
-* Sat Apr 08 2006 Aurelien Bompard <gauret[AT]free.fr> 1.0-7
-- disable stripping (bug 186648)
-
-* Tue Feb 21 2006 Aurelien Bompard <gauret[AT]free.fr> 1.0-6
-- rebuild for FC5
-
-* Sun May 22 2005 Jeremy Katz <katzj@redhat.com> - 1.0-5
-- rebuild on all arches
-
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
-- rebuilt
-
-* Thu Jan 13 2005 Aurelien Bompard <gauret[AT]free.fr> 0:1.0-3
-- fix Category
-- fix build on x86_64
-
-* Thu Jan 13 2005 Aurelien Bompard <gauret[AT]free.fr> 0:1.0-0.fdr.2
-- clean up comments to fix %%postun scriptlet.
-
-* Mon Nov 22 2004 Aurelien Bompard <gauret[AT]free.fr> 0:1.0-0.fdr.1
-- Initial RPM release.
diff --git a/redhat/extras/kdebluetooth/trinity-kdebluetooth.spec b/redhat/extras/kdebluetooth/trinity-kdebluetooth.spec
index 27bac51d2..25b95d31b 100644
--- a/redhat/extras/kdebluetooth/trinity-kdebluetooth.spec
+++ b/redhat/extras/kdebluetooth/trinity-kdebluetooth.spec
@@ -106,7 +106,7 @@ KDE Bluetooth framework development libraries and headers.
 %patch3 -p1 -b .gcc46
 
 %if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
-#patch4 -p1 -b .bluez4
+%patch4 -p1 -b .bluez4
 %endif
 
 %patch11 -p1
@@ -156,7 +156,7 @@ export CXXFLAGS="${CXXFLAGS} -I%{tde_includedir}/dbus-1.0"
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf $RPM_BUILD_ROOT
 %__make install DESTDIR=$RPM_BUILD_ROOT
 
diff --git a/redhat/extras/libkarma/trinity-libkarma.spec b/redhat/extras/libkarma/trinity-libkarma.spec
deleted file mode 100644
index 2bf58f756..000000000
--- a/redhat/extras/libkarma/trinity-libkarma.spec
+++ /dev/null
@@ -1,171 +0,0 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Summary:   	Rio Karma tools
-Name:      	trinity-libkarma
-Version:   	0.1.2
-Release:   	2%{?dist}%{?_variant}
-License:   	GPLv2+
-Group:     	System/Libraries
-Url:	   	http://www.freakysoft.de/html/libkarma/
-
-Source:   	http://www.freakysoft.de/libkarma/libkarma-%{version}.tar.gz
-Source2:	http://bobcopeland.com/karma/banshee/preferences.fdi
-Source3:	http://bobcopeland.com/karma/banshee/multimedia-player-rio-karma.png
-Source4:	karma-sharp.dll.config
-
-# [libkarma] Fix installation directories
-Patch1:		libkarma-0.1.2-fix_installation.patch
-
-BuildRoot: 	%{_tmppath}/%name-root
-
-BuildRequires: mono-devel
-BuildRequires: taglib-devel
-BuildRequires: libusb-devel
-BuildRequires: zlib-devel
-
-Obsoletes:		trinity-libkarma-libs < %{version}-%{release}
-Provides:		trinity-libkarma-libs = %{version}-%{release}
-
-Provides:		libkarma = %{version}-%{release}
-
-%description
-Rio Karma access library
-
-
-%package devel
-Summary:   	Rio Karma development files
-Group:     	Development/C
-Requires:	%{name} = %{version}-%{release}
-Provides:	libkarma-devel = %{version}-%{release}
-
-%description devel
-Rio Karma development files
-
-
-%package -n trinity-karma-sharp
-Summary:   	Rio Karma C# bindings
-Group:     	Development/Other
-Requires:	%{name} = %{version}-%{release}
-
-Obsoletes:	karma-sharp < %{version}-%{release}
-Provides:	karma-sharp = %{version}-%{release}
-
-%description -n trinity-karma-sharp
-Rio Karma C# bindings
-
-
-%prep
-%setup -q -n libkarma-%{version}
-%patch1 -p1 -b .fixdir
-
-%build
-# Do *NOT* use LIBDIR variable, it is used for internal purpose !!!
-%__make \
-  DESTDIR=%{?buildroot} \
-  PREFIX=%{tde_prefix} \
-  LIB=%{_lib}
-  
-
-%install
-%__rm -rf $RPM_BUILD_ROOT
-%__mkdir_p $RPM_BUILD_ROOT
-
-%__make install \
-  DESTDIR=%{?buildroot} \
-  PREFIX=%{tde_prefix} \
-  LIB=%{_lib} \
-  CHOWNPROG=/bin/true \
-  CHGRPPROG=/bin/true
-
-
-install -m 644 -D libkarma.fdi %buildroot%_sysconfdir/hal/fdi/information/20-rio-karma.fdi
-install -m 644 -D %SOURCE2 %buildroot%_sysconfdir/hal/fdi/policy/preferences.fdi
-install -m 644 -D %SOURCE3 %buildroot%{tde_datadir}/icons/hicolor/32x32/devices/multimedia-player-rio-karma.png
-
-cat > README%{?dist} << EOF
-For automatic mounting, add the following line to your
-/etc/fstab. Otherwise gnome-volume-manager will refuse to mount the
-device, as it doesn't know about the Karma's proprietary filesystem.
-
-/dev/disk/by-id/usb-Rio_Rio_Karma_0000000000000000-part2    /media/karma    omfs    user,noauto    0   0
-
-EOF
-
-install -m 644 -D %SOURCE4 %buildroot%{tde_libdir}/karma-sharp/karma-sharp.dll.config
-
-# Removes doc
-%__rm -rf %{?buildroot}%{tde_docdir}/libkarma/
-
-
-%post
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig || :
-
-%postun
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig || :
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root)
-%doc ChangeLog THANKS TODO README%{?dist}
-%config(noreplace) %_sysconfdir/hal/fdi/information/20-rio-karma.fdi
-%config(noreplace) %_sysconfdir/hal/fdi/policy/preferences.fdi
-%{tde_bindir}/riocp
-%{tde_bindir}/chprop
-%{tde_mandir}/man1/*.1*
-%attr(4755,root,root) %{tde_bindir}/karma_helper
-%{tde_datadir}/icons/hicolor/32x32/devices/multimedia-player-rio-karma.png
-%{tde_libdir}/libkarma.so.0*
-
-%files devel
-%defattr(-,root,root)
-%{tde_includedir}/libkarma/
-%{tde_libdir}/libkarma.a
-%{tde_libdir}/libkarma.so
-
-%files -n trinity-karma-sharp
-%defattr(-,root,root)
-%{tde_libdir}/karma-sharp/*
-%{tde_libdir}/pkgconfig/karma-sharp.pc
-
-
-
-
-%changelog
-* Fri Aug 03 2012 Francois Andriot <francois.andriot@free.fr> 0.1.2-2
-- Add support for MGA2 and MDV2011
-- Removes 'libs' subpackage
-- Fix installation directories
-
-* Mon Apr 30 2012 Francois Andriot <francois.andriot@free.fr> 0.1.2-1
-- Build for RHEL 5, RHEL 6, Fedora 15, Fedora 16, Fedora 17
-- Based on 'libkarma-0.1.2-1mdv2011.0'
-
diff --git a/redhat/extras/theme-baghira/trinity-theme-baghira.spec b/redhat/extras/theme-baghira/trinity-theme-baghira.spec
deleted file mode 100644
index 78d77eed8..000000000
--- a/redhat/extras/theme-baghira/trinity-theme-baghira.spec
+++ /dev/null
@@ -1,204 +0,0 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# Speed build options
-%define debug_package %{nil}
-%define __spec_install_post %{nil}
-AutoReq: no
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-Name:                   trinity-theme-baghira
-Version:                0.8
-Release:                1%{?dist}%{?_variant}
-Summary:                Baghira theme for Trinity
-License:                GPL
-Group:                  Graphical desktop/KDE
-Source0:		http://prdownloads.sourceforge.net/baghira/baghira-%{version}.tar.bz2
-Source1:				admin-3.5.13.1.tar.gz
-Patch0:					baghira-3.5.13.1-fix_ftbfs.patch
-Url:                    http://baghira.sourceforge.net/
-BuildRequires:          X11-devel
-BuildRequires:          jpeg-devel
-BuildRequires:          qt3-devel
-BuildRequires:          trinity-tdebase-devel
-BuildRoot:              %{_tmppath}/baghira-%{version}-buildroot
-
-%description
-Baghira is a very nice native Trinity style and windec
-originally based on Mosfet's Liquid style.
-
-This package contains non-free icons..
-
-%package devel
-Summary:        Header files and static libraries from %name
-Group:          Development/C
-Requires:		%{name} = %{version}-%{release}
-
-%description devel
-Libraries and includes files for
-developing programs based on %name
-
-This package is in PLF because it contains non-free icons.
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-%prep
-%setup -q -n baghira-%{version}
-%setup -q -n baghira-%{version} -a 1
-%patch0 -p1 -b .ftbfs
-
-%__rm -rf admin
-%__mv -f admin-3.5.13.1 admin
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i "admin/acinclude.m4.in" \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-export KDEDIR=%{tde_prefix}
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --includedir=%{tde_tdeincludedir} \
-  --datadir=%{tde_datadir} \
-  --with-qt-libraries=${QTLIB:-${QTDIR}/%{_lib}} \
-  --disable-static \
-  --disable-rpath \
-  --disable-debug --disable-warnings \
-  --disable-dependency-tracking --enable-final \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-%install
-%__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=$RPM_BUILD_ROOT
-
-install -d %{buildroot}/%{tde_libdir}/baghira-%{version}
-install -d %{buildroot}/%{tde_tdeincludedir}/baghira-%{version}
-
-mv %{buildroot}/%{tde_libdir}/libbaghirastarter.la %{buildroot}/%{tde_libdir}/baghira-%{version}/libbaghirastarter.la
-mv %{buildroot}/%{tde_libdir}/libbaghirastarter.so %{buildroot}/%{tde_libdir}/baghira-%{version}/libbaghirastarter.so.%{major}
-mv %{buildroot}/%{tde_libdir}/usermanager_panelapplet.la %{buildroot}/%{tde_libdir}/baghira-%{version}/usermanager_panelapplet.la
-mv %{buildroot}/%{tde_libdir}/usermanager_panelapplet.so %{buildroot}/%{tde_libdir}/baghira-%{version}/usermanager_panelapplet.so.%{major}
-mv %{buildroot}/%{tde_tdeincludedir}/baghirasidebar.h %{buildroot}/%{tde_tdeincludedir}/baghira-%{version}/baghirasidebar.h
-mv %{buildroot}/%{tde_tdeincludedir}/baghirasidebariface.h %{buildroot}/%{tde_tdeincludedir}/baghira-%{version}/baghirasidebariface.h
-mv %{buildroot}/%{tde_tdeincludedir}/dndlistbox.h %{buildroot}/%{tde_tdeincludedir}/baghira-%{version}/dndlistbox.h
-mv %{buildroot}/%{tde_tdeincludedir}/linkview.h %{buildroot}/%{tde_tdeincludedir}/baghira-%{version}/linkview.h
-mv %{buildroot}/%{tde_tdeincludedir}/listboxlink.h %{buildroot}/%{tde_tdeincludedir}/baghira-%{version}/listboxlink.h
-
-ln -s libbaghirastarter.so.%{major} %{buildroot}/%{tde_libdir}/baghira-%{version}/libbaghirastarter.so
-ln -s usermanager_panelapplet.so.%{major} %{buildroot}/%{tde_libdir}/baghira-%{version}/usermanager_panelapplet.so
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%files
-%defattr(-,root,root)
-%doc README AUTHORS ChangeLog COPYING NEWS TODO
-%{tde_bindir}/bab
-%{tde_tdelibdir}/b_menu_panelapplet.*
-%{tde_tdelibdir}/kstyle_baghira_config.*
-%{tde_tdelibdir}/kwin3_baghira.*
-%{tde_tdelibdir}/kwin_baghira_config.*
-%{tde_tdelibdir}/plugins/styles/baghira.*
-%{tde_datadir}/apps/kdisplay/color-schemes/Aqua*
-#%{tde_datadir}/apps/kicker/applets/b_menuapplet.desktop
-%{tde_datadir}/apps/kicker/applets/usermanager.desktop
-%{tde_datadir}/apps/konqsidebartng/add/baghirasidebar_add.desktop
-%{tde_datadir}/apps/konqsidebartng/entries/baghirasidebar.desktop
-%{tde_datadir}/apps/kicker/applets/starter.desktop
-%{tde_datadir}/apps/kstyle/themes/baghira.themerc
-%{tde_datadir}/apps/kwin/baghira.desktop
-%{tde_datadir}/icons/crystalsvg/*/*/baghira*
-%{tde_datadir}/icons/crystalsvg/*/*/bab_*
-%{tde_datadir}/apps/baghira/poof.png
-%{tde_datadir}/icons/crystalsvg/22x22/actions/bStarter.png
-%{tde_datadir}/icons/crystalsvg/22x22/actions/bStarter_down.png
-%{tde_datadir}/icons/crystalsvg/22x22/actions/bStarter_hover.png
-
-
-%files devel
-%defattr(-,root,root)
-%{tde_libdir}/baghira-%{version}/libbaghirastarter.la
-%{tde_libdir}/baghira-%{version}/libbaghirastarter.so*
-%{tde_tdelibdir}/konqsidebar_baghirasidebar.la
-%{tde_tdelibdir}/konqsidebar_baghirasidebar.so
-%{tde_libdir}/baghira-%{version}/usermanager_panelapplet.la
-%{tde_libdir}/baghira-%{version}/usermanager_panelapplet.so*
-%{tde_tdeincludedir}/baghira-%{version}/baghirasidebar.h
-%{tde_tdeincludedir}/baghira-%{version}/baghirasidebariface.h
-%{tde_tdeincludedir}/baghira-%{version}/dndlistbox.h
-%{tde_tdeincludedir}/baghira-%{version}/linkview.h
-%{tde_tdeincludedir}/baghira-%{version}/listboxlink.h
-
-
-%changelog
-* Tue Nov 20 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.1
-- Initial build for TDE 3.5.13.1
-
-* Tue Jan 8 2008 Javier Rodas <jrodas@zarb.org> 0.8-2plf2008.1
-- KDE 3.5.8 version in Mandriva 2008.1
-- KDE svn admin headers now packaged in Source1
-
-* Mon Sep 18 2006 Javier Rodas <jrodas@zarb.org> 0.8-2plf2007.0
-- Fix Source0 local reference
-- KDE 3.5.4 admin headers are downloaded with subversion
-- Fix Baghira devel package directory paths
-- Fix BuildRequires
-
-* Fri Sep 15 2006 Javier Rodas <jrodas@zarb.org> 0.8-1plf2007.0
-- 0.8
-- Replaced KDE admin headers in the source file (for KDE 3.5.4)
-- Fix BuildRequires
-- Removed the patch file
-
-* Thu Oct 13 2005 neoclust <neoclust@mandriva.com> 0.7-1plf
-- 0.7
-- remove redundant buildrequires
-
-* Mon Mar 04 2005 Nicolas L�ureuil <neoclust@zarb.org> 0.6-3plf
-- Add PLF reason
-- bzipped patch 
-- Make rpmlint happier
-
-* Mon Mar 04 2005 Nicolas L�ureuil <neoclust@zarb.org> 0.6-2plf
-- New version
-- Fix compile ( Patch0 from Gentoo)
-- Spec Cleanup
-- rpmbuildupdatable
-
-* Mon Dec 06 2004 Laurent Culioli <laurent@zarb.org> 0.6-1plf
-- Initial Release.
diff --git a/redhat/extras/trinity-desktop/trinity-desktop.spec b/redhat/extras/trinity-desktop/trinity-desktop.spec
index 45917cdf6..b41d48879 100644
--- a/redhat/extras/trinity-desktop/trinity-desktop.spec
+++ b/redhat/extras/trinity-desktop/trinity-desktop.spec
@@ -1,11 +1,12 @@
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
 %define _docdir %{_datadir}/doc
+%define tde_datadir %{tde_prefix}/share
 %endif
 
 Name:		trinity-desktop
-Version:	3.5.13.1
+Version:	3.5.13.2
 Release:	1%{?dist}%{?_variant}
 License:	GPL
 Summary:	Meta-package to install TDE
@@ -21,9 +22,10 @@ BuildArch:	noarch
 
 Source0:	trinity-3.5.13-fedora.repo
 Source1:	trinity-3.5.13-rhel.repo
+Source2:	RPM-GPG-KEY-trinity
 
-Obsoletes:	trinity-desktop-extras < %{version}-%{release}
-Provides:	trinity-desktop-extras = %{version}-%{release}
+Source11:	pclinuxos201304-32.jpg
+Source12:	pclinuxos201304-64.jpg
 
 Requires:	trinity-tdeaccessibility >= %{version}
 Requires:	trinity-tdeaddons >= %{version}
@@ -82,7 +84,7 @@ Group:		User Interface/Desktops
 Summary:	Meta-package to install all TDE applications
 
 # Some applications are disabled for now ...
-# Compiz-related stuff
+# Compiz-related stuff does not work (obsolete)
 #Requires: trinity-compizconfig-backend-kconfig
 #Requires: trinity-desktop-effects-kde
 #Requires: trinity-fusion-icon
@@ -101,7 +103,7 @@ Summary:	Meta-package to install all TDE applications
 #Requires: trinity-qt4-tqt-theme-engine
 
 # Warning, k9copy requires ffmpeg
-# Warning, kradio requires libmp3lame
+# Warning, tderadio requires libmp3lame
 Requires: trinity-abakus
 Requires: trinity-amarok
 Requires: trinity-basket
@@ -112,34 +114,18 @@ Requires: trinity-filelight
 Requires: trinity-gwenview
 Requires: trinity-gwenview-i18n
 Requires: trinity-k3b
-Requires: trinity-k9copy
-Requires: trinity-kaffeine
-Requires: trinity-kaffeine-mozilla
 Requires: trinity-katapult
 Requires: trinity-kbarcode
 Requires: trinity-kbfx
 Requires: trinity-kbookreader
 Requires: trinity-kchmviewer
-Requires: trinity-kcmautostart
 Requires: trinity-kcpuload
-Requires: trinity-kdbusnotification
-Requires: trinity-guidance
-Requires: trinity-guidance-powermanager
-Requires: trinity-style-lipstik
-Requires: trinity-style-qtcurve
-Requires: trinity-systemsettings
-Requires: trinity-kdesudo
-Requires: trinity-kdesvn
+Requires: trinity-k9copy
 Requires: trinity-kdiff3
 Requires: trinity-kdirstat
-Requires: trinity-kdmtheme
 Requires: trinity-keep
 Requires: trinity-kile
-Requires: trinity-kima
-Requires: trinity-kio-locate
-Requires: trinity-kio-umountwrapper
 Requires: trinity-kiosktool
-Requires: trinity-kmplayer
 Requires: trinity-kmyfirewall
 Requires: trinity-kmymoney
 Requires: trinity-knemo
@@ -150,9 +136,7 @@ Requires: trinity-knowit
 Requires: trinity-knutclient
 Requires: trinity-koffice-suite
 Requires: trinity-konversation
-Requires: trinity-kopete-otr
 Requires: trinity-kpicosim
-Requires: trinity-kradio
 Requires: trinity-krename
 Requires: trinity-krusader
 Requires: trinity-ksplash-engine-moodin
@@ -161,18 +145,31 @@ Requires: trinity-kstreamripper
 Requires: trinity-ksystemlog
 Requires: trinity-ktechlab
 Requires: trinity-ktorrent
+Requires: trinity-kuickshow
 Requires: trinity-kvirc
 Requires: trinity-kvkbd
-Requires: trinity-kwin-style-crystal
+Requires: trinity-twin-style-crystal
 Requires: trinity-piklab
 Requires: trinity-potracegui
-Requires: trinity-smartcardauth
 Requires: trinity-smb4k
+Requires: trinity-smartcardauth
 Requires: trinity-soundkonverter
+Requires: trinity-tde-guidance
+Requires: trinity-tde-guidance-powermanager
+Requires: trinity-tde-style-lipstik
+Requires: trinity-tde-style-qtcurve
+Requires: trinity-tde-systemsettings
+Requires: trinity-tdeio-apt
+Requires: trinity-tdeio-locate
+Requires: trinity-tdeio-umountwrapper
+Requires: trinity-tderadio
+Requires: trinity-tdesudo
+Requires: trinity-tdmtheme
 Requires: trinity-tellico
 Requires: trinity-wlassistant
 Requires: trinity-yakuake
 
+
 # Disabled applications for RHEL5
 %if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
 # On RHEL 5, HAL version is too old for kpowersave .
@@ -185,19 +182,13 @@ Requires: trinity-rosegarden
 Requires: trinity-kpilot
 %endif
 
-# This one causes several crashes .
+# This one causes several crashes . Obsolete.
 #Requires: trinity-kgtk-qt3
+Obsoletes: trinity-kgtk-qt3
 
-# Disabled applications for OPENSUSE 12.2, Mageia 2
-%if 0%{?rhel} || 0%{?fedora} >= 15
-# no imlib1.x library
-Requires: trinity-kuickshow
-%endif
-
+# OBSOLETE: beagle does not exist anymore. Kerry is now useless.
 # RHEL, openSUSE 12: no Beagle library
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion}
-Requires: trinity-kerry
-%endif
+Obsoletes: trinity-kerry
 
 # RHEL 6 only: knetworkmanager8
 #  knetworkmanager9 is too unstable for now.
@@ -205,6 +196,21 @@ Requires: trinity-kerry
 Requires: trinity-knetworkmanager
 %endif
 
+# RHEL 4
+%if 0%{?rhel} >= 5 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+# HAL is too old
+Requires: trinity-kima
+Requires: trinity-kaffeine
+Requires: trinity-kaffeine-mozilla
+Requires: trinity-kmplayer
+# No OTR support
+Requires: trinity-kopete-otr
+# No DBUS support
+Requires: trinity-kdbusnotification
+# Subversion 1.1 is too old
+Requires: trinity-tdesvn
+%endif
+
 %description applications
 %{summary}
 
@@ -219,9 +225,31 @@ Summary:	Meta-package to install all extras (unofficial) TDE packages
 Requires:	trinity-akode
 Requires:	trinity-kasablanca
 #Requires:	trinity-kdebluetooth
+#Requires:	trinity-kcheckgmail
+Requires:	trinity-icons-crystalsvg-updated
+Requires:	trinity-icons-kfaenza
+Requires:	trinity-icons-oxygen
+Requires:	trinity-kbibtex
+Requires:	trinity-kbiff
+Requires:	trinity-kcmautostart
+Requires:	trinity-kftpgrabber
 Requires:	trinity-kickoff-i18n
+Requires:	trinity-knmap
+#Requires:	trinity-knoda
 Requires:	trinity-ksensors
+Requires:	trinity-kshowmail
+Requires:	trinity-mplayerthumbs
 Requires:	trinity-style-ia-ora
+Requires:	trinity-tdeio-ftps-plugin
+#Requires:	trinity-tdeio-sysinfo-plugin
+Requires:	trinity-theme-baghira
+Requires:	trinity-tork
+
+
+# GLIBC too old on RHEL <= 5
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6
+Requires:	trinity-twinkle
+%endif
 
 %description extras
 %{summary}
@@ -254,10 +282,31 @@ Summary:	Yum configuration files for Trinity
 %description -n trinity-repo
 %{summary}
 
+%pre -n trinity-repo
+# Make sure every Trinity related repository is deleted before installing new one.
+%__rm -f %{_sysconfdir}/yum.repos.d/trinity-*.repo
+
 %files -n trinity-repo
+%defattr(-,root,root,-)
 %{_sysconfdir}/yum.repos.d/*.repo
+%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-trinity
 %endif
 
+##########
+
+%if 0%{?pclinuxos}
+%package -n trinity-wallpaper-theme-default
+Group:		User Interface/Desktops
+Summary:	Default wallpaper for Trinity
+
+%description -n trinity-wallpaper-theme-default
+%{summary}
+
+%files -n trinity-wallpaper-theme-default
+%defattr(-,root,root,-)
+%{tde_datadir}/wallpapers/pclinuxos32.jpg
+%{tde_datadir}/wallpapers/pclinuxos64.jpg
+%endif
 
 ##########
 
@@ -267,31 +316,46 @@ Summary:	Yum configuration files for Trinity
 
 %install
 %__rm -rf %{?buildroot}
-%__mkdir_p %{?buildroot}%{_sysconfdir}/yum.repos.d
+%__mkdir_p "%{?buildroot}%{_sysconfdir}/yum.repos.d"
 
-# Fedora repo file
-%if 0%{?fedora} > 0
+# FEDORA configuration for YUM
+%if 0%{?fedora}
 %__sed %{SOURCE0} \
   -e 's/\$releasever/%{fedora}/g' \
   -e 's/-fedora/-f%{fedora}/g' \
-  >%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity-3.5.13.repo
+  >"%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity-3.5.13.repo"
 %endif
 
-# RHEL repo file
+# RHEL configuration for YUM
 # $releasever is replaced with its value
-%if 0%{?rhel} > 0
+%if 0%{?rhel}
 %__sed %{SOURCE1} \
   -e 's/\$releasever/%{rhel}/g' \
-  >%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity-3.5.13.repo
+  >"%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity-3.5.13.repo"
 %endif
 
 %if 0%{?fedora} || 0%{?rhel}
 %__chmod 644 %{?buildroot}%{_sysconfdir}/yum.repos.d/*.repo
 %endif
 
+# RPM signing key
+%if 0%{?rhel} || 0%{?fedora}
+%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-trinity"
+%endif
+
+# PCLinuxOS wallpaper
+%if 0%{?pclinuxos} == 2013
+%__install -D -m 644 "%{SOURCE11}" "%{?buildroot}%{tde_datadir}/wallpapers/pclinuxos32.jpg"
+%__install -D -m 644 "%{SOURCE12}" "%{?buildroot}%{tde_datadir}/wallpapers/pclinuxos64.jpg"
+%endif
+
 %changelog
+* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
+- Update to version 3.5.13.2
+- Add GPG signing key
+
 * Mon Oct 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Update to major version 3.5.13.1
+- Update to version 3.5.13.1
 
 * Mon Aug 06 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-6
 - Add 'applications' subpackage
diff --git a/redhat/extras/trinity-live/trinity-live.spec b/redhat/extras/trinity-live/trinity-live.spec
index 66b495c48..e66cc7219 100644
--- a/redhat/extras/trinity-live/trinity-live.spec
+++ b/redhat/extras/trinity-live/trinity-live.spec
@@ -3,7 +3,7 @@
 %define tde_bindir %{tde_prefix}/bin
 
 Name:		trinity-live
-Version:	3.5.13.1
+Version:	3.5.13.2
 Release:	1%{?dist}
 License:	GPL
 Summary:	Trinity Spins
diff --git a/redhat/tdeaccessibility/trinity-kdeaccessibility-3.5.13.1.spec b/redhat/tdeaccessibility/trinity-kdeaccessibility-3.5.13.1.spec
index 8981e13be..9fcde2131 100644
--- a/redhat/tdeaccessibility/trinity-kdeaccessibility-3.5.13.1.spec
+++ b/redhat/tdeaccessibility/trinity-kdeaccessibility-3.5.13.1.spec
@@ -470,7 +470,7 @@ export KDEDIR=%{tde_prefix}
 
 # Specific path for RHEL4
 if [ -d /usr/X11R6 ]; then
-  export CXXFLAGS="${CXXFLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+  export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
 fi
 
 %configure \
diff --git a/redhat/tdeadmin/trinity-kdeadmin-3.5.13.1.spec b/redhat/tdeadmin/trinity-kdeadmin-3.5.13.1.spec
index a24231cf5..89a58392b 100644
--- a/redhat/tdeadmin/trinity-kdeadmin-3.5.13.1.spec
+++ b/redhat/tdeadmin/trinity-kdeadmin-3.5.13.1.spec
@@ -385,7 +385,7 @@ export KDEDIR=%{tde_prefix}
 
 # Specific path for RHEL4
 if [ -d /usr/X11R6 ]; then
-  export CXXFLAGS="${CXXFLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+  export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
 fi
 
 %configure \
diff --git a/redhat/tdeartwork/trinity-kdeartwork-3.5.13.1.spec b/redhat/tdeartwork/trinity-kdeartwork-3.5.13.1.spec
index c315ca170..32c66dd05 100644
--- a/redhat/tdeartwork/trinity-kdeartwork-3.5.13.1.spec
+++ b/redhat/tdeartwork/trinity-kdeartwork-3.5.13.1.spec
@@ -639,7 +639,7 @@ export LD_LIBRARY_PATH="%{tde_libdir}"
 
 # Specific path for RHEL4
 if [ -d /usr/X11R6 ]; then
-  export CXXFLAGS="${CXXFLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+  export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
 fi
 
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
diff --git a/redhat/tdebase/trinity-kdebase-3.5.13.1.spec b/redhat/tdebase/trinity-kdebase-3.5.13.1.spec
index ad481b77e..f58a045fb 100644
--- a/redhat/tdebase/trinity-kdebase-3.5.13.1.spec
+++ b/redhat/tdebase/trinity-kdebase-3.5.13.1.spec
@@ -3105,8 +3105,8 @@ export KDEDIR=%{tde_prefix}
 # Shitty hack for RHEL4 ...
 if [ -d /usr/X11R6 ]; then
   export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH=}:/usr/X11R6/include:/usr/X11R6/%{_lib}"
-  export CFLAGS="${CFLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-  export CXXFLAGS="${CXXFLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+  export CFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+  export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
 fi
 
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
diff --git a/redhat/tdebase/trinity-kdebase-3.5.13.spec b/redhat/tdebase/trinity-kdebase-3.5.13.spec
index 13cfdd037..5e69920e9 100644
--- a/redhat/tdebase/trinity-kdebase-3.5.13.spec
+++ b/redhat/tdebase/trinity-kdebase-3.5.13.spec
@@ -3186,8 +3186,8 @@ export KDEDIR=%{tde_prefix}
 # Shitty hack for RHEL4 ...
 if [ -d /usr/X11R6 ]; then
   export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH=}:/usr/X11R6/include:/usr/X11R6/%{_lib}"
-  export CFLAGS="${CFLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-  export CXXFLAGS="${CXXFLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+  export CFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+  export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
 fi
 
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
diff --git a/redhat/tdebindings/trinity-kdebindings-3.5.13.1.spec b/redhat/tdebindings/trinity-kdebindings-3.5.13.1.spec
index 55c4e5b04..e94009b78 100644
--- a/redhat/tdebindings/trinity-kdebindings-3.5.13.1.spec
+++ b/redhat/tdebindings/trinity-kdebindings-3.5.13.1.spec
@@ -1003,7 +1003,7 @@ export DO_NOT_COMPILE="$DO_NOT_COMPILE python"
 
 # Specific path for RHEL4
 if [ -d /usr/X11R6 ]; then
-  export CXXFLAGS="${CXXFLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+  export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
 fi
 
 %configure \
diff --git a/redhat/tdeedu/trinity-kdeedu-3.5.13.1.spec b/redhat/tdeedu/trinity-kdeedu-3.5.13.1.spec
index 8748a13eb..40e829b90 100644
--- a/redhat/tdeedu/trinity-kdeedu-3.5.13.1.spec
+++ b/redhat/tdeedu/trinity-kdeedu-3.5.13.1.spec
@@ -1335,8 +1335,8 @@ export KDEDIR=%{tde_prefix}
 
 # Specific path for RHEL4
 if [ -d /usr/X11R6 ]; then
-  export CXXFLAGS="${CXXFLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-  export CFLAGS="${CFLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+  export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+  export CFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
 fi
 
 %configure \
diff --git a/redhat/tdegames/trinity-kdegames-3.5.13.1.spec b/redhat/tdegames/trinity-kdegames-3.5.13.1.spec
index 6fa811258..d8dffc2ad 100644
--- a/redhat/tdegames/trinity-kdegames-3.5.13.1.spec
+++ b/redhat/tdegames/trinity-kdegames-3.5.13.1.spec
@@ -1542,7 +1542,7 @@ export KDEDIR=%{tde_prefix}
 
 # Specific path for RHEL4
 if [ -d /usr/X11R6 ]; then
-  export CXXFLAGS="${CXXFLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+  export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
 fi
 
 %configure \
diff --git a/redhat/tdegraphics/trinity-kdegraphics-3.5.13.1.spec b/redhat/tdegraphics/trinity-kdegraphics-3.5.13.1.spec
index 5cf3ecd8f..2268633da 100644
--- a/redhat/tdegraphics/trinity-kdegraphics-3.5.13.1.spec
+++ b/redhat/tdegraphics/trinity-kdegraphics-3.5.13.1.spec
@@ -1241,7 +1241,7 @@ export KDEDIR=%{tde_prefix}
 
 # Specific path for RHEL4
 if [ -d /usr/X11R6 ]; then
-  export CXXFLAGS="${CXXFLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+  export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
 fi
 
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
diff --git a/redhat/tdelibs/tdelibs-r14.spec b/redhat/tdelibs/tdelibs-r14.spec
index d57bea3a6..d57bea3a6 100755..100644
--- a/redhat/tdelibs/tdelibs-r14.spec
+++ b/redhat/tdelibs/tdelibs-r14.spec
diff --git a/redhat/tdelibs/trinity-kdelibs-3.5.12.spec b/redhat/tdelibs/trinity-kdelibs-3.5.12.spec
index 4c31bba3e..4c31bba3e 100755..100644
--- a/redhat/tdelibs/trinity-kdelibs-3.5.12.spec
+++ b/redhat/tdelibs/trinity-kdelibs-3.5.12.spec
diff --git a/redhat/tdelibs/trinity-kdelibs-3.5.13.1.spec b/redhat/tdelibs/trinity-kdelibs-3.5.13.1.spec
index 82df03623..67847efec 100755..100644
--- a/redhat/tdelibs/trinity-kdelibs-3.5.13.1.spec
+++ b/redhat/tdelibs/trinity-kdelibs-3.5.13.1.spec
@@ -358,7 +358,7 @@ export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
 export LD_LIBRARY_PATH="%{tde_libdir}"
 
 if [ -d /usr/X11R6 ]; then
-  export CXXFLAGS="${CXXFLAGS} -L/usr/X11R6/%{_lib} -I/usr/X11R6/include"
+  export CXXFLAGS="${RPM_OPT_FLAGS} -L/usr/X11R6/%{_lib} -I/usr/X11R6/include"
 fi
 
 
diff --git a/redhat/tdelibs/trinity-kdelibs-3.5.13.spec b/redhat/tdelibs/trinity-kdelibs-3.5.13.spec
index 0392162bf..0392162bf 100755..100644
--- a/redhat/tdelibs/trinity-kdelibs-3.5.13.spec
+++ b/redhat/tdelibs/trinity-kdelibs-3.5.13.spec
diff --git a/redhat/tdemultimedia/trinity-kdemultimedia-3.5.13.1.spec b/redhat/tdemultimedia/trinity-kdemultimedia-3.5.13.1.spec
index 851c14e34..3bd093778 100644
--- a/redhat/tdemultimedia/trinity-kdemultimedia-3.5.13.1.spec
+++ b/redhat/tdemultimedia/trinity-kdemultimedia-3.5.13.1.spec
@@ -1111,7 +1111,7 @@ export KDEDIRS=%{tde_prefix}
 
 # Specific path for RHEL4
 if [ -d /usr/X11R6 ]; then
-  export CXXFLAGS="${CXXFLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+  export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
 fi
 
 %configure  \
diff --git a/redhat/tdenetwork/trinity-kdenetwork-3.5.13.1.spec b/redhat/tdenetwork/trinity-kdenetwork-3.5.13.1.spec
index ee0f0bc2e..17f8e2140 100644
--- a/redhat/tdenetwork/trinity-kdenetwork-3.5.13.1.spec
+++ b/redhat/tdenetwork/trinity-kdenetwork-3.5.13.1.spec
@@ -1086,7 +1086,7 @@ export LD_LIBRARY_PATH="%{tde_libdir}"
 
 # Specific path for RHEL4
 if [ -d /usr/X11R6 ]; then
-  export CXXFLAGS="${CXXFLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+  export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
 fi
 
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
diff --git a/redhat/tdepim/trinity-kdepim-3.5.13.1.spec b/redhat/tdepim/trinity-kdepim-3.5.13.1.spec
index 8a2c65922..e95b6798e 100644
--- a/redhat/tdepim/trinity-kdepim-3.5.13.1.spec
+++ b/redhat/tdepim/trinity-kdepim-3.5.13.1.spec
@@ -2105,7 +2105,7 @@ export LD_LIBRARY_PATH="%{tde_libdir}"
 
 # Specific path for RHEL4
 if [ -d /usr/X11R6 ]; then
-  export CXXFLAGS="${CXXFLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+  export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
 fi
 
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
diff --git a/redhat/tdesdk/trinity-kdesdk-3.5.13.1.spec b/redhat/tdesdk/trinity-kdesdk-3.5.13.1.spec
index 0e28a5b41..1301a84ab 100644
--- a/redhat/tdesdk/trinity-kdesdk-3.5.13.1.spec
+++ b/redhat/tdesdk/trinity-kdesdk-3.5.13.1.spec
@@ -1086,7 +1086,7 @@ export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
 
 # Specific path for RHEL4
 if [ -d /usr/X11R6 ]; then
-  export CXXFLAGS="${CXXFLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+  export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
 fi
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
 %__mkdir_p build
diff --git a/redhat/tdeutils/trinity-kdeutils-3.5.12.spec b/redhat/tdeutils/trinity-kdeutils-3.5.12.spec
index 5cf187ce2..5cf187ce2 100755..100644
--- a/redhat/tdeutils/trinity-kdeutils-3.5.12.spec
+++ b/redhat/tdeutils/trinity-kdeutils-3.5.12.spec
diff --git a/redhat/tdeutils/trinity-kdeutils-3.5.13.1.spec b/redhat/tdeutils/trinity-kdeutils-3.5.13.1.spec
index 64af28904..a7465fceb 100755..100644
--- a/redhat/tdeutils/trinity-kdeutils-3.5.13.1.spec
+++ b/redhat/tdeutils/trinity-kdeutils-3.5.13.1.spec
@@ -947,7 +947,7 @@ export KDEDIR=%{tde_prefix}
 
 # Specific path for RHEL4
 if [ -d /usr/X11R6 ]; then
-  export CXXFLAGS="${CXXFLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+  export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
 fi
 
 %configure \
diff --git a/redhat/tdeutils/trinity-kdeutils-3.5.13.spec b/redhat/tdeutils/trinity-kdeutils-3.5.13.spec
index d85cfc7d4..d85cfc7d4 100755..100644
--- a/redhat/tdeutils/trinity-kdeutils-3.5.13.spec
+++ b/redhat/tdeutils/trinity-kdeutils-3.5.13.spec
diff --git a/redhat/tdevelop/trinity-kdevelop-3.5.13.1.spec b/redhat/tdevelop/trinity-kdevelop-3.5.13.1.spec
index 251deb76b..2a8d59cc2 100644
--- a/redhat/tdevelop/trinity-kdevelop-3.5.13.1.spec
+++ b/redhat/tdevelop/trinity-kdevelop-3.5.13.1.spec
@@ -581,7 +581,7 @@ export LD_LIBRARY_PATH="%{tde_libdir}"
 
 # Specific path for RHEL4
 if [ -d /usr/X11R6 ]; then
-  export CXXFLAGS="${CXXFLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+  export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
 fi
 
 # c references
diff --git a/redhat/tdewebdev/trinity-kdewebdev-3.5.13.1.spec b/redhat/tdewebdev/trinity-kdewebdev-3.5.13.1.spec
index 2d08aac0f..b415c063f 100644
--- a/redhat/tdewebdev/trinity-kdewebdev-3.5.13.1.spec
+++ b/redhat/tdewebdev/trinity-kdewebdev-3.5.13.1.spec
@@ -501,7 +501,7 @@ export KDEDIR=%{tde_prefix}
 
 # Specific path for RHEL4
 if [ -d /usr/X11R6 ]; then
-  export CXXFLAGS="${CXXFLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+  export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
 fi
 
 %configure \