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

35 files changed, 3787 insertions, 24 deletions

diff --git a/redhat/applications/abakus/trinity-abakus-3.5.13.spec b/redhat/applications/abakus/trinity-abakus-3.5.13.spec
new file mode 100644
index 000000000..616896d1e
--- /dev/null
+++ b/redhat/applications/abakus/trinity-abakus-3.5.13.spec
@@ -0,0 +1,97 @@
+# Default version for this component
+%define kdecomp abakus
+%define version 0.91
+%define release 2
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%define _variant .opt
+%define _docdir %{_prefix}/share/doc
+%endif
+
+# TDE 3.5.13 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}/kde
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/trinity
+
+
+Name:		trinity-%{kdecomp}
+Summary:	Calculator for TDE
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+Prefix:    %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+
+BuildRequires:	tqtinterface-devel
+BuildRequires:	trinity-kdelibs-devel
+BuildRequires:	trinity-kdebase-devel
+BuildRequires:	desktop-file-utils
+BuildRequires:	scons
+BuildRequires:	bison
+
+%description
+AbaKus is a complex calculator, which provides
+many different kinds of calculations.
+Think of it as bc (the command-line calculator) with a nice GUI.
+It also gives information about mathematical variables and
+has the user-friendly menu options of a normal KDE application.
+
+%prep
+%setup -q -n applications/%{kdecomp}
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+export CXXFLAGS="-I%{_includedir}/tqt"
+
+./configure
+	
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}%{_prefix}
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{_bindir}/*
+%{_datadir}/apps/*/
+%{_datadir}/icons/*/*/*/*
+%{tde_docdir}/HTML/*/*/
+%{_datadir}/applnk/Utilities/abakus.desktop
+
+%Changelog
+* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.91-2
+- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
+
+* 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/amarok/amarok-1.4.8-gcc43.patch b/redhat/applications/amarok/amarok-1.4.8-gcc43.patch
new file mode 100644
index 000000000..8b0c78133
--- /dev/null
+++ b/redhat/applications/amarok/amarok-1.4.8-gcc43.patch
@@ -0,0 +1,79 @@
+diff -up amarok-1.4.8/amarok/src/metadata/mp4/mp4file.cpp.gcc43 amarok-1.4.8/amarok/src/metadata/mp4/mp4file.cpp
+--- amarok-1.4.8/amarok/src/metadata/mp4/mp4file.cpp.gcc43	2007-12-17 09:53:19.000000000 -0600
++++ amarok-1.4.8/amarok/src/metadata/mp4/mp4file.cpp	2008-02-21 21:05:18.000000000 -0600
+@@ -30,6 +30,7 @@ email                : aumuell@reserv.at
+ #include <audioproperties.h>
+ 
+ #include <stdint.h>
++#include <cstdlib>
+ 
+ #define MP4V2_HAS_WRITE_BUG 1
+ 
+diff -up amarok-1.4.8/amarok/src/metadata/mp4/taglib_mp4filetyperesolver.cpp.gcc43 amarok-1.4.8/amarok/src/metadata/mp4/taglib_mp4filetyperesolver.cpp
+--- amarok-1.4.8/amarok/src/metadata/mp4/taglib_mp4filetyperesolver.cpp.gcc43	2007-12-17 09:53:19.000000000 -0600
++++ amarok-1.4.8/amarok/src/metadata/mp4/taglib_mp4filetyperesolver.cpp	2008-02-21 21:05:18.000000000 -0600
+@@ -24,6 +24,7 @@
+ 
+ #include "taglib_mp4filetyperesolver.h"
+ #include "mp4file.h"
++#include <cstring>
+ 
+ TagLib::File *MP4FileTypeResolver::createFile(const char *fileName,
+         bool readProperties,
+diff -up amarok-1.4.8/amarok/src/metadata/mp4/mp4tag.cpp.gcc43 amarok-1.4.8/amarok/src/metadata/mp4/mp4tag.cpp
+--- amarok-1.4.8/amarok/src/metadata/mp4/mp4tag.cpp.gcc43	2007-12-17 09:53:19.000000000 -0600
++++ amarok-1.4.8/amarok/src/metadata/mp4/mp4tag.cpp	2008-02-21 21:05:18.000000000 -0600
+@@ -24,6 +24,8 @@ email                : andrew.leadbetter
+ 
+ #include <tag.h>
+ #include <stdint.h>
++#include <cstdlib>
++#include <cstring>
+ 
+ using namespace TagLib;
+ 
+diff -up amarok-1.4.8/amarok/src/metadata/mp4/mp4properties.cpp.gcc43 amarok-1.4.8/amarok/src/metadata/mp4/mp4properties.cpp
+--- amarok-1.4.8/amarok/src/metadata/mp4/mp4properties.cpp.gcc43	2007-12-17 09:53:19.000000000 -0600
++++ amarok-1.4.8/amarok/src/metadata/mp4/mp4properties.cpp	2008-02-21 21:05:18.000000000 -0600
+@@ -30,6 +30,7 @@ email                : andrew.leadbetter
+ #endif
+ 
+ #include <stdint.h>
++#include <cstring>
+ 
+ #ifndef UINT64_TO_DOUBLE
+ #define UINT64_TO_DOUBLE(a) ((double)((int64_t)(a)))
+diff -up amarok-1.4.8/amarok/src/engine/helix/hxplayercontrol.cpp.gcc43 amarok-1.4.8/amarok/src/engine/helix/hxplayercontrol.cpp
+--- amarok-1.4.8/amarok/src/engine/helix/hxplayercontrol.cpp.gcc43	2007-12-17 09:53:18.000000000 -0600
++++ amarok-1.4.8/amarok/src/engine/helix/hxplayercontrol.cpp	2008-02-21 21:07:10.000000000 -0600
+@@ -15,6 +15,8 @@
+  the alsa guys
+  ***************************************************************************/
+ 
++#include <cstdlib>
++#include <cstring>
+ #include <sys/time.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
+diff -up amarok-1.4.8/amarok/src/engine/helix/helix-sp/helix-sp.h.gcc43 amarok-1.4.8/amarok/src/engine/helix/helix-sp/helix-sp.h
+--- amarok-1.4.8/amarok/src/engine/helix/helix-sp/helix-sp.h.gcc43	2007-12-17 09:53:18.000000000 -0600
++++ amarok-1.4.8/amarok/src/engine/helix/helix-sp/helix-sp.h	2008-02-21 21:07:54.000000000 -0600
+@@ -23,6 +23,7 @@ class HelixSimplePlayerAudioStreamInfoRe
+ #include <limits.h>
+ #include <sys/param.h>
+ #include <pthread.h>
++#include <cstring>
+ #include <vector>
+ #include <config.h>
+ #include <iostream>
+diff -up amarok-1.4.8/amarok/src/engine/helix/helix-engine.cpp.gcc43 amarok-1.4.8/amarok/src/engine/helix/helix-engine.cpp
+--- amarok-1.4.8/amarok/src/engine/helix/helix-engine.cpp.gcc43	2007-12-17 09:53:18.000000000 -0600
++++ amarok-1.4.8/amarok/src/engine/helix/helix-engine.cpp	2008-02-21 21:09:38.000000000 -0600
+@@ -15,6 +15,7 @@
+ #include <climits>
+ #include <cmath>
+ #include <stdarg.h>
++#include <cstring>
+ 
+ #include <config.h>
+ 
diff --git a/redhat/applications/amarok/trinity-amarok.spec b/redhat/applications/amarok/trinity-amarok.spec
new file mode 100644
index 000000000..a181d1246
--- /dev/null
+++ b/redhat/applications/amarok/trinity-amarok.spec
@@ -0,0 +1,302 @@
+# If Trinity is built in a specific prefix, we move all directories under it
+%if "%{_prefix}" != "/usr"
+%define _variant .opt
+%endif
+
+# Basic package informations
+%define kdecomp amarok
+%define version 1.4.10
+%define release 1
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%define _variant .opt
+%define _docdir %{_prefix}/share/doc
+%endif
+
+# TDE 3.5.13 specific building variables
+BuildRequires:	cmake >= 2.8
+%define tde_docdir %{_docdir}/kde
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/trinity
+
+
+
+# TODO:
+# Rio Karma support : libkarma
+
+%if 0%{?fedora} > 0 && 0%{?fedora} < 9
+# define to include konquisidebar support for kde3 desktop
+%define konq 1
+%endif
+
+# No Xine support on older RHEL
+%if 0%{?rhel} && 0%{?rhel} <= 5
+%define _with_xine %{nil}
+%else
+%define _with_xine 1
+%endif
+
+Name:    trinity-%{kdecomp}
+Summary: A drop-down terminal emulator.
+Version: %{version}
+Release: %{release}%{?dist}%{?_variant}
+
+Group: 	    Applications/Multimedia
+License:    GPLv2+
+Url:        http://amarok.kde.org
+Source0:    amarok-3.5.13.tar.gz
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+# RedHat / Fedora legacy patches
+Patch1:     amarok-1.4.8-gcc43.patch
+
+BuildRequires:  alsa-lib-devel
+BuildRequires:  desktop-file-utils
+BuildRequires:  esound-devel
+BuildRequires:  gettext
+BuildRequires:  trinity-kdelibs-devel
+%if 0%{?konq}
+BuildRequires:  trinity-kdebase-devel
+%else
+Obsoletes: %{name}-konqueror < %{version}-%{release}
+%endif
+BuildRequires:  taglib-devel 
+BuildRequires:  libifp-devel
+# Ipod
+BuildRequires:  libgpod-devel
+BuildRequires: libmp4v2-devel
+# MTP players
+BuildRequires:  libmtp-devel
+BuildRequires:  libmusicbrainz-devel
+# Creative Nomad Jukebox
+BuildRequires:  libnjb-devel
+BuildRequires:  libtool
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
+BuildRequires:  libtool-ltdl-devel
+%endif
+BuildRequires:  libtunepimp-devel
+BuildRequires:  libusb-devel
+BuildRequires:  libvisual-devel
+BuildRequires:  mysql-devel
+BuildRequires:  postgresql-devel
+BuildRequires:  ruby-devel ruby
+BuildRequires:  SDL-devel
+BuildRequires:  taglib-devel
+BuildRequires:  xine-lib-devel
+BuildRequires:	sqlite-devel
+# not used anymore, in favor of libvisual ? -- Rex
+#%{?fedora:BuildRequires:  xmms-devel}
+BuildRequires:	dbus-devel
+BuildRequires:	dbus-tqt-devel
+
+# For dir ownership and some default plugins (lyrics), -ruby subpkg?  -- Rex
+Requires:  ruby
+
+# To open the selected browser, works with Patch2
+Requires:  xdg-utils
+Requires(post): xdg-utils
+Requires(postun): xdg-utils
+
+Obsoletes: amarok-arts < 1.3, amarok-akode < 1.3
+
+Obsoletes: amarok-devel < %{version}-%{release}
+%if 0%{?fedora} > 6 && 0%{?fedora} < 9
+# need to keep this around for previous releases, so not to break multilib compat.
+Provides:  amarok-devel = %{version}-%{release}
+%endif
+
+# engines, etc...
+# old, obsolete ones: arts, akode
+Obsoletes: amarok-arts < 1.3, amarok-akode < 1.3
+%if 0%{?_with_xine}
+# xine-lib
+Provides: %{name}-engine-xine = %{version}-%{release}
+%endif
+
+
+%description
+Amarok is a multimedia player with:
+ - fresh playlist concept, very fast to use, with drag and drop
+ - plays all formats supported by the various engines
+ - audio effects, like reverb and compressor
+ - compatible with the .m3u and .pls formats for playlists
+ - nice GUI, integrates into the KDE look, but with a unique touch
+
+
+%package konqueror
+Summary: Amarok konqueror (service menus, sidebar) support
+Group:   Applications/Multimedia
+Requires: %{name} = %{version}-%{release}
+%description konqueror
+%{summary}.
+
+%package visualisation
+Summary:    Visualisation plugins for Amarok
+Group:      Applications/Multimedia
+Requires:   %{name} = %{version}-%{release}
+# No plugins by default, we need libvisual-plugins
+Requires:   libvisual-plugins
+%description visualisation
+Amarok can use visualisation plugins from different origins.
+Right now, only xmms is supported, which means that you can
+use any of xmms' visualisation plugins with Amarok.
+
+
+%prep
+%setup -q -n applications/amarok
+%patch1 -p1 -b .gcc43
+
+
+%build
+unset QTDIR && . %{_sysconfdir}/profile.d/qt.sh
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+export CMAKE_INCLUDE_PATH="%{_includedir}:%{_includedir}/tqt"
+
+%__mkdir_p build
+cd build
+%cmake \
+	-DWITH_LIBVISUAL=ON \
+	-DWITH_KONQSIDEBAR=OFF \
+	-DWITH_XINE=ON \
+	-DWITH_YAUAP=ON \
+	-DWITH_IPOD=ON \
+	-DWITH_IFP=ON \
+	-DWITH_NJB=ON \
+	-DWITH_MTP=ON \
+	-DWITH_RIOKARMA=OFF \
+	-DWITH_DAAP=ON \
+	-DBUILD_ALL=ON \
+	..
+
+%__make %{?_smp_mflags}
+
+%install
+rm -fr $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT -C build
+
+# desktop files
+desktop-file-install  --vendor "" \
+        --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
+        --delete-original \
+        $RPM_BUILD_ROOT%{_datadir}/applications/kde/amarok.desktop
+
+# unpackaged files
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+%if ! 0%{?konq}
+rm -f $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/servicemenus/*.desktop
+%endif
+
+
+# HTML
+for lang_dir in $RPM_BUILD_ROOT%{_docdir}/HTML/* ; do
+  if [ -d $lang_dir ]; then
+    lang=$(basename $lang_dir)
+    [ "$lang" == "en" ] && d=en/%{name} || d=$lang
+    echo "%lang($lang) %doc %{_docdir}/HTML/$d" >> %{name}.lang
+  fi
+done
+
+
+%post
+/sbin/ldconfig
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-desktop-menu forceupdate 2> /dev/null || :
+
+%postun
+/sbin/ldconfig
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-desktop-menu forceupdate 2> /dev/null || :
+
+
+%clean
+rm -fr $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%doc COPYING AUTHORS ChangeLog README
+%{_bindir}/amarok
+%{_bindir}/amarokapp
+%{_bindir}/amarokcollectionscanner
+%{_bindir}/amarok_proxy.rb
+%{_datadir}/apps/amarok/
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/applications/kde/*.desktop
+%{_datadir}/servicetypes/*.desktop
+%{_datadir}/apps/profiles/amarok.profile.xml
+%{_datadir}/config/amarokrc
+%{_datadir}/config.kcfg/*.kcfg
+%{_datadir}/services/amarokitpc.protocol
+%{_datadir}/services/amaroklastfm.protocol
+%{_datadir}/services/amarokpcast.protocol
+# -libs ?  -- Rex
+%{_libdir}/libamarok.*
+# -ruby ? -- Rex
+%{_libdir}/ruby_lib/*
+# DAAP
+%{_bindir}/amarok_daapserver.rb
+%{tde_libdir}/libamarok_daap-mediadevice.*
+%{_datadir}/services/amarok_daap-mediadevice.desktop
+# Mass-storage
+%{_datadir}/services/amarok_massstorage-device.desktop
+%{tde_libdir}/libamarok_massstorage-device.*
+# NFS
+%{_datadir}/services/amarok_nfs-device.desktop
+%{tde_libdir}/libamarok_nfs-device.*
+# SMB
+%{_datadir}/services/amarok_smb-device.desktop
+%{tde_libdir}/libamarok_smb-device.*
+# IPod
+%{_datadir}/services/amarok_ipod-mediadevice.desktop
+%{tde_libdir}/libamarok_ipod-mediadevice.*
+# VFAT
+%{_datadir}/services/amarok_generic-mediadevice.desktop
+%{tde_libdir}/libamarok_generic-mediadevice.*
+# iRiver
+%{_datadir}/services/amarok_ifp-mediadevice.desktop
+%{tde_libdir}/libamarok_ifp-mediadevice.*
+# Creative Zen
+%{_datadir}/services/amarok_njb-mediadevice.desktop
+%{tde_libdir}/libamarok_njb-mediadevice.*
+# MTP players
+%{_datadir}/services/amarok_mtp-mediadevice.desktop
+%{tde_libdir}/libamarok_mtp-mediadevice.*
+# Rio Karma
+#%{_datadir}/services/amarok_riokarma-mediadevice.desktop
+#%{tde_libdir}/libamarok_riokarma-mediadevice.*
+# Void engine (noop)
+%{_datadir}/services/amarok_void-engine_plugin.desktop
+%{tde_libdir}/libamarok_void-engine_plugin.*
+# Xine engine
+%{_datadir}/services/amarok_xine-engine.desktop
+%{tde_libdir}/libamarok_xine-engine.*
+## Gstreamer engine
+#%{_datadir}/services/amarok_gst10engine_plugin.desktop
+#%{tde_libdir}/libamarok_gst10engine_plugin.*
+# YAUAP
+%{_datadir}/services/amarok_yauap-engine_plugin.desktop
+%{tde_libdir}/libamarok_yauap-engine_plugin.*
+
+
+%{tde_docdir}/HTML/*/amarok
+%{_datadir}/locale/*/LC_MESSAGES/amarok.mo
+
+%if 0%{?konq}
+%files konqueror
+%defattr(-,root,root,-)
+%{_datadir}/apps/konqueror/servicemenus/*.desktop
+%{tde_libdir}/konqsidebar_universalamarok.*
+%{_datadir}/apps/konqsidebartng/*/amarok.desktop
+%endif
+
+%files visualisation
+%defattr(-,root,root,-)
+%{_bindir}/amarok_libvisual
+
+
+%changelog
+* Wed Nov 09 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.10-1
+- Initial build for TDE 3.5.13 on RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Spec file based on Fedora 8 'amarok-1.4.10-1'
diff --git a/redhat/applications/digikam/digikam-3.5.13-jpegint-ftbfs.patch b/redhat/applications/digikam/digikam-3.5.13-jpegint-ftbfs.patch
new file mode 100644
index 000000000..53b498329
--- /dev/null
+++ b/redhat/applications/digikam/digikam-3.5.13-jpegint-ftbfs.patch
@@ -0,0 +1,253 @@
+--- /dev/shm/applications/digikam/digikam/libs/jpegutils/jpegint.h	2011-05-19 22:00:43.000000000 -0500
++++ /dev/shm/applications/digikam/digikam/libs/jpegutils/jpegint.h.new	2011-11-05 23:20:17.144180063 -0500
+@@ -42,9 +42,9 @@
+ 
+ /* Master control module */
+ struct jpeg_comp_master {
+-  JTQT_METHOD(void, prepare_for_pass, (j_compress_ptr cinfo));
+-  JTQT_METHOD(void, pass_startup, (j_compress_ptr cinfo));
+-  JTQT_METHOD(void, finish_pass, (j_compress_ptr cinfo));
++  JMETHOD(void, prepare_for_pass, (j_compress_ptr cinfo));
++  JMETHOD(void, pass_startup, (j_compress_ptr cinfo));
++  JMETHOD(void, finish_pass, (j_compress_ptr cinfo));
+ 
+   /* State variables made visible to other modules */
+   boolean call_pass_startup;	/* True if pass_startup must be called */
+@@ -53,16 +53,16 @@
+ 
+ /* Main buffer control (downsampled-data buffer) */
+ struct jpeg_c_main_controller {
+-  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
+-  JTQT_METHOD(void, process_data, (j_compress_ptr cinfo,
++  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
++  JMETHOD(void, process_data, (j_compress_ptr cinfo,
+ 			       JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,
+ 			       JDIMENSION in_rows_avail));
+ };
+ 
+ /* Compression preprocessing (downsampling input buffer control) */
+ struct jpeg_c_prep_controller {
+-  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
+-  JTQT_METHOD(void, pre_process_data, (j_compress_ptr cinfo,
++  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
++  JMETHOD(void, pre_process_data, (j_compress_ptr cinfo,
+ 				   JSAMPARRAY input_buf,
+ 				   JDIMENSION *in_row_ctr,
+ 				   JDIMENSION in_rows_avail,
+@@ -73,23 +73,23 @@
+ 
+ /* Coefficient buffer control */
+ struct jpeg_c_coef_controller {
+-  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
+-  JTQT_METHOD(boolean, compress_data, (j_compress_ptr cinfo,
++  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
++  JMETHOD(boolean, compress_data, (j_compress_ptr cinfo,
+ 				   JSAMPIMAGE input_buf));
+ };
+ 
+ /* Colorspace conversion */
+ struct jpeg_color_converter {
+-  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo));
+-  JTQT_METHOD(void, color_convert, (j_compress_ptr cinfo,
++  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
++  JMETHOD(void, color_convert, (j_compress_ptr cinfo,
+ 				JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
+ 				JDIMENSION output_row, int num_rows));
+ };
+ 
+ /* Downsampling */
+ struct jpeg_downsampler {
+-  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo));
+-  JTQT_METHOD(void, downsample, (j_compress_ptr cinfo,
++  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
++  JMETHOD(void, downsample, (j_compress_ptr cinfo,
+ 			     JSAMPIMAGE input_buf, JDIMENSION in_row_index,
+ 			     JSAMPIMAGE output_buf,
+ 			     JDIMENSION out_row_group_index));
+@@ -99,9 +99,9 @@
+ 
+ /* Forward DCT (also controls coefficient quantization) */
+ struct jpeg_forward_dct {
+-  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo));
++  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
+   /* perhaps this should be an array??? */
+-  JTQT_METHOD(void, forward_DCT, (j_compress_ptr cinfo,
++  JMETHOD(void, forward_DCT, (j_compress_ptr cinfo,
+ 			      jpeg_component_info * compptr,
+ 			      JSAMPARRAY sample_data, JBLOCKROW coef_blocks,
+ 			      JDIMENSION start_row, JDIMENSION start_col,
+@@ -110,23 +110,23 @@
+ 
+ /* Entropy encoding */
+ struct jpeg_entropy_encoder {
+-  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, boolean gather_statistics));
+-  JTQT_METHOD(boolean, encode_mcu, (j_compress_ptr cinfo, JBLOCKROW *MCU_data));
+-  JTQT_METHOD(void, finish_pass, (j_compress_ptr cinfo));
++  JMETHOD(void, start_pass, (j_compress_ptr cinfo, boolean gather_statistics));
++  JMETHOD(boolean, encode_mcu, (j_compress_ptr cinfo, JBLOCKROW *MCU_data));
++  JMETHOD(void, finish_pass, (j_compress_ptr cinfo));
+ };
+ 
+ /* Marker writing */
+ struct jpeg_marker_writer {
+-  JTQT_METHOD(void, write_file_header, (j_compress_ptr cinfo));
+-  JTQT_METHOD(void, write_frame_header, (j_compress_ptr cinfo));
+-  JTQT_METHOD(void, write_scan_header, (j_compress_ptr cinfo));
+-  JTQT_METHOD(void, write_file_trailer, (j_compress_ptr cinfo));
+-  JTQT_METHOD(void, write_tables_only, (j_compress_ptr cinfo));
++  JMETHOD(void, write_file_header, (j_compress_ptr cinfo));
++  JMETHOD(void, write_frame_header, (j_compress_ptr cinfo));
++  JMETHOD(void, write_scan_header, (j_compress_ptr cinfo));
++  JMETHOD(void, write_file_trailer, (j_compress_ptr cinfo));
++  JMETHOD(void, write_tables_only, (j_compress_ptr cinfo));
+   /* These routines are exported to allow insertion of extra markers */
+   /* Probably only COM and APPn markers should be written this way */
+-  JTQT_METHOD(void, write_marker_header, (j_compress_ptr cinfo, int marker,
++  JMETHOD(void, write_marker_header, (j_compress_ptr cinfo, int marker,
+ 				      unsigned int datalen));
+-  JTQT_METHOD(void, write_marker_byte, (j_compress_ptr cinfo, int val));
++  JMETHOD(void, write_marker_byte, (j_compress_ptr cinfo, int val));
+ };
+ 
+ 
+@@ -134,8 +134,8 @@
+ 
+ /* Master control module */
+ struct jpeg_decomp_master {
+-  JTQT_METHOD(void, prepare_for_output_pass, (j_decompress_ptr cinfo));
+-  JTQT_METHOD(void, finish_output_pass, (j_decompress_ptr cinfo));
++  JMETHOD(void, prepare_for_output_pass, (j_decompress_ptr cinfo));
++  JMETHOD(void, finish_output_pass, (j_decompress_ptr cinfo));
+ 
+   /* State variables made visible to other modules */
+   boolean is_dummy_pass;	/* True during 1st pass for 2-pass quant */
+@@ -143,10 +143,10 @@
+ 
+ /* Input control module */
+ struct jpeg_input_controller {
+-  JTQT_METHOD(int, consume_input, (j_decompress_ptr cinfo));
+-  JTQT_METHOD(void, reset_input_controller, (j_decompress_ptr cinfo));
+-  JTQT_METHOD(void, start_input_pass, (j_decompress_ptr cinfo));
+-  JTQT_METHOD(void, finish_input_pass, (j_decompress_ptr cinfo));
++  JMETHOD(int, consume_input, (j_decompress_ptr cinfo));
++  JMETHOD(void, reset_input_controller, (j_decompress_ptr cinfo));
++  JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo));
++  JMETHOD(void, finish_input_pass, (j_decompress_ptr cinfo));
+ 
+   /* State variables made visible to other modules */
+   boolean has_multiple_scans;	/* True if file has multiple scans */
+@@ -155,18 +155,18 @@
+ 
+ /* Main buffer control (downsampled-data buffer) */
+ struct jpeg_d_main_controller {
+-  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
+-  JTQT_METHOD(void, process_data, (j_decompress_ptr cinfo,
++  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
++  JMETHOD(void, process_data, (j_decompress_ptr cinfo,
+ 			       JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
+ 			       JDIMENSION out_rows_avail));
+ };
+ 
+ /* Coefficient buffer control */
+ struct jpeg_d_coef_controller {
+-  JTQT_METHOD(void, start_input_pass, (j_decompress_ptr cinfo));
+-  JTQT_METHOD(int, consume_data, (j_decompress_ptr cinfo));
+-  JTQT_METHOD(void, start_output_pass, (j_decompress_ptr cinfo));
+-  JTQT_METHOD(int, decompress_data, (j_decompress_ptr cinfo,
++  JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo));
++  JMETHOD(int, consume_data, (j_decompress_ptr cinfo));
++  JMETHOD(void, start_output_pass, (j_decompress_ptr cinfo));
++  JMETHOD(int, decompress_data, (j_decompress_ptr cinfo,
+ 				 JSAMPIMAGE output_buf));
+   /* Pointer to array of coefficient virtual arrays, or NULL if none */
+   jvirt_barray_ptr *coef_arrays;
+@@ -174,8 +174,8 @@
+ 
+ /* Decompression postprocessing (color quantization buffer control) */
+ struct jpeg_d_post_controller {
+-  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
+-  JTQT_METHOD(void, post_process_data, (j_decompress_ptr cinfo,
++  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
++  JMETHOD(void, post_process_data, (j_decompress_ptr cinfo,
+ 				    JSAMPIMAGE input_buf,
+ 				    JDIMENSION *in_row_group_ctr,
+ 				    JDIMENSION in_row_groups_avail,
+@@ -186,12 +186,12 @@
+ 
+ /* Marker reading & parsing */
+ struct jpeg_marker_reader {
+-  JTQT_METHOD(void, reset_marker_reader, (j_decompress_ptr cinfo));
++  JMETHOD(void, reset_marker_reader, (j_decompress_ptr cinfo));
+   /* Read markers until SOS or EOI.
+    * Returns same codes as are defined for jpeg_consume_input:
+    * JPEG_SUSPENDED, JPEG_REACHED_SOS, or JPEG_REACHED_EOI.
+    */
+-  JTQT_METHOD(int, read_markers, (j_decompress_ptr cinfo));
++  JMETHOD(int, read_markers, (j_decompress_ptr cinfo));
+   /* Read a restart marker --- exported for use by entropy decoder only */
+   jpeg_marker_parser_method read_restart_marker;
+ 
+@@ -206,8 +206,8 @@
+ 
+ /* Entropy decoding */
+ struct jpeg_entropy_decoder {
+-  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo));
+-  JTQT_METHOD(boolean, decode_mcu, (j_decompress_ptr cinfo,
++  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
++  JMETHOD(boolean, decode_mcu, (j_decompress_ptr cinfo,
+ 				JBLOCKROW *MCU_data));
+ 
+   /* This is here to share code between baseline and progressive decoders; */
+@@ -216,21 +216,21 @@
+ };
+ 
+ /* Inverse DCT (also performs dequantization) */
+-typedef JTQT_METHOD(void, inverse_DCT_method_ptr,
++typedef JMETHOD(void, inverse_DCT_method_ptr,
+ 		(j_decompress_ptr cinfo, jpeg_component_info * compptr,
+ 		 JCOEFPTR coef_block,
+ 		 JSAMPARRAY output_buf, JDIMENSION output_col));
+ 
+ struct jpeg_inverse_dct {
+-  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo));
++  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
+   /* It is useful to allow each component to have a separate IDCT method. */
+   inverse_DCT_method_ptr inverse_DCT[MAX_COMPONENTS];
+ };
+ 
+ /* Upsampling (note that upsampler must also call color converter) */
+ struct jpeg_upsampler {
+-  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo));
+-  JTQT_METHOD(void, upsample, (j_decompress_ptr cinfo,
++  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
++  JMETHOD(void, upsample, (j_decompress_ptr cinfo,
+ 			   JSAMPIMAGE input_buf,
+ 			   JDIMENSION *in_row_group_ctr,
+ 			   JDIMENSION in_row_groups_avail,
+@@ -243,20 +243,20 @@
+ 
+ /* Colorspace conversion */
+ struct jpeg_color_deconverter {
+-  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo));
+-  JTQT_METHOD(void, color_convert, (j_decompress_ptr cinfo,
++  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
++  JMETHOD(void, color_convert, (j_decompress_ptr cinfo,
+ 				JSAMPIMAGE input_buf, JDIMENSION input_row,
+ 				JSAMPARRAY output_buf, int num_rows));
+ };
+ 
+ /* Color quantization or color precision reduction */
+ struct jpeg_color_quantizer {
+-  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo, boolean is_pre_scan));
+-  JTQT_METHOD(void, color_quantize, (j_decompress_ptr cinfo,
++  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, boolean is_pre_scan));
++  JMETHOD(void, color_quantize, (j_decompress_ptr cinfo,
+ 				 JSAMPARRAY input_buf, JSAMPARRAY output_buf,
+ 				 int num_rows));
+-  JTQT_METHOD(void, finish_pass, (j_decompress_ptr cinfo));
+-  JTQT_METHOD(void, new_color_map, (j_decompress_ptr cinfo));
++  JMETHOD(void, finish_pass, (j_decompress_ptr cinfo));
++  JMETHOD(void, new_color_map, (j_decompress_ptr cinfo));
+ };
+ 
+ 
diff --git a/redhat/applications/digikam/trinity-digikam-3.5.13.spec b/redhat/applications/digikam/trinity-digikam-3.5.13.spec
new file mode 100644
index 000000000..6baafc83e
--- /dev/null
+++ b/redhat/applications/digikam/trinity-digikam-3.5.13.spec
@@ -0,0 +1,159 @@
+# Default version for this component
+%define kdecomp digikam
+%define version 0.9.6
+%define release 1
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%define _variant .opt
+%define _docdir %{_prefix}/share/doc
+%endif
+
+# TDE 3.5.13 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}/kde
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/trinity
+
+
+Name:		trinity-%{kdecomp}
+Summary:	digital photo management application for KDE [Trinity]
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+Prefix:    %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+
+# TDE 3.5.13 on RHEL/Fedora specific patches
+Patch0:		digikam-3.5.13-jpegint-ftbfs.patch
+
+
+BuildRequires: tqtinterface-devel
+BuildRequires: trinity-arts-devel
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: trinity-kdebase-devel
+BuildRequires: desktop-file-utils
+BuildRequires: gettext
+BuildRequires: trinity-libkexiv2-devel
+BuildRequires: trinity-libkdcraw-devel
+BuildRequires: trinity-libkipi-devel
+BuildRequires: libgphoto2-devel
+BuildRequires: libtiff-devel
+BuildRequires: jasper-devel
+
+
+%description
+An easy to use and powerful digital photo management
+application, which makes importing, organizing and manipulating
+digital photos a "snap".  An interface is provided to connect to
+your digital camera, preview the images and download and/or
+delete them.
+.
+The digiKam built-in image editor makes the common photo correction
+a simple task. The image editor is extensible via plugins and,
+the digikamimageplugins project has been merged to digiKam core
+since release 0.9.2, all useful image editor plugins are available
+in the base installation.
+.
+digiKam can also make use of the KIPI image handling plugins to
+extend its capabilities even further for photo manipulations,
+import and export, etc. The kipi-plugins package contains many
+very useful extentions.
+.
+digiKam is based in part on the work of the Independent JPEG Group.
+
+
+%package devel
+Group:		Development/Libraries
+Summary:	Development files for %{name}
+Requires:	%{name} = %{version}
+
+%description devel
+%{summary}
+
+
+%prep
+%setup -q -n applications/%{kdecomp}
+%patch0 -p5
+
+# Ugly hack to modify TQT include directory inside autoconf files.
+# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
+sed -i admin/acinclude.m4.in \
+  -e "s,/usr/include/tqt,%{_includedir}/tqt,g"
+
+%__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 || : ; source /etc/profile.d/qt.sh
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%configure \
+	--disable-rpath \
+    --with-extra-includes=%{_includedir}/tqt \
+    --enable-closure
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{_bindir}/*
+%{_libdir}/*.so.*
+%{_datadir}/applications/*/*.desktop
+%{_datadir}/locale/*/LC_MESSAGES/digikam.mo
+%{_datadir}/services/*.desktop
+%{_datadir}/services/*.protocol
+%{_datadir}/servicetypes/digikamimageplugin.desktop
+%{_datadir}/apps/*/
+%{_docdir}/HTML/en/*/
+%{_datadir}/icons/*/*/*/*
+%{_mandir}/man*/*
+
+
+%files devel
+%{_includedir}/*.h
+%{_includedir}/digikam
+%{_libdir}/*.so
+%{_libdir}/*.la
+%{_libdir}/*/*.so
+%{_libdir}/*/*.la
+
+
+%Changelog
+* Sun Nov 06 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.6-0
+- Initial release for RHEL 6, RHEL 5 and Fedora 15
+
diff --git a/redhat/applications/dolphin/trinity-dolphin-3.5.13.spec b/redhat/applications/dolphin/trinity-dolphin-3.5.13.spec
new file mode 100644
index 000000000..1b488e70e
--- /dev/null
+++ b/redhat/applications/dolphin/trinity-dolphin-3.5.13.spec
@@ -0,0 +1,145 @@
+# Default version for this component
+%define kdecomp dolphin
+%define version 0.9.2
+%define release 3
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%define _variant .opt
+%define _docdir %{_prefix}/share/doc
+%endif
+
+# TDE 3.5.13 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}/kde
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/trinity
+
+
+Name:		trinity-%{kdecomp}
+Summary:	File manager for KDE focusing on usability 
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+Prefix:    %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+
+BuildRequires:	tqtinterface-devel
+BuildRequires:	trinity-kdelibs-devel
+BuildRequires:	trinity-kdebase-devel
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+
+%description
+Dolphin focuses on being only a file manager.
+This approach allows to optimize the user
+interface for the task of file management.
+
+
+%prep
+%setup -q -n applications/%{kdecomp}
+
+# Ugly hack to modify TQT include directory inside autoconf files.
+# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
+sed -i admin/acinclude.m4.in \
+  -e "s,/usr/include/tqt,%{_includedir}/tqt,g"
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%configure \
+	--disable-rpath \
+    --with-extra-includes=%{_includedir}/tqt
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+# TDE 3.5.12: dirty hack to prevent duplicate line in file 'd3lphin.desktop'
+sed -i "%{buildroot}%{_datadir}/applications/kde/d3lphin.desktop" \
+	-e "/^Name\[pa\].*/d"
+
+desktop-file-install --vendor ""                \
+    --delete-original                           \
+    --dir %{buildroot}%{_datadir}/applications/ \
+    %{buildroot}%{_datadir}/applications/kde/d3lphin.desktop
+
+
+## File lists
+# HTML (1.0)
+HTML_DIR=$(kde-config --expandvars --install html)
+if [ -d %{buildroot}$HTML_DIR ]; then
+for lang_dir in %{buildroot}$HTML_DIR/* ; do
+  if [ -d $lang_dir ]; then
+    lang=$(basename $lang_dir)
+    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
+    # replace absolute symlinks with relative ones
+    pushd $lang_dir
+      for i in *; do
+        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
+      done
+    popd
+  fi
+done
+fi
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING TODO
+%{_bindir}/*
+%{_datadir}/applications/*.desktop
+%{_datadir}/apps/*/
+%doc %lang(en) %{_docdir}/HTML/en/*/
+%{_datadir}/icons/hicolor/128x128/apps/*.png
+%{_datadir}/icons/hicolor/??x??/apps/*.png
+%{_datadir}/locale/*/*/d3lphin.mo
+
+
+%Changelog
+* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.2-3
+- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
+
+* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.2-2
+- Import to GIT
+
+* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.2-1
+- Correct macro to install under "/opt", if desired
+
+* Thu Jun 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.2-0
+- Initial build for RHEL 6.0
+- Based on FC7 'Dolphin 0.8.2-2" SPEC file.
+
diff --git a/redhat/applications/filelight/trinity-filelight-3.5.13.spec b/redhat/applications/filelight/trinity-filelight-3.5.13.spec
new file mode 100644
index 000000000..43878bf0a
--- /dev/null
+++ b/redhat/applications/filelight/trinity-filelight-3.5.13.spec
@@ -0,0 +1,117 @@
+# Default version for this component
+%define kdecomp filelight
+%define version 1.0
+%define release 3
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%define _variant .opt
+%define _docdir %{_prefix}/share/doc
+%endif
+
+# TDE 3.5.13 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}/kde
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/trinity
+
+
+Name:		trinity-%{kdecomp}
+Summary:	Graphical disk usage display
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+Prefix:    %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+
+
+BuildRequires: tqtinterface-devel
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: trinity-kdebase-devel
+BuildRequires: desktop-file-utils
+
+%description
+Filelight creates a complex, but data-rich graphical representation of the files and
+directories on your computer. 
+
+
+%prep
+%setup -q -n applications/%{kdecomp}
+
+# Ugly hack to modify TQT include directory inside autoconf files.
+# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
+sed -i admin/acinclude.m4.in \
+  -e "s,/usr/include/tqt,%{_includedir}/tqt,g"
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%configure \
+	--disable-rpath \
+    --with-extra-includes=%{_includedir}/tqt
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{_bindir}/*
+%{_datadir}/applications/*/*.desktop
+%{_datadir}/apps/*/
+%{_datadir}/icons/*/*/*/*
+%{_datadir}/locale/*/*/*.mo
+%{_datadir}/config/filelightrc
+%{_datadir}/services/*.desktop
+%{_docdir}/HTML/*/*/
+
+%{_libdir}/*/*.so
+%exclude %{_libdir}/*/*.la
+
+%Changelog
+* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-3
+- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
+
+* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-2
+- Import to GIT
+
+* Wed Aug 24 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-1
+- Correct macro to install under "/opt", if desired
+
+* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-0
+- Initial build for RHEL 6.0
+
diff --git a/redhat/applications/gwenview/gwenview-3.5.13-jpegint-ftbfs.patch b/redhat/applications/gwenview/gwenview-3.5.13-jpegint-ftbfs.patch
new file mode 100644
index 000000000..0cd290983
--- /dev/null
+++ b/redhat/applications/gwenview/gwenview-3.5.13-jpegint-ftbfs.patch
@@ -0,0 +1,254 @@
+diff -Nuar gwenview.ORI/src/imageutils/jpegint.h gwenview/src/imageutils/jpegint.h
+--- gwenview.ORI/src/imageutils/jpegint.h	2011-05-26 23:04:57.000000000 +0200
++++ gwenview/src/imageutils/jpegint.h	2011-11-01 20:45:15.494165195 +0100
+@@ -43,9 +43,9 @@
+ 
+ /* Master control module */
+ struct jpeg_comp_master {
+-  JTQT_METHOD(void, prepare_for_pass, (j_compress_ptr cinfo));
+-  JTQT_METHOD(void, pass_startup, (j_compress_ptr cinfo));
+-  JTQT_METHOD(void, finish_pass, (j_compress_ptr cinfo));
++  JMETHOD(void, prepare_for_pass, (j_compress_ptr cinfo));
++  JMETHOD(void, pass_startup, (j_compress_ptr cinfo));
++  JMETHOD(void, finish_pass, (j_compress_ptr cinfo));
+ 
+   /* State variables made visible to other modules */
+   boolean call_pass_startup;	/* True if pass_startup must be called */
+@@ -54,16 +54,16 @@
+ 
+ /* Main buffer control (downsampled-data buffer) */
+ struct jpeg_c_main_controller {
+-  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
+-  JTQT_METHOD(void, process_data, (j_compress_ptr cinfo,
++  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
++  JMETHOD(void, process_data, (j_compress_ptr cinfo,
+ 			       JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,
+ 			       JDIMENSION in_rows_avail));
+ };
+ 
+ /* Compression preprocessing (downsampling input buffer control) */
+ struct jpeg_c_prep_controller {
+-  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
+-  JTQT_METHOD(void, pre_process_data, (j_compress_ptr cinfo,
++  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
++  JMETHOD(void, pre_process_data, (j_compress_ptr cinfo,
+ 				   JSAMPARRAY input_buf,
+ 				   JDIMENSION *in_row_ctr,
+ 				   JDIMENSION in_rows_avail,
+@@ -74,23 +74,23 @@
+ 
+ /* Coefficient buffer control */
+ struct jpeg_c_coef_controller {
+-  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
+-  JTQT_METHOD(boolean, compress_data, (j_compress_ptr cinfo,
++  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
++  JMETHOD(boolean, compress_data, (j_compress_ptr cinfo,
+ 				   JSAMPIMAGE input_buf));
+ };
+ 
+ /* Colorspace conversion */
+ struct jpeg_color_converter {
+-  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo));
+-  JTQT_METHOD(void, color_convert, (j_compress_ptr cinfo,
++  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
++  JMETHOD(void, color_convert, (j_compress_ptr cinfo,
+ 				JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
+ 				JDIMENSION output_row, int num_rows));
+ };
+ 
+ /* Downsampling */
+ struct jpeg_downsampler {
+-  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo));
+-  JTQT_METHOD(void, downsample, (j_compress_ptr cinfo,
++  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
++  JMETHOD(void, downsample, (j_compress_ptr cinfo,
+ 			     JSAMPIMAGE input_buf, JDIMENSION in_row_index,
+ 			     JSAMPIMAGE output_buf,
+ 			     JDIMENSION out_row_group_index));
+@@ -100,9 +100,9 @@
+ 
+ /* Forward DCT (also controls coefficient quantization) */
+ struct jpeg_forward_dct {
+-  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo));
++  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
+   /* perhaps this should be an array??? */
+-  JTQT_METHOD(void, forward_DCT, (j_compress_ptr cinfo,
++  JMETHOD(void, forward_DCT, (j_compress_ptr cinfo,
+ 			      jpeg_component_info * compptr,
+ 			      JSAMPARRAY sample_data, JBLOCKROW coef_blocks,
+ 			      JDIMENSION start_row, JDIMENSION start_col,
+@@ -111,23 +111,23 @@
+ 
+ /* Entropy encoding */
+ struct jpeg_entropy_encoder {
+-  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, boolean gather_statistics));
+-  JTQT_METHOD(boolean, encode_mcu, (j_compress_ptr cinfo, JBLOCKROW *MCU_data));
+-  JTQT_METHOD(void, finish_pass, (j_compress_ptr cinfo));
++  JMETHOD(void, start_pass, (j_compress_ptr cinfo, boolean gather_statistics));
++  JMETHOD(boolean, encode_mcu, (j_compress_ptr cinfo, JBLOCKROW *MCU_data));
++  JMETHOD(void, finish_pass, (j_compress_ptr cinfo));
+ };
+ 
+ /* Marker writing */
+ struct jpeg_marker_writer {
+-  JTQT_METHOD(void, write_file_header, (j_compress_ptr cinfo));
+-  JTQT_METHOD(void, write_frame_header, (j_compress_ptr cinfo));
+-  JTQT_METHOD(void, write_scan_header, (j_compress_ptr cinfo));
+-  JTQT_METHOD(void, write_file_trailer, (j_compress_ptr cinfo));
+-  JTQT_METHOD(void, write_tables_only, (j_compress_ptr cinfo));
++  JMETHOD(void, write_file_header, (j_compress_ptr cinfo));
++  JMETHOD(void, write_frame_header, (j_compress_ptr cinfo));
++  JMETHOD(void, write_scan_header, (j_compress_ptr cinfo));
++  JMETHOD(void, write_file_trailer, (j_compress_ptr cinfo));
++  JMETHOD(void, write_tables_only, (j_compress_ptr cinfo));
+   /* These routines are exported to allow insertion of extra markers */
+   /* Probably only COM and APPn markers should be written this way */
+-  JTQT_METHOD(void, write_marker_header, (j_compress_ptr cinfo, int marker,
++  JMETHOD(void, write_marker_header, (j_compress_ptr cinfo, int marker,
+ 				      unsigned int datalen));
+-  JTQT_METHOD(void, write_marker_byte, (j_compress_ptr cinfo, int val));
++  JMETHOD(void, write_marker_byte, (j_compress_ptr cinfo, int val));
+ };
+ 
+ 
+@@ -135,8 +135,8 @@
+ 
+ /* Master control module */
+ struct jpeg_decomp_master {
+-  JTQT_METHOD(void, prepare_for_output_pass, (j_decompress_ptr cinfo));
+-  JTQT_METHOD(void, finish_output_pass, (j_decompress_ptr cinfo));
++  JMETHOD(void, prepare_for_output_pass, (j_decompress_ptr cinfo));
++  JMETHOD(void, finish_output_pass, (j_decompress_ptr cinfo));
+ 
+   /* State variables made visible to other modules */
+   boolean is_dummy_pass;	/* True during 1st pass for 2-pass quant */
+@@ -144,10 +144,10 @@
+ 
+ /* Input control module */
+ struct jpeg_input_controller {
+-  JTQT_METHOD(int, consume_input, (j_decompress_ptr cinfo));
+-  JTQT_METHOD(void, reset_input_controller, (j_decompress_ptr cinfo));
+-  JTQT_METHOD(void, start_input_pass, (j_decompress_ptr cinfo));
+-  JTQT_METHOD(void, finish_input_pass, (j_decompress_ptr cinfo));
++  JMETHOD(int, consume_input, (j_decompress_ptr cinfo));
++  JMETHOD(void, reset_input_controller, (j_decompress_ptr cinfo));
++  JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo));
++  JMETHOD(void, finish_input_pass, (j_decompress_ptr cinfo));
+ 
+   /* State variables made visible to other modules */
+   boolean has_multiple_scans;	/* True if file has multiple scans */
+@@ -156,18 +156,18 @@
+ 
+ /* Main buffer control (downsampled-data buffer) */
+ struct jpeg_d_main_controller {
+-  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
+-  JTQT_METHOD(void, process_data, (j_decompress_ptr cinfo,
++  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
++  JMETHOD(void, process_data, (j_decompress_ptr cinfo,
+ 			       JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
+ 			       JDIMENSION out_rows_avail));
+ };
+ 
+ /* Coefficient buffer control */
+ struct jpeg_d_coef_controller {
+-  JTQT_METHOD(void, start_input_pass, (j_decompress_ptr cinfo));
+-  JTQT_METHOD(int, consume_data, (j_decompress_ptr cinfo));
+-  JTQT_METHOD(void, start_output_pass, (j_decompress_ptr cinfo));
+-  JTQT_METHOD(int, decompress_data, (j_decompress_ptr cinfo,
++  JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo));
++  JMETHOD(int, consume_data, (j_decompress_ptr cinfo));
++  JMETHOD(void, start_output_pass, (j_decompress_ptr cinfo));
++  JMETHOD(int, decompress_data, (j_decompress_ptr cinfo,
+ 				 JSAMPIMAGE output_buf));
+   /* Pointer to array of coefficient virtual arrays, or NULL if none */
+   jvirt_barray_ptr *coef_arrays;
+@@ -175,8 +175,8 @@
+ 
+ /* Decompression postprocessing (color quantization buffer control) */
+ struct jpeg_d_post_controller {
+-  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
+-  JTQT_METHOD(void, post_process_data, (j_decompress_ptr cinfo,
++  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
++  JMETHOD(void, post_process_data, (j_decompress_ptr cinfo,
+ 				    JSAMPIMAGE input_buf,
+ 				    JDIMENSION *in_row_group_ctr,
+ 				    JDIMENSION in_row_groups_avail,
+@@ -187,12 +187,12 @@
+ 
+ /* Marker reading & parsing */
+ struct jpeg_marker_reader {
+-  JTQT_METHOD(void, reset_marker_reader, (j_decompress_ptr cinfo));
++  JMETHOD(void, reset_marker_reader, (j_decompress_ptr cinfo));
+   /* Read markers until SOS or EOI.
+    * Returns same codes as are defined for jpeg_consume_input:
+    * JPEG_SUSPENDED, JPEG_REACHED_SOS, or JPEG_REACHED_EOI.
+    */
+-  JTQT_METHOD(int, read_markers, (j_decompress_ptr cinfo));
++  JMETHOD(int, read_markers, (j_decompress_ptr cinfo));
+   /* Read a restart marker --- exported for use by entropy decoder only */
+   jpeg_marker_parser_method read_restart_marker;
+ 
+@@ -207,8 +207,8 @@
+ 
+ /* Entropy decoding */
+ struct jpeg_entropy_decoder {
+-  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo));
+-  JTQT_METHOD(boolean, decode_mcu, (j_decompress_ptr cinfo,
++  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
++  JMETHOD(boolean, decode_mcu, (j_decompress_ptr cinfo,
+ 				JBLOCKROW *MCU_data));
+ 
+   /* This is here to share code between baseline and progressive decoders; */
+@@ -217,21 +217,21 @@
+ };
+ 
+ /* Inverse DCT (also performs dequantization) */
+-typedef JTQT_METHOD(void, inverse_DCT_method_ptr,
++typedef JMETHOD(void, inverse_DCT_method_ptr,
+ 		(j_decompress_ptr cinfo, jpeg_component_info * compptr,
+ 		 JCOEFPTR coef_block,
+ 		 JSAMPARRAY output_buf, JDIMENSION output_col));
+ 
+ struct jpeg_inverse_dct {
+-  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo));
++  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
+   /* It is useful to allow each component to have a separate IDCT method. */
+   inverse_DCT_method_ptr inverse_DCT[MAX_COMPONENTS];
+ };
+ 
+ /* Upsampling (note that upsampler must also call color converter) */
+ struct jpeg_upsampler {
+-  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo));
+-  JTQT_METHOD(void, upsample, (j_decompress_ptr cinfo,
++  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
++  JMETHOD(void, upsample, (j_decompress_ptr cinfo,
+ 			   JSAMPIMAGE input_buf,
+ 			   JDIMENSION *in_row_group_ctr,
+ 			   JDIMENSION in_row_groups_avail,
+@@ -244,20 +244,20 @@
+ 
+ /* Colorspace conversion */
+ struct jpeg_color_deconverter {
+-  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo));
+-  JTQT_METHOD(void, color_convert, (j_decompress_ptr cinfo,
++  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
++  JMETHOD(void, color_convert, (j_decompress_ptr cinfo,
+ 				JSAMPIMAGE input_buf, JDIMENSION input_row,
+ 				JSAMPARRAY output_buf, int num_rows));
+ };
+ 
+ /* Color quantization or color precision reduction */
+ struct jpeg_color_quantizer {
+-  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo, boolean is_pre_scan));
+-  JTQT_METHOD(void, color_quantize, (j_decompress_ptr cinfo,
++  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, boolean is_pre_scan));
++  JMETHOD(void, color_quantize, (j_decompress_ptr cinfo,
+ 				 JSAMPARRAY input_buf, JSAMPARRAY output_buf,
+ 				 int num_rows));
+-  JTQT_METHOD(void, finish_pass, (j_decompress_ptr cinfo));
+-  JTQT_METHOD(void, new_color_map, (j_decompress_ptr cinfo));
++  JMETHOD(void, finish_pass, (j_decompress_ptr cinfo));
++  JMETHOD(void, new_color_map, (j_decompress_ptr cinfo));
+ };
+ 
+ 
diff --git a/redhat/applications/gwenview/trinity-gwenview-3.5.13.spec b/redhat/applications/gwenview/trinity-gwenview-3.5.13.spec
new file mode 100644
index 000000000..98b178c0f
--- /dev/null
+++ b/redhat/applications/gwenview/trinity-gwenview-3.5.13.spec
@@ -0,0 +1,171 @@
+# Default version for this component
+%define kdecomp gwenview
+%define version 1.4.2
+%define release 5
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%define _variant .opt
+%define _docdir %{_prefix}/share/doc
+%endif
+
+# TDE 3.5.13 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}/kde
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/trinity
+
+
+Name:		trinity-%{kdecomp}
+Summary:	Gwenview is an image viewer for KDE.
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+Prefix:    %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+
+# TDE 3.5.13 on RHEL/Fedora specific patches
+Patch0:		gwenview-3.5.13-jpegint-ftbfs.patch
+
+
+BuildRequires: tqtinterface-devel
+BuildRequires: trinity-arts-devel
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: trinity-kdebase-devel
+BuildRequires: desktop-file-utils
+BuildRequires: gettext
+BuildRequires: exiv2-devel
+
+%if "%{?_prefix}" == "/usr"
+Conflicts: kdegraphics
+%endif
+
+
+%description
+Gwenview is a fast and easy to use image viewer/browser for KDE.
+All common image formats are supported, such as PNG(including transparency),
+JPEG(including EXIF tags and lossless transformations), GIF, XCF (Gimp
+image format), BMP, XPM and others. Standard features include slideshow,
+fullscreen view, image thumbnails, drag'n'drop, image zoom, full network
+transparency using the KIO framework, including basic file operations and
+browsing in compressed archives, non-blocking GUI with adjustable views.
+Gwenview also provides image and directory KParts components for use e.g. in
+Konqueror. Additional features, such as image renaming, comparing,
+converting, and batch processing, HTML gallery and others are provided by the
+KIPI image framework.
+
+
+%prep
+%setup -q -n applications/%{kdecomp}
+%patch0 -p1
+
+# Ugly hack to modify TQT include directory inside autoconf files.
+# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
+sed -i admin/acinclude.m4.in \
+  -e "s,/usr/include/tqt,%{_includedir}/tqt,g"
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%configure \
+	--disable-rpath \
+    --with-extra-includes=%{_includedir}/tqt \
+    --enable-closure
+
+%__make
+# %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+
+
+## File lists
+# HTML (1.0)
+HTML_DIR=$(kde-config --expandvars --install html)
+if [ -d %{buildroot}$HTML_DIR ]; then
+for lang_dir in %{buildroot}$HTML_DIR/* ; do
+  if [ -d $lang_dir ]; then
+    lang=$(basename $lang_dir)
+    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
+    # replace absolute symlinks with relative ones
+    pushd $lang_dir
+      for i in *; do
+        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
+      done
+    popd
+  fi
+done
+fi
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{_bindir}/*
+%{_libdir}/*.so.*
+%{_datadir}/applications/*/*.desktop
+%{_datadir}/services/*.desktop
+%{_datadir}/apps/*/
+%{_datadir}/config.kcfg/*
+%{_docdir}/HTML/en/*/
+%{_datadir}/icons/*/*/*/*
+%{_mandir}/man*/*
+
+%{_libdir}/*.so
+%{_libdir}/*.la
+%{_libdir}/*/*.so
+%{_libdir}/*/*.la
+
+
+
+
+%Changelog
+* Fri Nov 04 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-5
+- Adds missing files
+
+* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-4
+- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
+
+* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-3
+- Import to GIT
+
+* Wed Aug 24 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-2
+- Add fix for Fedora 15
+
+* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-1
+- Correct macro to install under "/opt", if desired
+
+* Sat Aug 13 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-0
+- Initial build for RHEL 6.0
+
diff --git a/redhat/applications/k3b/k3b-i18n-trinity.patch b/redhat/applications/k3b/k3b-i18n-trinity.patch
new file mode 100644
index 000000000..0b85e98cf
--- /dev/null
+++ b/redhat/applications/k3b/k3b-i18n-trinity.patch
@@ -0,0 +1,81 @@
+--- k3b-i18n-1.0.5/acinclude.m4.ORI	2011-10-30 11:45:36.484658442 +0100
++++ k3b-i18n-1.0.5/acinclude.m4	2011-10-30 11:53:00.134646577 +0100
+@@ -479,14 +479,14 @@
+     if test "$kde_qtver" = "2"; then
+       kde_moduledir='\${libdir}/kde2'
+     else
+-      kde_moduledir='\${libdir}/kde3'
++      kde_moduledir='\${libdir}/trinity'
+     fi
+   fi
+   if test -z "$kde_styledir"; then
+-    kde_styledir='\${libdir}/kde3/plugins/styles'
++    kde_styledir='\${libdir}/trinity/plugins/styles'
+   fi
+   if test -z "$kde_widgetdir"; then
+-    kde_widgetdir='\${libdir}/kde3/plugins/designer'
++    kde_widgetdir='\${libdir}/trinity/plugins/designer'
+   fi
+   if test -z "$xdg_appsdir"; then
+     xdg_appsdir='\${datadir}/applications/kde'
+@@ -546,7 +546,7 @@
+ 
+ AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
+ [
+-    kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
++    kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/trinity/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
+     test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
+     if test -n "$KDEDIRS"; then
+        kde_save_IFS=$IFS
+@@ -612,7 +612,7 @@
+         KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
+ 
+         if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
+- 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
++ 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/trinity/share /opt/kde3/share /opt/kde/share $prefix/share"
+             test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
+             AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
+ 	    if test "$KDE_XSL_STYLESHEET" = "NO"; then
+@@ -1817,7 +1817,7 @@
+ 
+ if test -z "$1"; then
+ 
+-kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
++kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/trinity/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
+ test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
+ kde_incdirs="$ac_kde_includes $kde_incdirs"
+ AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
+@@ -1829,7 +1829,7 @@
+ So, check this please and use another prefix!])
+ fi
+ 
+-kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
++kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/trinity/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
+ test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
+ kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
+ AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
+@@ -1837,7 +1837,7 @@
+ 
+ kde_widgetdir=NO
+ dnl this might be somewhere else
+-AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
++AC_FIND_FILE("trinity/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
+ 
+ if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
+ AC_MSG_ERROR([
+@@ -1845,7 +1845,7 @@
+ So, check this please and use another prefix!])
+ fi
+ 
+-if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
++if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then
+ AC_MSG_ERROR([
+ I can't find the designer plugins. These are required and should have been installed
+ by kdelibs])
+@@ -1852,7 +1852,7 @@
+ fi
+
+ if test -n "$kde_widgetdir"; then
+-    kde_widgetdir="$kde_widgetdir/kde3/plugins/designer"
++    kde_widgetdir="$kde_widgetdir/trinity/plugins/designer"
+ fi
diff --git a/redhat/applications/k3b/trinity-k3b-3.5.12.spec b/redhat/applications/k3b/trinity-k3b-3.5.12.spec
index 423655f54..a1b9f0d60 100644
--- a/redhat/applications/k3b/trinity-k3b-3.5.12.spec
+++ b/redhat/applications/k3b/trinity-k3b-3.5.12.spec
@@ -26,6 +26,9 @@ 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)
+
 %if "%{?_prefix}" == "/usr"
 Obsoletes: k3b
 %endif
@@ -33,10 +36,6 @@ Obsoletes: k3b
 Group:   Applications/Archiving
 License: GPLv2+
 
-Prefix:		%{_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-
 Source0: k3b-%{version}.tar.gz
 Source1: k3b-i18n-1.0.5.tar.bz2
 Source2: k3brc
@@ -62,7 +61,7 @@ BuildRequires: dbus-qt-devel hal-devel
 BuildRequires: flac-devel
 BuildRequires: gettext
 BuildRequires: libdvdread-devel
-%if 0%{?fedora} >= 15 || 0%{?rhel} && 0%{?rhel} <= 5
+%if 0%{?fedora} >= 15 || 0%{?rhel} <= 5
 BuildRequires: libmpcdec-devel
 %else
 BuildRequires: musepack-tools-devel
@@ -269,7 +268,7 @@ update-desktop-database -q &> /dev/null
 * Sun Dec 19 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2
 - Add i18n translations
 - Add patches from RHEL 6.0 (except Patch106, redundant with our 'patch0')
-- Renamed 'patch0' (Thales) to 'patch106'
+- Renamed 'patch0' to 'patch106'
 
 * Fri Dec 17 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
 - Add macro _kde3_prefix to define custom installation prefix (ex: /opt/kde3)
diff --git a/redhat/applications/k3b/trinity-k3b-3.5.13.spec b/redhat/applications/k3b/trinity-k3b-3.5.13.spec
index 22f1c4238..fd325935d 100644
--- a/redhat/applications/k3b/trinity-k3b-3.5.13.spec
+++ b/redhat/applications/k3b/trinity-k3b-3.5.13.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.13
 %endif
-%define release 0
+%define release 2
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -26,12 +26,16 @@ 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)
+
 %if "%{?_prefix}" == "/usr"
 Obsoletes: k3b
 %endif
 
 Group:   Applications/Archiving
 License: GPLv2+
+
 Source0: k3b-%{version}.tar.gz
 Source1: k3b-i18n-1.0.5.tar.bz2
 Source2: k3brc
@@ -42,6 +46,8 @@ Patch4: k3b-1.0.4-manualbufsize.patch
 # RHEL6: Fix K3B icon
 Patch106: trinity-k3b-icons.patch
 
+# TDE 3.5.13 library directory changed
+Patch107: k3b-i18n-trinity.patch
 
 BuildRequires: trinity-kdelibs-devel
 BuildRequires: desktop-file-utils
@@ -51,11 +57,7 @@ BuildRequires: dbus-qt-devel hal-devel
 BuildRequires: flac-devel
 BuildRequires: gettext
 BuildRequires: libdvdread-devel
-%if 0%{?fedora} >= 15
 BuildRequires: libmpcdec-devel
-%else
-BuildRequires: musepack-tools-devel
-%endif
 BuildRequires: libmusicbrainz-devel
 BuildRequires: libsamplerate-devel
 BuildRequires: libsndfile-devel
@@ -90,7 +92,9 @@ start.
 Summary:  Common files of %{name}
 Group:    Applications/Archiving
 Requires: %{name} = %{version}-%{release}
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
 BuildArch: noarch
+%endif
 %description common
 %{summary}.
 
@@ -115,6 +119,8 @@ Requires: %{name}-libs = %{version}-%{release}
 # set in k3brc too 
 %patch4 -p1 -b .manualbufsize
 %patch106 -p1 -b .desktopfile
+%patch107
+
 
 # Ugly hack to modify TQT include directory inside autoconf files.
 # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
@@ -155,27 +161,22 @@ CXXFLAGS="%optflags -fno-strict-aliasing" \
 
 # Build for i18n tarball
 pushd k3b-i18n-1.0.5
+autoreconf
 %configure
 %__make %{?_smp_mflags}
 popd
 
 %install
 %__rm -rf %{buildroot}
-%make_install
-%make_install -C k3b-i18n-1.0.5
-%{__install} -D -m 644 -p %{SOURCE2} %{buildroot}%{_datadir}/config/k3brc
+%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C k3b-i18n-1.0.5
+%__install -D -m 644 -p %{SOURCE2} %{buildroot}%{_datadir}/config/k3brc
 
 # remove the .la files
-%{__rm} -f %{buildroot}%{_libdir}/libk3b*.la 
+%__rm -f %{buildroot}%{_libdir}/libk3b*.la 
 
 # remove i18n for Plattdeutsch (Low Saxon)
-%{__rm} -fr %{buildroot}%{_datadir}/locale/nds
-
-%find_lang k3b --with-kde
-%find_lang k3bsetup 
-%find_lang libk3b
-%find_lang libk3bdevice
-cat k3b.lang k3bsetup.lang libk3b.lang libk3bdevice.lang >> all.lang
+%__rm -fr %{buildroot}%{_datadir}/locale/nds
 
 
 %check
@@ -212,11 +213,12 @@ update-desktop-database -q &> /dev/null
 %{_bindir}/k3b
 %{tde_libdir}/*.so
 %{tde_libdir}/*.la
-%doc %{tde_docdir}/HTML/*/k3b/*
+%doc %{_docdir}/HTML/*/k3b/*
 
-%files common -f all.lang
+%files common
 %defattr(-,root,root,-)
 %{_datadir}/applications/kde/*.desktop
+%{_datadir}/applnk/.hidden/*.desktop
 %{_datadir}/apps/k3b/
 %{_datadir}/apps/konqueror/servicemenus/*.desktop
 %{_datadir}/apps/konqsidebartng/virtual_folders/services/videodvd.desktop
@@ -240,5 +242,11 @@ update-desktop-database -q &> /dev/null
 
 
 %changelog
+* Sat Nov 05 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
+- Updates BuildRequires
+
+* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
+- Initial release for RHEL 6, RHEL 5 and Fedora 15
+
 * Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
 - Import to GIT
diff --git a/redhat/applications/kaffeine/trinity-kaffeine.spec b/redhat/applications/kaffeine/trinity-kaffeine.spec
new file mode 100644
index 000000000..a9597a754
--- /dev/null
+++ b/redhat/applications/kaffeine/trinity-kaffeine.spec
@@ -0,0 +1,187 @@
+# Default version for this component
+%define kdecomp kaffeine
+%define version 0.8.6
+%define release 1
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%define _variant .opt
+%define _docdir %{_prefix}/share/doc
+%endif
+
+# TDE 3.5.13 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}/kde
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/trinity
+
+
+Name:		trinity-%{kdecomp}
+Summary:	sudo frontend for Trinity
+
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License: GPLv2+
+Summary: Xine-based media player
+Group:   Applications/Multimedia
+URL:     http://kaffeine.sourceforge.net/
+
+Source0: kaffeine-3.5.13.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: gettext
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: cdparanoia-devel cdparanoia
+BuildRequires: libvorbis-devel
+BuildRequires: xine-lib-devel
+BuildRequires: libxcb-devel
+BuildRequires: libXext-devel libXinerama-devel libXtst-devel
+BuildRequires: libcdio-devel
+# dvb
+BuildRequires: glibc-kernheaders 
+BuildRequires: gstreamer-devel >= 0.10, gstreamer-plugins-base-devel >= 0.10
+
+Requires: %{name}-libs = %{version}-%{release}
+
+%description
+Kaffeine is a xine-based media player for KDE.  It plays back CDs,
+and VCDs, and can decode all (local or streamed) multimedia formats 
+supported by xine-lib.
+Additionally, Kaffeine is fully integrated in KDE, it supports drag
+and drop and provides an editable playlist, a bookmark system, a
+Konqueror plugin, OSD and much more.
+
+%package devel
+Summary: Development files for %{name}
+Group:   Development/Libraries
+Requires: %{name}-libs = %{version}-%{release}
+Requires: trinity-kdelibs-devel
+%description devel
+%{summary}.
+
+%package libs
+Summary: %{name} runtime libraries
+Group:   System Environment/Libraries
+# helps multilib upgrades
+Obsoletes: %{name} < %{version}-%{release}
+# include to be paranoid, installing libs-only is still mostly untested -- Rex
+Requires: %{name} = %{version}-%{release}
+%description libs
+%{summary}.
+
+
+
+%prep
+%setup -q -n applications/kaffeine
+
+# Ugly hack to modify TQT include directory inside autoconf files.
+# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
+sed -i admin/acinclude.m4.in \
+  -e "s,/usr/include/tqt,%{_includedir}/tqt,g"
+
+%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__make -f admin/Makefile.common
+
+%build
+unset QTDIR || : ; source /etc/profile.d/qt.sh
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+# easier than patching, and using 
+#  --with-extra-includes=%{_includedir}/cdda below -- Rex
+#CPPFLAGS="-I%{_includedir}/cdda"; export CPPFLAGS
+
+%configure \
+  --disable-rpath \
+  --enable-new-ldflags \
+  --disable-debug --disable-warnings \
+  --disable-dependency-tracking --disable-final \
+  --with-gstreamer \
+  --without-lame \
+  --with-extra-includes=%{_includedir}/tqt
+  
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf $RPM_BUILD_ROOT
+%__make install DESTDIR=$RPM_BUILD_ROOT
+
+## File lists
+# locale's
+%find_lang %{kdecomp}
+# HTML (1.0)
+HTML_DIR=$(kde-config --expandvars --install html)
+if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
+for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do
+  if [ -d $lang_dir ]; then
+    lang=$(basename $lang_dir)
+    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
+    # replace absolute symlinks with relative ones
+    pushd $lang_dir
+      for i in *; do
+        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
+      done
+    popd
+  fi
+done
+fi
+
+# Unpackaged files
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+rm -f $RPM_BUILD_ROOT%{_datadir}/mimelnk/application/x-mplayer2.desktop
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
+
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
+
+%files -f %{kdecomp}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING README TODO
+%{_bindir}/kaffeine
+%{_libdir}/libkaffeinepart.so
+%{tde_libdir}/lib*.*
+%{_datadir}/appl*/*/*.desktop
+%{_datadir}/apps/gstreamerpart/
+%{_datadir}/apps/kaffeine/
+%{_datadir}/apps/konqueror/servicemenus/*.desktop
+%{_datadir}/apps/profiles/
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/mimelnk/*/*.desktop
+%{_datadir}/service*/*.desktop
+%{_docdir}/HTML/en/kaffeine
+
+%files libs
+%defattr(-,root,root,-)
+%{_libdir}/lib*.so.*
+
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/kaffeine/
+%{_libdir}/lib*.so
+%exclude %{_libdir}/libkaffeinepart.so
+
+
+%changelog
+* Wed Nov 09 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.6-1
+- Spec file based on Fedora 8 'kaffeine-0.8.6-3'
diff --git a/redhat/applications/kbookreader/trinity-kbookreader-3.5.13.spec b/redhat/applications/kbookreader/trinity-kbookreader-3.5.13.spec
new file mode 100644
index 000000000..1157fc5ff
--- /dev/null
+++ b/redhat/applications/kbookreader/trinity-kbookreader-3.5.13.spec
@@ -0,0 +1,128 @@
+# Default version for this component
+%define kdecomp kbookreader
+%define version 0.2.0
+%define release 1
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%define _variant .opt
+%define _docdir %{_prefix}/share/doc
+%endif
+
+# TDE 3.5.13 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}/kde
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/trinity
+
+
+Name:		trinity-%{kdecomp}
+Summary:	eBook reader 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:    %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+
+
+BuildRequires: tqtinterface-devel
+BuildRequires: trinity-arts-devel
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: trinity-kdebase-devel
+BuildRequires: desktop-file-utils
+
+
+%description
+kbookreader is an application which allows you to view eBooks
+within the Trinity Desktop Environment.
+
+
+%prep
+%setup -q -n applications/%{kdecomp}
+
+# Ugly hack to modify TQT include directory inside autoconf files.
+# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
+sed -i admin/acinclude.m4.in \
+  -e "s,/usr/include/tqt,%{_includedir}/tqt,g"
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%configure \
+	--disable-rpath \
+    --with-extra-includes=%{_includedir}/tqt \
+    --enable-closure
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+
+
+## File lists
+# HTML (1.0)
+HTML_DIR=$(kde-config --expandvars --install html)
+if [ -d %{buildroot}$HTML_DIR ]; then
+for lang_dir in %{buildroot}$HTML_DIR/* ; do
+  if [ -d $lang_dir ]; then
+    lang=$(basename $lang_dir)
+    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
+    # replace absolute symlinks with relative ones
+    pushd $lang_dir
+      for i in *; do
+        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
+      done
+    popd
+  fi
+done
+fi
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{_bindir}/*
+%{_datadir}/applnk/*/*.desktop
+%{_datadir}/apps/*/
+%{_datadir}/config.kcfg/*
+%{_docdir}/HTML/en/*/
+%{_datadir}/icons/*/*/*/*
+
+
+
+%Changelog
+* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.2.0-1
+- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
diff --git a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13-ftbfs_qt_ldlflags.patch b/redhat/applications/kdbusnotification/kdbusnotification-3.5.13-ftbfs_qt_ldlflags.patch
new file mode 100644
index 000000000..06e1d455e
--- /dev/null
+++ b/redhat/applications/kdbusnotification/kdbusnotification-3.5.13-ftbfs_qt_ldlflags.patch
@@ -0,0 +1,10 @@
+--- kdbusnotification/src/daemon/Makefile.am.ORI	2011-11-01 22:59:28.000000000 +0100
++++ kdbusnotification/src/daemon/Makefile.am	2011-11-01 22:59:45.000000000 +0100
+@@ -35,6 +35,7 @@
+ 	$(KDE_RPATH)							\
+ 	$(KDE_LDFLAGS)							\
+ 	$(LIB_QT)							\
++	$(QT_LDFLAGS)							\
+ 	-lDCOP								\
+ 	$(LIB_KDECORE)							\
+ 	$(LIB_KDEUI)							\
diff --git a/redhat/applications/kdbusnotification/trinity-kdbusnotification-3.5.13.spec b/redhat/applications/kdbusnotification/trinity-kdbusnotification-3.5.13.spec
new file mode 100644
index 000000000..27d2f55e5
--- /dev/null
+++ b/redhat/applications/kdbusnotification/trinity-kdbusnotification-3.5.13.spec
@@ -0,0 +1,126 @@
+# Default version for this component
+%define kdecomp kdbusnotification
+%define version 0.1
+%define release 1
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%define _variant .opt
+%define _docdir %{_prefix}/share/doc
+%endif
+
+# TDE 3.5.13 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}/kde
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/trinity
+
+
+Name:		trinity-%{kdecomp}
+Summary:	a DBUS notification service [Trinity]
+
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+Prefix:    %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+
+# [kdbusnotification/src/daemon] Missing QT LDFLAGS
+Patch0:		kdbusnotification-3.5.13-ftbfs_qt_ldlflags.patch
+
+BuildRequires: tqtinterface-devel
+BuildRequires: trinity-arts-devel
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: trinity-kdebase-devel
+BuildRequires: desktop-file-utils
+BuildRequires: dbus-glib-devel
+BuildRequires: gtk2-devel
+
+%description
+kdbusnotification is a small program for Trinity that displays
+DBUS notifications via unobtrusive, easily dismissed passive popups.
+
+
+%prep
+%setup -q -n applications/%{kdecomp}
+%patch0 -p1
+
+# Ugly hack to modify TQT include directory inside autoconf files.
+# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
+sed -i admin/acinclude.m4.in \
+  -e "s,/usr/include/tqt,%{_includedir}/tqt,g"
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%configure \
+	--disable-rpath \
+    --with-extra-includes=%{_includedir}/tqt \
+    --enable-closure
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+
+
+## File lists
+# HTML (1.0)
+HTML_DIR=$(kde-config --expandvars --install html)
+if [ -d %{buildroot}$HTML_DIR ]; then
+for lang_dir in %{buildroot}$HTML_DIR/* ; do
+  if [ -d $lang_dir ]; then
+    lang=$(basename $lang_dir)
+    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
+    # replace absolute symlinks with relative ones
+    pushd $lang_dir
+      for i in *; do
+        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
+      done
+    popd
+  fi
+done
+fi
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%files
+%defattr(-,root,root,-)
+%{_bindir}/notification-daemon-tde
+%{_datadir}/autostart/kdbusnotification-autostart.desktop
+
+
+
+%Changelog
+* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.1-1
+- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
diff --git a/redhat/applications/kdesudo/trinity-kdesudo-3.5.13.spec b/redhat/applications/kdesudo/trinity-kdesudo-3.5.13.spec
new file mode 100644
index 000000000..28425aac5
--- /dev/null
+++ b/redhat/applications/kdesudo/trinity-kdesudo-3.5.13.spec
@@ -0,0 +1,124 @@
+# Default version for this component
+%define kdecomp kdesudo
+%define version 2.5.1
+%define release 1
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%define _variant .opt
+%define _docdir %{_prefix}/share/doc
+%endif
+
+# TDE 3.5.13 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}/kde
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/trinity
+
+
+Name:		trinity-%{kdecomp}
+Summary:	sudo frontend 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:    %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+
+BuildRequires: tqtinterface-devel
+BuildRequires: trinity-arts-devel
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: trinity-kdebase-devel
+BuildRequires: desktop-file-utils
+
+
+%description
+KdeSudo is a graphical frontend for the sudo utility.
+It allows you to run programs as another user by entering your password.
+
+
+%prep
+%setup -q -n applications/%{kdecomp}
+
+# Ugly hack to modify TQT include directory inside autoconf files.
+# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
+sed -i admin/acinclude.m4.in \
+  -e "s,/usr/include/tqt,%{_includedir}/tqt,g"
+
+%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__make -f admin/Makefile.common
+
+%build
+unset QTDIR || : ; source /etc/profile.d/qt.sh
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%configure \
+	--disable-rpath \
+    --with-extra-includes=%{_includedir}/tqt
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+
+
+## File lists
+# HTML (1.0)
+HTML_DIR=$(kde-config --expandvars --install html)
+if [ -d %{buildroot}$HTML_DIR ]; then
+for lang_dir in %{buildroot}$HTML_DIR/* ; do
+  if [ -d $lang_dir ]; then
+    lang=$(basename $lang_dir)
+    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
+    # replace absolute symlinks with relative ones
+    pushd $lang_dir
+      for i in *; do
+        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
+      done
+    popd
+  fi
+done
+fi
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%files
+%defattr(-,root,root,-)
+%{_bindir}/kdesudo
+%{_docdir}/HTML/en/kdesudo/common
+%{_docdir}/HTML/en/kdesudo/index.cache.bz2
+%{_docdir}/HTML/en/kdesudo/index.docbook
+%{_datadir}/locale/fr/LC_MESSAGES/kdesudo.mo
+
+
+%Changelog
+* Wed Nov 02 2011 Francois Andriot <francois.andriot@free.fr> - 2.5.1-1
+- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
diff --git a/redhat/applications/kdiff3/trinity-kdiff3-3.5.13.spec b/redhat/applications/kdiff3/trinity-kdiff3-3.5.13.spec
new file mode 100644
index 000000000..a62ea4bda
--- /dev/null
+++ b/redhat/applications/kdiff3/trinity-kdiff3-3.5.13.spec
@@ -0,0 +1,122 @@
+# Default version for this component
+%define kdecomp kdiff3
+%define version 0.9.91
+%define release 3
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%define _variant .opt
+%define _docdir %{_prefix}/share/doc
+%endif
+
+# TDE 3.5.13 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}/kde
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/trinity
+
+
+Name:		trinity-%{kdecomp}
+Summary:	KDiff3 is a utility for comparing and/or merging two or three text files or directories.
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+Prefix:    %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+
+
+BuildRequires: tqtinterface-devel
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: trinity-kdebase-devel
+BuildRequires: desktop-file-utils
+
+%description
+Shows the differences line by line and character by character (!).
+Provides an automatic merge-facility and
+an integrated editor for comfortable solving of merge-conflicts.
+Supports KIO on KDE (allows accessing ftp, sftp, fish, smb etc.).
+Unicode & UTF-8 support
+
+
+%prep
+%setup -q -n applications/%{kdecomp}
+
+# Ugly hack to modify TQT include directory inside autoconf files.
+# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
+sed -i admin/acinclude.m4.in \
+  -e "s,/usr/include/tqt,%{_includedir}/tqt,g"
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%configure \
+	--disable-rpath \
+    --with-extra-includes=%{_includedir}/tqt \
+    --enable-closure
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{_bindir}/*
+%{_datadir}/apps/*/
+%{_datadir}/icons/*/*/*/*
+%{_datadir}/locale/*/*/*.mo
+%{_docdir}/HTML/*/*
+%{_datadir}/services/*.desktop
+%{tde_libdir}/*.so
+%{_datadir}/applnk/Development/*.desktop
+%{_datadir}/applnk/.hidden/*.desktop
+%{_mandir}/man*/*
+
+%{tde_libdir}/*.la
+
+%Changelog
+* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.91-3
+- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
+
+* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.91-2
+- Import to GIT
+
+* Wed Aug 24 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.91-1
+- Correct macro to install under "/opt", if desired
+
+* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.91-0
+- Initial build for RHEL 6.0
+
diff --git a/redhat/applications/knetworkmanager/knetworkmanager-3.5.13-missing_includes.patch b/redhat/applications/knetworkmanager/knetworkmanager-3.5.13-missing_includes.patch
new file mode 100644
index 000000000..175d299e7
--- /dev/null
+++ b/redhat/applications/knetworkmanager/knetworkmanager-3.5.13-missing_includes.patch
@@ -0,0 +1,10 @@
+--- knetworkmanager8/knetworkmanager-0.8/src/CMakeLists.txt.ORI	2011-11-11 15:06:49.854247242 -0500
++++ knetworkmanager8/knetworkmanager-0.8/src/CMakeLists.txt	2011-11-11 15:06:58.662060747 -0500
+@@ -18,6 +18,7 @@
+   ${CMAKE_BINARY_DIR}
+   ${TDE_INCLUDE_DIR}
+   ${TQT_INCLUDE_DIRS}
++  ${DBUS_INCLUDE_DIRS}
+   ${DBUS_TQT_INCLUDE_DIRS}
+   ${NM_UTIL_INCLUDE_DIRS}
+ )
diff --git a/redhat/applications/knetworkmanager/knetworkmanager-3.5.13-subdir_version.patch b/redhat/applications/knetworkmanager/knetworkmanager-3.5.13-subdir_version.patch
new file mode 100644
index 000000000..9db3ab5de
--- /dev/null
+++ b/redhat/applications/knetworkmanager/knetworkmanager-3.5.13-subdir_version.patch
@@ -0,0 +1,22 @@
+--- knetworkmanager9/CMakeLists.txt.ORI	2011-11-11 13:36:01.462536187 -0500
++++ knetworkmanager9/CMakeLists.txt	2011-11-11 13:36:10.762446937 -0500
+@@ -63,7 +63,7 @@
+ 
+ ##### source directories ########################
+ 
+-add_subdirectory( knetworkmanager-0.8 )
++add_subdirectory( knetworkmanager-0.9 )
+ 
+ 
+ ##### write configure files #####################
+--- knetworkmanager9/knetworkmanager-0.9/src/dbus/CMakeLists.txt.ORI	2011-11-11 13:39:32.866229477 -0500
++++ knetworkmanager9/knetworkmanager-0.9/src/dbus/CMakeLists.txt	2011-11-11 13:39:48.169042904 -0500
+@@ -18,7 +18,7 @@
+ 
+ ##### knm_dbus (static) #########################
+ 
+-set( INTROSPECTIONPATH "${CMAKE_SOURCE_DIR}/knetworkmanager-0.8/introspection" )
++set( INTROSPECTIONPATH "${CMAKE_SOURCE_DIR}/knetworkmanager-0.9/introspection" )
+ 
+ # options:
+ #  p - generate proxy files
diff --git a/redhat/applications/knetworkmanager/knetworkmanager-3.5.13-wpa_passphrase_lag.patch b/redhat/applications/knetworkmanager/knetworkmanager-3.5.13-wpa_passphrase_lag.patch
new file mode 100644
index 000000000..ad10145cf
--- /dev/null
+++ b/redhat/applications/knetworkmanager/knetworkmanager-3.5.13-wpa_passphrase_lag.patch
@@ -0,0 +1,33 @@
+diff -Nuar knetworkmanager9/knetworkmanager-0.9/src.ORI//knetworkmanager-connection_setting_wireless_security_widget.cpp knetworkmanager9/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wireless_security_widget.cpp
+--- knetworkmanager9/knetworkmanager-0.9/src.ORI//knetworkmanager-connection_setting_wireless_security_widget.cpp	2011-11-11 20:45:47.964680619 +0100
++++ knetworkmanager9/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wireless_security_widget.cpp	2011-11-11 20:51:32.689072955 +0100
+@@ -432,14 +432,15 @@
+ 	, _wireless_setting(wireless_setting)
+ {
+ 	txtPSK->setText(_security_setting->getPSK());
+-	connect(txtPSK, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotPSKChanged(const TQString&)));
++	connect(txtPSK, TQT_SIGNAL(lostFocus()), this, TQT_SLOT(slotPSKChanged()));
+ }
+ 
+ void
+-WirelessSecurityWPAPSKImpl::slotPSKChanged(const TQString& psk)
++WirelessSecurityWPAPSKImpl::slotPSKChanged()
+ {
+ 	if (_wireless_setting)
+ 	{
++		TQString psk = txtPSK->text();
+ 		_security_setting->setPSK(psk);
+ 	}
+ }
+diff -Nuar knetworkmanager9/knetworkmanager-0.9/src.ORI//knetworkmanager-connection_setting_wireless_security_widget.h knetworkmanager9/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wireless_security_widget.h
+--- knetworkmanager9/knetworkmanager-0.9/src.ORI//knetworkmanager-connection_setting_wireless_security_widget.h	2011-11-11 20:45:47.962680657 +0100
++++ knetworkmanager9/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wireless_security_widget.h	2011-11-11 20:46:21.640030856 +0100
+@@ -145,7 +145,7 @@
+ 			TQCString String2Hex(TQByteArray bytes, int final_len) const;
+ 
+ 		public slots:
+-			void slotPSKChanged(const TQString&);
++			void slotPSKChanged();
+ 
+ 		private:
+ 			WirelessSecurity* _security_setting;
diff --git a/redhat/applications/knetworkmanager/trinity-knetworkmanager.spec b/redhat/applications/knetworkmanager/trinity-knetworkmanager.spec
new file mode 100644
index 000000000..b561200b4
--- /dev/null
+++ b/redhat/applications/knetworkmanager/trinity-knetworkmanager.spec
@@ -0,0 +1,146 @@
+# Default version for this component
+%define kdecomp knetworkmanager
+%if 0%{?fedora} >= 15
+%define version 0.9
+%else
+%define version 0.8
+%endif
+%define release 1
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%define _variant .opt
+%define _docdir %{_prefix}/share/doc
+%endif
+
+# TDE 3.5.13 specific building variables
+BuildRequires: cmake >= 2.8
+%define tde_docdir %{_docdir}/kde
+%define tde_libdir %{_libdir}/trinity
+
+Name:			trinity-%{kdecomp}
+Version:		%{?version}
+Release:		%{?release}%{?dist}%{?_variant}
+
+Summary:        Trinity applet for Network Manager
+
+Group:          Applications/Internet
+License:        GPLv2+
+URL:            http://en.opensuse.org/Projects/KNetworkManager
+
+%if "%{?version}" == "0.9"
+Source0:		%{kdecomp}9-3.5.13.tar.gz
+%else
+Source0:		%{kdecomp}8-3.5.13.tar.gz
+%endif
+
+Patch0:			knetworkmanager-3.5.13-missing_includes.patch
+Patch1:			knetworkmanager-3.5.13-wpa_passphrase_lag.patch
+
+# For knetworkmanager 0.9 only !
+Patch10:		knetworkmanager-3.5.13-subdir_version.patch
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Requires:       NetworkManager-gnome
+Requires:       kde-filesystem
+BuildRequires:  desktop-file-utils
+
+BuildRequires:	dbus-1-tqt-devel
+BuildRequires:	dbus-tqt-devel
+BuildRequires:	NetworkManager-glib-devel
+
+%description
+KNetworkManager is a system tray applet for controlling network
+connections on systems that use the NetworkManager daemon.
+
+
+%package devel
+Summary:        Common data shared among the MySQL GUI Suites
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description devel
+Development headers for knetworkmanager
+
+
+%prep 
+%if "%{?version}" == "0.9"
+%setup -q -n applications/%{kdecomp}9
+%else
+%setup -q -n applications/%{kdecomp}8
+%endif
+
+%if "%{?version}" == "0.9"
+%patch10 -p1
+%endif
+
+cd knetworkmanager-0.*/src
+%patch0 -p3
+%patch1 -p3
+
+
+
+%build
+unset QTDIR || : ; . /etc/profile.d/qt.sh
+export PATH="%{_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{_libdir}/pkgconfig"
+export CMAKE_INCLUDE_PATH="%{_includedir}:%{_includedir}/tqt"
+export LD_LIBRARY_PATH="%{_libdir}"
+
+# Missing TDE macros
+%__mkdir_p cmake
+%__ln_s %{_datadir}/cmake cmake/modules
+
+%__mkdir build
+cd build
+%cmake ..
+%__make %{?_smp_mflags} 
+
+%install
+%__rm -rf $RPM_BUILD_ROOT
+%__make install DESTDIR=%{?buildroot} -C build
+
+
+%clean
+%__rm -rf $RPM_BUILD_ROOT
+
+
+%post
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%post devel
+/sbin/ldconfig
+
+%postun devel
+/sbin/ldconfig
+
+%files 
+%defattr(-,root,root,-)
+%{_bindir}/knetworkmanager
+%{_libdir}/*.la
+%{_libdir}/*.so
+%{_sysconfdir}/dbus-1/system.d/knetworkmanager.conf
+%{_datadir}/applications/kde/knetworkmanager.desktop
+%{_datadir}/apps/knetworkmanager
+%{_datadir}/icons/*/*/apps/knetworkmanager*
+%{_datadir}/servicetypes/knetworkmanager_plugin.desktop
+%{_datadir}/servicetypes/knetworkmanager_vpnplugin.desktop
+
+
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/*.h
+%{tde_libdir}/*.la
+%{tde_libdir}/*.so
+
+%changelog
+* Tue Nov 11 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-1
+- Initial build
diff --git a/redhat/applications/konversation/trinity-konversation-3.5.13.spec b/redhat/applications/konversation/trinity-konversation-3.5.13.spec
new file mode 100644
index 000000000..2b9d0c192
--- /dev/null
+++ b/redhat/applications/konversation/trinity-konversation-3.5.13.spec
@@ -0,0 +1,132 @@
+# Default version for this component
+%define kdecomp konversation
+%define version 1.1
+%define release 1
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%define _variant .opt
+%define _docdir %{_prefix}/share/doc
+%endif
+
+# TDE 3.5.13 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}/kde
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/trinity
+
+
+Name:		trinity-%{kdecomp}
+Summary:	user friendly Internet Relay Chat (IRC) client for KDE [Trinity]
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+Prefix:    %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+
+
+BuildRequires: tqtinterface-devel
+BuildRequires: trinity-arts-devel
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: trinity-kdebase-devel
+BuildRequires: desktop-file-utils
+BuildRequires: gettext
+
+BuildRequires: libxslt
+BuildRequires: docbook-style-xsl
+BuildRequires: libXi-devel
+
+
+%description
+Konversation is a client for the Internet Relay Chat (IRC) protocol.
+It is easy to use and well-suited for novice IRC users, but novice
+and experienced users alike will appreciate its many features:
+
+ * Standard IRC features
+ * Easy to use graphical interface
+ * Multiple server and channel tabs in a single window
+ * IRC color support
+ * Pattern-based message highlighting and OnScreen Display
+ * Multiple identities for different servers
+ * Multi-language scripting support (with DCOP)
+ * Customizable command aliases
+ * NickServ-aware log-on (for registered nicknames)
+ * Smart logging
+ * Traditional or enhanced-shell-style nick completion
+ * DCC file transfer with resume support
+
+
+
+%prep
+%setup -q -n applications/%{kdecomp}
+
+# Ugly hack to modify TQT include directory inside autoconf files.
+# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
+sed -i admin/acinclude.m4.in \
+  -e "s,/usr/include/tqt,%{_includedir}/tqt,g"
+
+%__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 || : ; source /etc/profile.d/qt.sh
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%configure \
+	--disable-rpath \
+    --with-extra-includes=%{_includedir}/tqt \
+    --enable-closure
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{_bindir}/*
+%{_datadir}/applications/*/*.desktop
+%{_datadir}/locale/*/LC_MESSAGES/konversation.mo
+%{_datadir}/config.kcfg/konversation.kcfg
+%{_datadir}/services/*.protocol
+#%{_datadir}/servicetypes/digikamimageplugin.desktop
+%{_datadir}/apps/*/
+%{_docdir}/HTML/*/konversation/
+%{_datadir}/icons/*/*/*/*
+#%{_mandir}/man*/*
+
+%Changelog
+* Mon Nov 07 2011 Francois Andriot <francois.andriot@free.fr> - 1.1-1
+- Initial release for RHEL 6, RHEL 5 and Fedora 15
+
diff --git a/redhat/applications/krename/trinity-krename-3.5.13.spec b/redhat/applications/krename/trinity-krename-3.5.13.spec
new file mode 100644
index 000000000..9c813486c
--- /dev/null
+++ b/redhat/applications/krename/trinity-krename-3.5.13.spec
@@ -0,0 +1,115 @@
+# Default version for this component
+%define kdecomp krename
+%define version 3.0.14
+%define release 3
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%define _variant .opt
+%define _docdir %{_prefix}/share/doc
+%endif
+
+# TDE 3.5.12 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}/kde
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/trinity
+
+
+Name:		trinity-%{kdecomp}
+Summary:	A KDE batch file renaming utility. 
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+Prefix:    %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+
+BuildRequires: tqtinterface-devel
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: trinity-kdebase-devel
+BuildRequires: desktop-file-utils
+BuildRequires: imlib-devel
+
+%description
+KRename is a powerful batch renamer for KDE 3.x. It allows you to easily rename hundreds or
+even more files in one go. The filenames can be created by parts of the original filename,
+numbering the files or accessing hundreds of informations about the file, like creation date
+or Exif informations of an image. 
+
+%prep
+%setup -q -n applications/%{kdecomp}
+
+# Ugly hack to modify TQT include directory inside autoconf files.
+# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
+sed -i admin/acinclude.m4.in \
+  -e "s,/usr/include/tqt,%{_includedir}/tqt,g"
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%configure \
+	--disable-rpath \
+    --with-extra-includes=%{_includedir}/tqt \
+    --enable-closure
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{_bindir}/*
+%{_datadir}/applications/*/*.desktop
+%{_datadir}/apps/*/
+%{_docdir}/HTML/en/*/
+%{_datadir}/icons/*/*/*/*
+%{_datadir}/locale/*/*/*.mo
+
+
+%Changelog
+* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.0.14-3
+- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
+
+* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 3.0.14-2
+- Import to GIT
+
+* Wed Aug 24 2011 Francois Andriot <francois.andriot@free.fr> - 3.0.14-1
+- Correct macro to install under "/opt", if desired
+
+* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 3.0.14-0
+- Initial build for RHEL 6.0
+
diff --git a/redhat/applications/ksensors/ksensors-0.7.3-fix-min-max.patch b/redhat/applications/ksensors/ksensors-0.7.3-fix-min-max.patch
new file mode 100644
index 000000000..14b3cc61c
--- /dev/null
+++ b/redhat/applications/ksensors/ksensors-0.7.3-fix-min-max.patch
@@ -0,0 +1,79 @@
+diff -up ksensors-0.7.3/src/lmsensor.cpp.minmax ksensors-0.7.3/src/lmsensor.cpp
+--- ksensors-0.7.3/src/lmsensor.cpp.minmax	2007-11-11 15:12:24.000000000 +0100
++++ ksensors-0.7.3/src/lmsensor.cpp	2007-11-11 15:26:30.000000000 +0100
+@@ -40,17 +40,30 @@ bool LMSensor::init(const sensors_featur
+  char *label;
+  QString str;
+ 
+- bool min_max=false;
++ bool min_found=false;
++ bool max_found=false;
+  while( (*data= sensors_get_all_features(*chip_name, nr1, nr2)) && (*data)->mapping!=SENSORS_NO_MAPPING) {
+-   str= (*data)->name;
+-   if(str.find("_min")>=0 || str.find("_low")>=0) {
+-     sensors_get_feature(*chip_name, (*data)->number, &valMin);
+-     min_max=true;
+-   } 
+-   else if(str.find("_max")>=0 || str.find("_over")>=0  || str.find("_high")>=0) {
+-     sensors_get_feature(*chip_name, (*data)->number, &valMax);
+-     min_max=true;
++   int len = strlen((*data)->name);
++   const char *postfix = (*data)->name + len - 4;
++
++   if (len < 5)
++     continue;
++
++   if((!strcmp(postfix, "_min") || !strcmp(postfix, "_low")) &&
++      !sensors_get_feature(*chip_name, (*data)->number, &valMin))
++     min_found=true;
++   
++   if(!strcmp(postfix, "_max") &&
++      !sensors_get_feature(*chip_name, (*data)->number, &valMax)) {
++     max_found=true;
++     continue;
+    }
++
++   postfix--;
++
++   if((!strcmp(postfix, "_over") || !strcmp(postfix, "_high")) &&
++      !sensors_get_feature(*chip_name, (*data)->number, &valMax))
++     max_found=true;
+  }
+ 
+  double newVal;
+@@ -87,22 +100,21 @@ bool LMSensor::init(const sensors_featur
+  sensors_get_label(*chip_name,feature,&label);
+  setDescription(QString(label));
+ 
+- if(min_max){
+-   if(min>max) {
+-     double pivot= valMin;
+-     min= max;
+-     max= pivot;
+-   }
+-   setValueMax(max,dgCelsius);
+-   setValueMin(min,dgCelsius);
+-   setValue((max+min)/2,dgCelsius);
+- }
+- else {
+-   setValueMax(70,dgCelsius);
+-   setValueMin(0,dgCelsius);
+-   setValue(newVal,dgCelsius);
++ if(min_found)
++   min = valMin;
++   
++ if(max_found)
++   max = valMax;
++   
++ if(min>max) {
++   double pivot= min;
++   min= max;
++   max= pivot;
+  }
+ 
++ setValueMax(max,dgCelsius);
++ setValueMin(min,dgCelsius);
++
+  readConfig();
+  updateValue();
+  setValueIdeal(getValue());
diff --git a/redhat/applications/ksensors/ksensors-0.7.3-lm_sensors-3.x.patch b/redhat/applications/ksensors/ksensors-0.7.3-lm_sensors-3.x.patch
new file mode 100644
index 000000000..bc56ea40e
--- /dev/null
+++ b/redhat/applications/ksensors/ksensors-0.7.3-lm_sensors-3.x.patch
@@ -0,0 +1,245 @@
+diff -up ksensors-0.7.3/src/lmsensor.cpp.lm_sensors3x ksensors-0.7.3/src/lmsensor.cpp
+--- ksensors-0.7.3/src/lmsensor.cpp.lm_sensors3x	2007-11-11 16:34:15.000000000 +0100
++++ ksensors-0.7.3/src/lmsensor.cpp	2007-11-11 16:37:58.000000000 +0100
+@@ -30,8 +30,11 @@ LMSensor::LMSensor(SensorsList *parent):
+ LMSensor::~LMSensor(){
+ }
+ 
+-
++#if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */
+ bool LMSensor::init(const sensors_feature_data **data, int *nr1,int *nr2)
++#else
++bool LMSensor::init(const sensors_feature **data, int *nr1, int *nr2)
++#endif
+ {
+  double min,max;
+  const sensors_chip_name *chip_name= getChipName();
+@@ -40,6 +43,7 @@ bool LMSensor::init(const sensors_featur
+  char *label;
+  QString str;
+ 
++#if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */
+  bool min_found=false;
+  bool max_found=false;
+  while( (*data= sensors_get_all_features(*chip_name, nr1, nr2)) && (*data)->mapping!=SENSORS_NO_MAPPING) {
+@@ -105,7 +109,97 @@ bool LMSensor::init(const sensors_featur
+    
+  if(max_found)
+    max = valMax;
+-   
++
++#else /* libsensors4 code */
++
++  const sensors_subfeature *sub_feature;
++  const sensors_feature *feature_data = *data;
++  
++  /* Move to next feature for the loop in LMSensorsChip::createSensors() */
++  *data = sensors_get_features(chip_name, nr1);
++ 
++  switch(feature_data->type)
++  {
++    case SENSORS_FEATURE_IN:
++      sub_feature = sensors_get_subfeature(chip_name, feature_data,
++        SENSORS_SUBFEATURE_IN_INPUT);
++
++      if (!sub_feature)
++        return false;
++
++      feature = sub_feature->number;
++
++      if (!(sub_feature = sensors_get_subfeature(chip_name, feature_data,
++            SENSORS_SUBFEATURE_IN_MIN)) ||
++          sensors_get_value(chip_name, sub_feature->number, &min))
++        min = -16;
++
++      if (!(sub_feature = sensors_get_subfeature(chip_name, feature_data,
++            SENSORS_SUBFEATURE_IN_MAX)) ||
++          sensors_get_value(chip_name, sub_feature->number, &max))
++        max = 16;
++ 
++      setType(lmVoltage);
++      break;
++
++    case SENSORS_FEATURE_FAN:
++      sub_feature = sensors_get_subfeature(chip_name, feature_data,
++        SENSORS_SUBFEATURE_FAN_INPUT);
++
++      if (!sub_feature)
++        return false;
++
++      feature = sub_feature->number;
++
++      if (!(sub_feature = sensors_get_subfeature(chip_name, feature_data,
++            SENSORS_SUBFEATURE_FAN_MIN)) ||
++          sensors_get_value(chip_name, sub_feature->number, &min))
++        min = 3000;
++
++      max = 10000;
++
++      setType(lmFan);
++      break;
++
++    case SENSORS_FEATURE_TEMP:
++      sub_feature = sensors_get_subfeature(chip_name, feature_data,
++        SENSORS_SUBFEATURE_TEMP_INPUT);
++
++      if (!sub_feature)
++        return false;
++
++      feature = sub_feature->number;
++
++      if (!(sub_feature = sensors_get_subfeature(chip_name, feature_data,
++            SENSORS_SUBFEATURE_TEMP_MIN)) ||
++          sensors_get_value(chip_name, sub_feature->number, &min))
++        min = 0;
++
++      if ((!(sub_feature = sensors_get_subfeature(chip_name, feature_data,
++              SENSORS_SUBFEATURE_TEMP_MAX)) &&
++           !(sub_feature = sensors_get_subfeature(chip_name, feature_data,
++              SENSORS_SUBFEATURE_TEMP_CRIT))) ||
++          sensors_get_value(chip_name, sub_feature->number, &max))
++        max = 65;
++
++      setType(lmTemp);
++      break;
++    
++    default:
++      return false;
++  }
++
++  str.sprintf("%s.%s", chip_name->prefix, main_name);
++  setName( str.latin1() );
++
++  label = sensors_get_label(chip_name, feature_data);
++  if (label)
++    setDescription(QString(label));
++  else
++    setDescription( str.latin1() );
++
++#endif /* libsensors3 / libsensors4 code */
++
+  if(min>max) {
+    double pivot= min;
+    min= max;
+@@ -131,7 +225,11 @@ double LMSensor::readSensorValue()
+ {
+  double newVal;
+  const sensors_chip_name *chip_name= getChipName();
++#if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */
+  sensors_get_feature(*chip_name, feature, &newVal);
++#else
++ sensors_get_value(chip_name, feature, &newVal);
++#endif
+  return newVal;
+ }
+ 
+diff -up ksensors-0.7.3/src/lmsensorschip.cpp.lm_sensors3x ksensors-0.7.3/src/lmsensorschip.cpp
+--- ksensors-0.7.3/src/lmsensorschip.cpp.lm_sensors3x	2003-12-27 22:52:12.000000000 +0100
++++ ksensors-0.7.3/src/lmsensorschip.cpp	2007-11-11 16:34:15.000000000 +0100
+@@ -50,10 +50,15 @@ const sensors_chip_name *LMSensorsChip::
+ void LMSensorsChip::createSensors()
+ {
+  if(!chip_name) return;
+- const sensors_feature_data *data;
+  int nr1= 0;
+  int nr2= 0;
++#if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */
++ const sensors_feature_data *data;
+  data= sensors_get_all_features(*chip_name, &nr1, &nr2);
++#else
++ const sensors_feature *data;
++ data= sensors_get_features(chip_name, &nr1);
++#endif
+  while(data) {
+    LMSensor *sensor= new LMSensor(this);
+    if( !sensor->init(&data,&nr1,&nr2) )
+diff -up ksensors-0.7.3/src/lmsensor.h.lm_sensors3x ksensors-0.7.3/src/lmsensor.h
+--- ksensors-0.7.3/src/lmsensor.h.lm_sensors3x	2003-12-27 22:52:12.000000000 +0100
++++ ksensors-0.7.3/src/lmsensor.h	2007-11-11 16:34:15.000000000 +0100
+@@ -51,7 +51,11 @@ protected:
+ 
+   double calculateIdealValue();
+ 
++#if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */
+   bool init(const sensors_feature_data **data, int *nr1,int *nr2);
++#else
++  bool init(const sensors_feature **data, int *nr1,int *nr2);
++#endif
+   const sensors_chip_name *getChipName();
+ 
+ private:
+diff -up ksensors-0.7.3/src/lmsensors.cpp.lm_sensors3x ksensors-0.7.3/src/lmsensors.cpp
+--- ksensors-0.7.3/src/lmsensors.cpp.lm_sensors3x	2007-11-11 16:34:15.000000000 +0100
++++ ksensors-0.7.3/src/lmsensors.cpp	2007-11-11 16:34:15.000000000 +0100
+@@ -45,17 +45,23 @@ LMSensors::~LMSensors()
+ 
+ bool LMSensors::initSensors()
+ {
++#if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */
+  FILE *fp=fopen("/etc/sensors.conf","r");
+  if(!fp) {
+    qWarning("KSensors error: /etc/sensors.conf not found !");
+    return false;
+  }
++#else
++ FILE *fp=NULL;
++#endif
+  int err= sensors_init(fp);
+  if(err) {
+    qWarning("KSensors error: sensors_init fail, error code %d",err);
+    return false;
+  }
++#if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */
+  fclose(fp);
++#endif
+  return true;
+ }
+ 
+@@ -63,6 +69,7 @@ void LMSensors::createLMSensors()
+ {
+  const sensors_chip_name *chip_name;
+  int err= 0;
++#if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */
+  while( (chip_name= sensors_get_detected_chips(&err)) )
+  {
+    if( existSensor(chip_name,"temp")  ||
+@@ -71,6 +78,10 @@ void LMSensors::createLMSensors()
+           (void)new LMSensorsChip(chip_name,this);
+        }
+  }
++#else
++ while( (chip_name= sensors_get_detected_chips(NULL, &err)) )
++          (void)new LMSensorsChip(chip_name,this);
++#endif
+ }
+ 
+ void LMSensors::createHDSensors()
+@@ -86,6 +97,7 @@ void LMSensors::createI8KSensors()
+ }
+ 
+ 
++#if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */
+ int LMSensors::existSensor(const sensors_chip_name *chip_name,const char *sensor_name)
+ {
+ int nr1,nr2;
+@@ -99,6 +111,7 @@ const sensors_feature_data *sensor_data;
+  }
+  return 0;
+ }
++#endif
+ 
+ void LMSensors::setMonitorized(bool enable)
+ {
+diff -up ksensors-0.7.3/src/lmsensors.h.lm_sensors3x ksensors-0.7.3/src/lmsensors.h
+--- ksensors-0.7.3/src/lmsensors.h.lm_sensors3x	2003-12-27 22:52:12.000000000 +0100
++++ ksensors-0.7.3/src/lmsensors.h	2007-11-11 16:34:15.000000000 +0100
+@@ -65,7 +65,9 @@ private:
+   void createI8KSensors();
+   void childEvent ( QChildEvent *e );
+ 
++#if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */
+   static int existSensor(const sensors_chip_name *chip_name,const char *sensor_name);
++#endif
+ };
+ 
+ #endif
diff --git a/redhat/applications/ksensors/ksensors-0.7.3-po.patch b/redhat/applications/ksensors/ksensors-0.7.3-po.patch
new file mode 100644
index 000000000..e4fc3b3b1
--- /dev/null
+++ b/redhat/applications/ksensors/ksensors-0.7.3-po.patch
@@ -0,0 +1,41 @@
+--- ksensors-0.7.3/po/Makefile.in~	2004-08-19 00:39:08.000000000 +0300
++++ ksensors-0.7.3/po/Makefile.in	2007-06-26 22:05:56.000000000 +0300
+@@ -255,8 +255,8 @@ xdg_appsdir = @xdg_appsdir@
+ xdg_directorydir = @xdg_directorydir@
+ #>- POFILES = AUTO
+ #>+ 2
+-POFILES = nl.po fr.po es.po de.po cs.po
+-GMOFILES = nl.gmo fr.gmo es.gmo de.gmo cs.gmo
++POFILES = nl.po fr.po es.po de.po cs.po it.po pl.po sv.po nb.po
++GMOFILES = nl.gmo fr.gmo es.gmo de.gmo cs.gmo it.gmo pl.gmo sv.gmo nb.gmo
+ subdir = po
+ mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -431,6 +431,18 @@ de.gmo: de.po
+ cs.gmo: cs.po
+ 	rm -f cs.gmo; $(GMSGFMT) -o cs.gmo $(srcdir)/cs.po
+ 	test ! -f cs.gmo || touch cs.gmo
++it.gmo: it.po
++	rm -f it.gmo; $(GMSGFMT) -o it.gmo $(srcdir)/it.po
++	test ! -f it.gmo || touch it.gmo
++nb.gmo: nb.po
++	rm -f nb.gmo; $(GMSGFMT) -o nb.gmo $(srcdir)/nb.po
++	test ! -f nb.gmo || touch nb.gmo
++pl.gmo: pl.po
++	rm -f pl.gmo; $(GMSGFMT) -o pl.gmo $(srcdir)/pl.po
++	test ! -f pl.gmo || touch pl.gmo
++sv.gmo: sv.po
++	rm -f sv.gmo; $(GMSGFMT) -o sv.gmo $(srcdir)/sv.po
++	test ! -f sv.gmo || touch sv.gmo
+ 
+ #>+ 3
+ clean-nls:
+@@ -438,7 +450,7 @@ clean-nls:
+ 
+ #>+ 10
+ install-nls:
+-	@for base in nl fr es de cs ; do \
++	@for base in nl fr es de cs it pl sv nb ; do \
+ 	  echo $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$$base/LC_MESSAGES/$(PACKAGE).mo ;\
+ 	  $(mkinstalldirs) $(DESTDIR)$(kde_locale)/$$base/LC_MESSAGES ; \
+ 	  if test -f $$base.gmo; then $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$$base/LC_MESSAGES/$(PACKAGE).mo ;\
diff --git a/redhat/applications/ksensors/ksensors-0.7.3-trinity.patch b/redhat/applications/ksensors/ksensors-0.7.3-trinity.patch
new file mode 100644
index 000000000..9f6a3a6d7
--- /dev/null
+++ b/redhat/applications/ksensors/ksensors-0.7.3-trinity.patch
@@ -0,0 +1,102 @@
+diff -Nuar ksensors-0.7.3.ORI//configure ksensors-0.7.3.P//configure
+--- ksensors-0.7.3.ORI//configure	2004-08-18 23:37:56.000000000 +0200
++++ ksensors-0.7.3.P//configure	2011-11-07 22:55:46.555892050 +0100
+@@ -25119,7 +25119,7 @@
+ 
+ if test -z ""; then
+ 
+-kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
++kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/trinity/include /opt/kde/include $x_includes $qt_includes"
+ test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
+ kde_incdirs="$ac_kde_includes $kde_incdirs"
+ 
+@@ -25149,7 +25149,7 @@
+    { (exit 1); exit 1; }; }
+ fi
+ 
+-kde_libdirs="/usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
++kde_libdirs="/usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/trinity /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/trinity/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
+ test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
+ kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
+ 
+@@ -25174,7 +25174,7 @@
+ kde_widgetdir=NO
+ for i in $kde_libdirs;
+ do
+-  for j in "kde3/plugins/designer/kdewidgets.la";
++  for j in "trinity/plugins/designer/kdewidgets.la";
+   do
+     echo "configure: 25179: $i/$j" >&5
+     if test -r "$i/$j"; then
+@@ -25196,7 +25196,7 @@
+    { (exit 1); exit 1; }; }
+ fi
+ 
+-if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
++if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then
+ { { echo "$as_me:$LINENO: error:
+ I can't find the designer plugins. These are required and should have been installed
+ by kdelibs" >&5
+@@ -25207,7 +25207,7 @@
+ fi
+ 
+ if test -n "$kde_widgetdir"; then
+-    kde_widgetdir="$kde_widgetdir/kde3/plugins/designer"
++    kde_widgetdir="$kde_widgetdir/trinity/plugins/designer"
+ fi
+ 
+ 
+@@ -25428,14 +25428,14 @@
+     if test "$kde_qtver" = "2"; then
+       kde_moduledir='\${libdir}/kde2'
+     else
+-      kde_moduledir='\${libdir}/kde3'
++      kde_moduledir='\${libdir}/trinity'
+     fi
+   fi
+   if test -z "$kde_styledir"; then
+-    kde_styledir='\${libdir}/kde3/plugins/styles'
++    kde_styledir='\${libdir}/trinity/plugins/styles'
+   fi
+   if test -z "$kde_widgetdir"; then
+-    kde_widgetdir='\${libdir}/kde3/plugins/designer'
++    kde_widgetdir='\${libdir}/trinity/plugins/designer'
+   fi
+   if test -z "$xdg_appsdir"; then
+     xdg_appsdir='\${datadir}/applications'
+@@ -25716,14 +25716,14 @@
+     if test "$kde_qtver" = "2"; then
+       kde_moduledir='\${libdir}/kde2'
+     else
+-      kde_moduledir='\${libdir}/kde3'
++      kde_moduledir='\${libdir}/trinity'
+     fi
+   fi
+   if test -z "$kde_styledir"; then
+-    kde_styledir='\${libdir}/kde3/plugins/styles'
++    kde_styledir='\${libdir}/trinity/plugins/styles'
+   fi
+   if test -z "$kde_widgetdir"; then
+-    kde_widgetdir='\${libdir}/kde3/plugins/designer'
++    kde_widgetdir='\${libdir}/trinity/plugins/designer'
+   fi
+   if test -z "$xdg_appsdir"; then
+     xdg_appsdir='\${datadir}/applications'
+@@ -25982,7 +25982,7 @@
+ fi
+ 
+ 
+-        kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
++        kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/trinity/bin /usr/kde/bin /usr/local/kde/bin"
+         test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
+         if test -n "$KDEDIRS"; then
+            kde_save_IFS=$IFS
+@@ -26377,7 +26377,7 @@
+ 
+ 
+         if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then
+- 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
++ 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/trinity/share /opt/kde/share $prefix/share"
+             test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
+ 
+ KDE_XSL_STYLESHEET=NO
diff --git a/redhat/applications/ksensors/ksensors-0.7.3.tar.gz b/redhat/applications/ksensors/ksensors-0.7.3.tar.gz
new file mode 100644
index 000000000..a101185cf
--- /dev/null
+++ b/redhat/applications/ksensors/ksensors-0.7.3.tar.gz
diff --git a/redhat/applications/ksensors/ksensors-desktop.patch b/redhat/applications/ksensors/ksensors-desktop.patch
new file mode 100644
index 000000000..c51e769ec
--- /dev/null
+++ b/redhat/applications/ksensors/ksensors-desktop.patch
@@ -0,0 +1,35 @@
+diff -up ksensors-0.7.3/src/ksensors.desktop.desktop ksensors-0.7.3/src/ksensors.desktop
+--- ksensors-0.7.3/src/ksensors.desktop.desktop	2003-12-27 22:48:03.000000000 +0100
++++ ksensors-0.7.3/src/ksensors.desktop	2007-07-28 00:21:34.000000000 +0200
+@@ -1,24 +1,11 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-Name=ksensors
+-Name[xx]=xxksensorsxx
++Name=KSensors
++GenericName=Hardware Monitor
+ Exec=ksensors
+ Icon=ksensors
+ Type=Application
+-Comment=A simple KDE Application
+-Comment[ca]=Una simple aplicació KDE
+-Comment[da]=Et simpelt KDE program
+-Comment[de]=Eine einfache KDE-Anwendung
+-Comment[el]=Μια απλή εφαρμογή του KDE
+-Comment[es]=Una aplicación de KDE sencilla
+-Comment[et]=Lihtne KDE rakendus
+-Comment[fr]=Une application simple pour KDE.
+-Comment[hu]=Egyszerű KDE-alkalmazás
+-Comment[it]=Una semplice applicazione KDE
+-Comment[pt]=Uma aplicação KDE simples
+-Comment[pt_BR]=Um simples Aplicativo do KDE
+-Comment[ru]=Простое приложение KDE
+-Comment[sl]=Preprost program za KDE
+-Comment[sr]=Проста KDE-ова апликација
+-Comment[sv]=Ett enkelt KDE-program
+-Comment[xx]=xxA simple KDE Applicationxx
++Comment=Monitor system hardware sensors
++Categories=System;Monitor;KDE;
++X-KDE-autostart-after=panel
++X-KDE-autostart-condition=ksensorsrc:General:AutoStart:true
+diff -up ksensors-0.7.3/src/ksensors.desktop ksensors-0.7.3/src/ksensors
diff --git a/redhat/applications/ksensors/ksensors_0.7.3-15.diff.gz b/redhat/applications/ksensors/ksensors_0.7.3-15.diff.gz
new file mode 100644
index 000000000..ad6dd2b0c
--- /dev/null
+++ b/redhat/applications/ksensors/ksensors_0.7.3-15.diff.gz
diff --git a/redhat/applications/ksensors/trinity-ksensors.spec b/redhat/applications/ksensors/trinity-ksensors.spec
new file mode 100644
index 000000000..7b0f5c20d
--- /dev/null
+++ b/redhat/applications/ksensors/trinity-ksensors.spec
@@ -0,0 +1,205 @@
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%define _variant .opt
+%define _docdir %{_prefix}/share/doc
+%endif
+
+Name:           trinity-ksensors
+Version:        0.7.3
+Release:        19p1%{?dist}
+Summary:        KDE frontend to lm_sensors
+Group:          Applications/System
+License:        GPLv2+
+URL:            http://ksensors.sourceforge.net/
+Source0:        http://downloads.sourceforge.net/ksensors/ksensors-%{version}.tar.gz
+Patch1:         ksensors-desktop.patch
+Patch2:         http://ftp.debian.org/debian/pool/main/k/ksensors/ksensors_0.7.3-15.diff.gz
+Patch3:         ksensors-0.7.3-po.patch
+Patch4:         ksensors-0.7.3-fix-min-max.patch
+Patch5:         ksensors-0.7.3-lm_sensors-3.x.patch
+Patch6:			ksensors-0.7.3-trinity.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  trinity-kdelibs-devel
+BuildRequires:	lm_sensors-devel gettext desktop-file-utils
+Requires:       hicolor-icon-theme
+# Keep archs in sync with lm_sensors
+ExcludeArch:    s390 s390x
+
+%description
+KSensors is a nice lm-sensors frontend for the K Desktop Environment.
+Install the hddtemp package if you wish to monitor hard disk
+temperatures with KSensors.
+
+
+%prep
+%setup -q -n ksensors-%{version}
+%patch1 -p1 -z .desktop
+%patch2 -p1
+%patch3 -p1 -z .po
+%patch4 -p1 -z .minmax
+%patch5 -p1 -z .lm_sensors3x
+%patch6 -p1
+sed -i -e 's|$(kde_datadir)/sounds|$(kde_sounddir)|' src/sounds/Makefile.*
+for f in ChangeLog LIESMICH LISEZMOI ; do
+    iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
+done
+
+%build
+unset QTDIR ; . %{_sysconfdir}/profile.d/qt.sh
+
+%configure \
+	--disable-dependency-tracking \
+	--disable-rpath \
+	--with-extra-includes=%{_includedir}/tqt
+make %{?_smp_mflags}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+desktop-file-install --vendor fedora --mode 644 --delete-original \
+    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+    $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/ksensors.desktop
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/autostart
+ln -s ../applications/fedora-ksensors.desktop \
+    $RPM_BUILD_ROOT%{_datadir}/autostart
+rm -rf $RPM_BUILD_ROOT%{_docdir}/HTML
+%find_lang ksensors
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%post
+for f in locolor hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null || :
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null || :
+done
+
+%postun
+for f in locolor hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null || :
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null || :
+done
+
+
+%files -f ksensors.lang
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING FAQ README TODO
+%lang(es) %doc LEEME
+%lang(de) %doc LIESMICH
+%lang(fr) %doc LISEZMOI
+%{_bindir}/ksensors
+%{_datadir}/applications/*ksensors.desktop
+%{_datadir}/apps/ksensors/
+%{_datadir}/autostart/*ksensors.desktop
+%{_datadir}/icons/hicolor/*x*/apps/ksensors.png
+%{_datadir}/icons/locolor/
+%{_datadir}/sounds/ksensors_alert.wav
+
+
+%changelog
+* Mon Nov 07 2011 Francois Andriot <francois.andriot@free.fr> - 0.7.3-19p1
+- Rebuilt for RHEL 6, RHEL 5, Fedora 15 with TDE 3.5.13
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.3-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.3-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.3-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Fri Feb 15 2008 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.3-16
+- Update Debian patch to -15 release
+
+* Thu Jan  3 2008 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.3-15
+- Change BuildRequires: kdelibs-devel into kdelibs3-devel
+
+* Sun Nov 11 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.3-14
+- Patch for and Rebuild against lm_sensors-3.0.0
+
+* Sun Nov 11 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.3-13
+- Fix reading of min and max tresholds from libsensors
+
+* Mon Aug 13 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.3-12
+- Update License tag for new Licensing Guidelines compliance
+
+* Fri Jul 27 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.3-11
+- Remove OnlyShowIn=KDE; from .desktop file (I like using ksensors under GNOME,
+  works fine grumbel) 
+
+* Fri Jul 27 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.3-10
+- Add icon-cache update scriptlets
+- Add Requires: hicolor-icon-theme for dir ownership
+
+* Fri Jul 20 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-9
+- Sync Exclu(de|sive)Arch with new lm_sensors (#249060).
+
+* Tue Jun 26 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-8
+- Update Debian patchset to -14 for additional fixes and translations;
+  drop our hddtemp detection patch in favour of the one included in it.
+- Drop Application and X-Fedora categories from .desktop file, add GenericName.
+- Make autostart checkbox effective again (#242570).
+- Convert docs to UTF-8.
+
+* Sat Sep 30 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-7
+- Apply Debian -11 patchset for upstream radio button state fix,
+  support for hddtemp with SCSI disks and more translations.
+
+* Wed Aug 30 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-6
+- Rebuild.
+
+* Wed Feb 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-5
+- Rebuild.
+
+* Thu Nov  3 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-4
+- Clean up build dependencies.
+
+* Thu May 19 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-3
+- Sync arch availability with FC4 lm_sensors (%%{ix86}, x86_64, alpha).
+- Reduce directory ownership bloat.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.7.3-2
+- rebuilt
+
+* Sat Aug 21 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.3-0.fdr.1
+- Update to 0.7.3, most patches applied upstream.
+- Disable dependency tracking to speed up the build.
+
+* Tue Jul 20 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.2-0.fdr.4
+- Force use of multithreaded Qt with --enable-mt to fix build on FC2.
+- Sync Debian patch to 0.7.2-16 to get a fix for freeze with hddtemp.
+- Apply upstream patches #913569 and #915725.
+- Disable RPATH.
+- Don't ship the "handbook", it's just a template.
+- Other minor improvements here and there.
+
+* Sat Aug  2 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.2-0.fdr.3
+- Own dirs under %%{_datadir}/icons and %%{_docdir}/HTML (bug 21).
+- Don't tweak path to hddtemp.
+- Patch to fix hddtemp detection.
+- s/--enable-xinerama/--with-xinerama/
+- Borrow man page from Debian.
+
+* Sat May 31 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.2-0.fdr.2
+- Spec cleanups.
+
+* Fri Apr  4 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.2-0.fdr.1
+- Update to current Fedora guidelines.
+- Move desktop entry to %%{_datadir}/applications using desktop-file-install.
+
+* Sun Feb 23 2003 Warren Togami <warren@togami.com> - 0.7.2-1.fedora.2
+- BuildRequires libart_lgpl-devel needed for Red Hat 8.1
+
+* Sun Feb 23 2003 Ville Skyttä <ville.skytta at iki.fi> - 0.7.2-1.fedora.1
+- Update to 0.7.2.
+- Don't apply startup crash patch, but keep it around for now.
+
+* Sat Feb 15 2003 Ville Skyttä <ville.skytta at iki.fi> - 0.7-1.fedora.2
+- Include startup crash patch from upstream SRPM.
+
+* Sun Feb  9 2003 Ville Skyttä <ville.skytta at iki.fi> - 0.7-1.fedora.1
+- First Fedora release.
diff --git a/redhat/applications/kstreamripper/kstreamripper-3.5.13-missing_include_tqt.patch b/redhat/applications/kstreamripper/kstreamripper-3.5.13-missing_include_tqt.patch
new file mode 100644
index 000000000..5663b1a81
--- /dev/null
+++ b/redhat/applications/kstreamripper/kstreamripper-3.5.13-missing_include_tqt.patch
@@ -0,0 +1,10 @@
+--- kstreamripper/src/addnewstreamimpl.h.ORI	2011-11-02 20:40:17.450317896 +0100
++++ kstreamripper/src/addnewstreamimpl.h	2011-11-02 20:40:25.777317020 +0100
+@@ -22,6 +22,7 @@
+ #define ADDNEWSTREAMIMPL_H
+ 
+ #include "addnewstream.h"
++#include <tqt.h>
+ 
+ class AddNewStreamImpl : public AddNewStream
+ {
diff --git a/redhat/applications/kstreamripper/trinity-kstreamripper-3.5.13.spec b/redhat/applications/kstreamripper/trinity-kstreamripper-3.5.13.spec
new file mode 100644
index 000000000..94855fdcf
--- /dev/null
+++ b/redhat/applications/kstreamripper/trinity-kstreamripper-3.5.13.spec
@@ -0,0 +1,118 @@
+# Default version for this component
+%define kdecomp kstreamripper
+%define version 0.3.4
+%define release 1
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%define _variant .opt
+%define _docdir %{_prefix}/share/doc
+%endif
+
+# TDE 3.5.13 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}/kde
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/trinity
+
+
+Name:		trinity-%{kdecomp}
+Summary:	TDE frontend for streamripper
+
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+Prefix:    %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+
+Patch0:		kstreamripper-3.5.13-missing_include_tqt.patch
+
+BuildRequires: tqtinterface-devel
+BuildRequires: trinity-arts-devel
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: trinity-kdebase-devel
+BuildRequires: desktop-file-utils
+BuildRequires: scons
+
+
+%description
+KStreamRipper is a small frontend for the streamripper command
+line utility. Streamripper captures internet shoutcast radio streams
+on your harddisk and splits them up in mp3 files. KStreamRipper helps
+you with managing/ripping your preferred streams.
+
+
+%prep
+%setup -q -n applications/%{kdecomp}
+%patch0 -p1
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+export CXXFLAGS="-I%{_includedir}/tqt"
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+
+
+## File lists
+# HTML (1.0)
+HTML_DIR=$(kde-config --expandvars --install html)
+if [ -d %{buildroot}$HTML_DIR ]; then
+for lang_dir in %{buildroot}$HTML_DIR/* ; do
+  if [ -d $lang_dir ]; then
+    lang=$(basename $lang_dir)
+    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
+    # replace absolute symlinks with relative ones
+    pushd $lang_dir
+      for i in *; do
+        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
+      done
+    popd
+  fi
+done
+fi
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%files
+%defattr(-,root,root,-)
+%{_bindir}/kstreamripper
+%{_datadir}/applnk/Utilities/kstreamripper.desktop
+%{_datadir}/apps/kstreamripper/kstreamripperui.rc
+%{tde_docdir}/HTML/en/en/index.cache.bz2
+
+
+
+%Changelog
+* Wed Nov 02 2011 Francois Andriot <francois.andriot@free.fr> - 0.3.4-1
+- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
diff --git a/redhat/applications/yakuake/trinity-yakuake-3.5.13.spec b/redhat/applications/yakuake/trinity-yakuake-3.5.13.spec
new file mode 100644
index 000000000..7b49281db
--- /dev/null
+++ b/redhat/applications/yakuake/trinity-yakuake-3.5.13.spec
@@ -0,0 +1,108 @@
+# Default version for this component
+%define kdecomp yakuake
+%define version 2.8.1
+%define release 3
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%define _variant .opt
+%define _docdir %{_prefix}/share/doc
+%endif
+
+# TDE 3.5.12 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}/kde
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/trinity
+
+
+Name:		trinity-%{kdecomp}
+Summary:	Yakuake is a Quake-style terminal emulator based on KDE Konsole technology.
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+Prefix:    %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+
+BuildRequires: tqtinterface-devel
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: trinity-kdebase-devel
+BuildRequires: desktop-file-utils
+
+%description
+Yakuake is a Quake-style terminal emulator based on KDE Konsole technology.
+
+%prep
+%setup -q -n applications/%{kdecomp}
+
+# Ugly hack to modify TQT include directory inside autoconf files.
+# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
+sed -i admin/acinclude.m4.in \
+  -e "s,/usr/include/tqt,%{_includedir}/tqt,g"
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%configure \
+	--disable-rpath \
+    --with-extra-includes=%{_includedir}/tqt \
+    --enable-closure
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{_bindir}/*
+%{_datadir}/applications/*/*.desktop
+%{_datadir}/apps/*/
+%{_datadir}/icons/*/*/*/*
+%{_datadir}/locale/*/*/*.mo
+%{_datadir}/config.kcfg/*.kcfg
+
+%Changelog
+* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 2.8.1-3
+- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
+
+* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 2.8.1-2
+- Import to GIT
+
+* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 2.8.1-1
+- Correct macro to install under "/opt", if desired
+
+* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 2.8.1-0
+- Initial build for RHEL 6.0
+