RPM Packaging: update existing SPEC files

11 files changed, 5 insertions, 757 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