RHEL/Fedora/MGA/MDV/Suse: update dependencies for TDE 3.5.13.1

18 files changed, 1748 insertions, 220 deletions

diff --git a/redhat/dependencies/arts/trinity-arts-3.5.13.1.spec b/redhat/dependencies/arts/trinity-arts-3.5.13.1.spec
new file mode 100755
index 000000000..29c0807a9
--- /dev/null
+++ b/redhat/dependencies/arts/trinity-arts-3.5.13.1.spec
@@ -0,0 +1,182 @@
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?tde_prefix}" != "/usr"
+%define _variant .opt
+%endif
+
+%define tde_bindir %{tde_prefix}/bin
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+
+%define tde_tdeincludedir %{tde_includedir}/tde
+
+%define _docdir %{tde_prefix}/share/doc
+
+Name:		trinity-arts
+Version:	3.5.13.1
+Release:	1%{?dist}%{?_variant}
+License:	GPL
+Summary:	aRts (analog realtime synthesizer) - the KDE sound system
+Group:		System Environment/Daemons 
+
+Vendor:		Trinity Project
+URL:		http://www.trinitydesktop.org/
+Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	arts-3.5.13.1.tar.gz
+
+BuildRequires:	trinity-tqtinterface-devel >= %{version}
+BuildRequires:	audiofile-devel
+BuildRequires:	alsa-lib-devel
+BuildRequires:	glib2-devel
+BuildRequires:	gsl-devel
+BuildRequires:	libvorbis-devel
+BuildRequires:	esound-devel
+
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}jack-devel
+BuildRequires:	%{_lib}ltdl-devel
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora}
+BuildRequires:	jack-audio-connection-kit-devel
+BuildRequires:	libtool-ltdl-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires:	libjack-devel
+BuildRequires:	libltdl-devel
+%endif
+
+# TDE 3.5.13 specific building variables
+BuildRequires: cmake >= 2.8
+
+Requires:		trinity-tqtinterface >= %{version}
+Requires:		audiofile
+
+%if "%{?tde_prefix}" == "/usr"
+Obsoletes:	arts
+%endif
+
+%description
+arts (analog real-time synthesizer) is the sound system of KDE 3.
+
+The principle of arts is to create/process sound using small modules which do
+certain tasks. These may be create a waveform (oscillators), play samples,
+filter data, add signals, perform effects like delay/flanger/chorus, or
+output the data to the soundcard.
+
+By connecting all those small modules together, you can perform complex
+tasks like simulating a mixer, generating an instrument or things like
+playing a wave file with some effects.
+
+%files
+%defattr(-,root,root,-)
+%doc COPYING.LIB
+%dir %{tde_libdir}/mcop
+%dir %{tde_libdir}/mcop/Arts
+%{tde_libdir}/mcop/Arts/*
+%{tde_libdir}/mcop/*.mcopclass
+%{tde_libdir}/mcop/*.mcoptype
+%{tde_libdir}/lib*.so.*
+%{tde_bindir}/artscat
+%{tde_bindir}/artsd
+%{tde_bindir}/artsdsp
+%{tde_bindir}/artsplay
+%{tde_bindir}/artsrec
+%{tde_bindir}/artsshell
+%{tde_bindir}/artswrapper
+# The '.la' files are runtime, not devel !
+%{tde_libdir}/lib*.la
+
+%post
+/sbin/ldconfig || :
+
+%postun
+/sbin/ldconfig || :
+
+##########
+
+%package devel
+Group:		Development/Libraries
+Summary:	%{name} - Development files
+Requires:	%{name} = %{version}-%{release}
+%if "%{?tde_prefix}" == "/usr"
+Obsoletes:	arts-devel
+%endif
+
+%description devel
+Development files for %{name}
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_bindir}/mcopidl
+# Arts includes are under 'tde' - this is on purpose !
+%{tde_tdeincludedir}/arts/
+# Artsc includes are not under 'tde'.
+%{tde_includedir}/artsc/
+%{tde_bindir}/artsc-config
+%{tde_libdir}/lib*.so
+%{tde_libdir}/pkgconfig/*.pc
+%{tde_libdir}/*.a
+
+%post devel
+/sbin/ldconfig || :
+
+%postun devel
+/sbin/ldconfig || :
+
+##########
+
+%if 0%{?suse_version}
+%debug_package
+%endif
+
+##########
+
+
+%prep
+%setup -q -n arts-3.5.13.1
+
+%build
+unset QTDIR || : ; . /etc/profile.d/qt3.sh
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
+%__mkdir_p build
+cd build
+%endif
+
+%cmake \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir}/arts \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DPKGCONFIG_INSTALL_DIR=%{tde_libdir}/pkgconfig \
+  -DWITH_ALSA=ON \
+  -DWITH_AUDIOFILE=ON \
+  -DWITH_VORBIS=ON \
+  -DWITH_MAD=OFF \
+  -DWITH_ESOUND=ON \
+%if 0%{?rhel} == 4
+  -DWITH_JACK=OFF \
+%else
+  -DWITH_JACK=ON \
+%endif
+  -DCMAKE_SKIP_RPATH="OFF" \
+  ..
+
+
+%__make %{?_smp_mflags}
+
+%install
+%__rm -rf %{?buildroot}
+%__make install -C build DESTDIR=%{?buildroot}
+
+%clean
+%__rm -rf %{?buildroot}
+
+
+%changelog
+* Tue Sep 11 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
+- Initial build for TDE 3.5.13.1
diff --git a/redhat/dependencies/arts/trinity-arts-3.5.13.spec b/redhat/dependencies/arts/trinity-arts-3.5.13.spec
index a4c3fd276..af9fef33a 100755
--- a/redhat/dependencies/arts/trinity-arts-3.5.13.spec
+++ b/redhat/dependencies/arts/trinity-arts-3.5.13.spec
@@ -33,9 +33,7 @@ Patch0:		arts-3.5.13-enable_oss.patch
 # TDE 3.5.13: Re-enable lost JACK support
 Patch1:		arts-3.5.13-enable_jack.patch
 
-Patch2:		arts-3.5.13-add_pulseaudio_support.patch
-
-BuildRequires:	tqtinterface-devel
+BuildRequires:	tqtinterface-devel >= %{version}
 BuildRequires:	audiofile-devel
 BuildRequires:	alsa-lib-devel
 BuildRequires:	glib2-devel
@@ -46,10 +44,15 @@ BuildRequires:	esound-devel
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	%{_lib}jack-devel
 BuildRequires:	%{_lib}ltdl-devel
-%else
+%endif
+%if 0%{?rhel} >= 5
 BuildRequires:	jack-audio-connection-kit-devel
 BuildRequires:	libtool-ltdl-devel
 %endif
+%if 0%{?suse_version}
+BuildRequires:	libjack-devel
+BuildRequires:	libltdl-devel
+%endif
 
 # TDE 3.5.13 specific building variables
 BuildRequires: cmake >= 2.8
@@ -73,29 +76,79 @@ By connecting all those small modules together, you can perform complex
 tasks like simulating a mixer, generating an instrument or things like
 playing a wave file with some effects.
 
+%files
+%defattr(-,root,root,-)
+%doc COPYING.LIB
+%dir %{tde_libdir}/mcop
+%dir %{tde_libdir}/mcop/Arts
+%{tde_libdir}/mcop/Arts/*
+%{tde_libdir}/mcop/*.mcopclass
+%{tde_libdir}/mcop/*.mcoptype
+%{tde_libdir}/lib*.so.*
+%{tde_bindir}/artscat
+%{tde_bindir}/artsd
+%{tde_bindir}/artsdsp
+%{tde_bindir}/artsplay
+%{tde_bindir}/artsrec
+%{tde_bindir}/artsshell
+%{tde_bindir}/artswrapper
+# The '.la' files are runtime, not devel !
+%{tde_libdir}/lib*.la
+
+%post
+/sbin/ldconfig || :
+
+%postun
+/sbin/ldconfig || :
+
+##########
 
 %package devel
 Group:		Development/Libraries
 Summary:	%{name} - Development files
 Requires:	%{name} = %{version}-%{release}
-%if "%{?_prefix}" == "/usr"
+%if "%{?tde_prefix}" == "/usr"
 Obsoletes:	arts-devel
 %endif
 
 %description devel
 Development files for %{name}
 
+%files devel
+%defattr(-,root,root,-)
+%{tde_bindir}/mcopidl
+%{tde_tdeincludedir}/arts/
+%{tde_includedir}/artsc/
+%{tde_bindir}/artsc-config
+%{tde_libdir}/lib*.so
+%{tde_libdir}/pkgconfig/*.pc
+%{tde_libdir}/*.a
+
+%post devel
+/sbin/ldconfig || :
+
+%postun devel
+/sbin/ldconfig || :
+
+##########
+
+%if 0%{?suse_version}
+%debug_package
+%endif
+
+##########
+
+
 %prep
 %setup -q -n dependencies/arts
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1 -b .pulse
 
 %build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
+unset QTDIR || : ; . /etc/profile.d/qt3.sh
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
 
-%if 0%{?rhel} || 0%{?fedora}
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
 %__mkdir_p build
 cd build
 %endif
@@ -103,7 +156,7 @@ cd build
 %cmake \
   -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
   -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir}/arts \
+  -DINCLUDE_INSTALL_DIR=%{tde_includedir}/arts \
   -DLIB_INSTALL_DIR=%{tde_libdir} \
   -DPKGCONFIG_INSTALL_DIR=%{tde_libdir}/pkgconfig \
   -DWITH_ALSA=ON \
@@ -111,7 +164,11 @@ cd build
   -DWITH_VORBIS=ON \
   -DWITH_MAD=OFF \
   -DWITH_ESOUND=ON \
+%if 0%{?rhel} == 4
+  -DWITH_JACK=OFF \
+%else
   -DWITH_JACK=ON \
+%endif
   -DCMAKE_SKIP_RPATH="OFF" \
   ..
 
@@ -125,48 +182,6 @@ cd build
 %clean
 %__rm -rf %{?buildroot}
 
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc COPYING.LIB
-%dir %{tde_libdir}/mcop
-%dir %{tde_libdir}/mcop/Arts
-%{tde_libdir}/mcop/Arts/*
-%{tde_libdir}/mcop/*.mcopclass
-%{tde_libdir}/mcop/*.mcoptype
-%{tde_libdir}/lib*.so.*
-%{tde_bindir}/artscat
-%{tde_bindir}/artsd
-%{tde_bindir}/artsdsp
-%{tde_bindir}/artsplay
-%{tde_bindir}/artsrec
-%{tde_bindir}/artsshell
-%{tde_bindir}/artswrapper
-# The '.la' files are runtime, not devel !
-%{tde_libdir}/lib*.la
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_bindir}/mcopidl
-%{tde_tdeincludedir}/arts/
-%{tde_includedir}/artsc/
-%{tde_bindir}/artsc-config
-%{tde_libdir}/lib*.so
-%{tde_libdir}/pkgconfig/*.pc
-%{tde_libdir}/*.a
-
 
 %changelog
 * Fri Dec 16 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.1.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.1.spec
new file mode 100644
index 000000000..84d2e7fb3
--- /dev/null
+++ b/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.1.spec
@@ -0,0 +1,156 @@
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?tde_prefix}" != "/usr"
+%define _variant .opt
+%endif
+
+# TDE 3.5.13 specific building variables
+%define tde_bindir %{tde_prefix}/bin
+%define tde_includedir %{tde_prefix}/include
+%define tde_datadir %{tde_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_libdir %{tde_prefix}/%{_lib}
+
+
+Name:		trinity-avahi-tqt
+Version:	3.5.13.1
+Release:	1%{?dist}%{?_variant}
+License:	GPL
+Summary:	Avahi TQT Interface
+Group:		System Environment/Libraries
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	avahi-tqt-3.5.13.1.tar.gz
+
+BuildRequires:	gcc-c++
+BuildRequires:	cmake >= 2.8
+BuildRequires:	qt3-devel
+BuildRequires:	tqtinterface-devel >= 3.5.13.1
+BuildRequires:	gettext-devel
+BuildRequires:	libtool
+%if 0%{?suse_version}
+BuildRequires:	dbus-1-devel
+%else
+BuildRequires:	dbus-devel
+%endif
+
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}avahi-client-devel
+# On Mageia 2, package is 'lib64expat1-devel', but on Mandriva, 'lib64expat-devel'
+BuildRequires:	%{_lib}expat%{?mgaversion:1}-devel
+Provides:		%{_lib}avahi-qt3
+%else
+BuildRequires:	avahi-devel
+%if 0%{?suse_version}
+BuildRequires:	libexpat-devel
+%else
+BuildRequires:	expat-devel
+%endif
+%endif
+
+Requires:		qt3
+Requires:		trinity-tqtinterface >= 3.5.13
+
+Obsoletes:		avahi-tqt < %{version}-%{release}
+Provides:		avahi-tqt = %{version}-%{release}
+
+
+%description
+Avahi TQT Interface
+
+
+%package devel
+Requires:	%{name}
+Summary:	%{name} - Development files
+Group:		Development/Libraries
+
+%if 0%{?mgaversion} || 0%{?mdkversion}
+Provides:		%{_lib}avahi-qt3-devel
+%endif
+
+Obsoletes:		avahi-tqt-devel < %{version}-%{release}
+Provides:		avahi-tqt-devel = %{version}-%{release}
+
+%description devel
+Development files for %{name}
+
+
+%if 0%{?suse_version}
+%debug_package
+%endif
+
+
+%prep
+%setup -q -n avahi-tqt-3.5.13.1
+
+# Ugly hack to modify TQT include directory inside autoconf files.
+# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
+%__sed -i "acinclude.m4" \
+  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g"
+
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "./ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "./ltmain.sh"
+
+# Removes stale libtool stuff
+%__rm -f common/libtool.m4 common/ltoptions.m4 common/lt~obsolete.m4 common/ltsugar.m4 common/ltversion.m4
+
+%build
+unset QTDIR || : ; . /etc/profile.d/qt3.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir} -I%{tde_includedir}/tqt"
+export CXXFLAGS="${CXXFLAGS} ${LDFLAGS}"
+
+./autogen.sh
+
+%configure \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --docdir=%{tde_docdir} \
+  --includedir=%{tde_includedir} \
+  --libdir=%{tde_libdir} \
+  --enable-compat-libdns_sd \
+  --with-systemdsystemunitdir=/lib/systemd/system  \
+  MOC_QT3=%{tde_bindir}/moc-tqt
+
+%__make %{?_smp_mflags}
+
+%install
+%__rm -rf %{?buildroot}
+%__make install DESTDIR=%{?buildroot}
+
+# Removes '.a' file
+%__rm -f %{?buildroot}%{tde_libdir}/libavahi-tqt.a
+
+%clean
+%__rm -rf %{?buildroot}
+
+%post
+/sbin/ldconfig || :
+
+%postun
+/sbin/ldconfig || :
+
+%post devel
+/sbin/ldconfig || :
+
+%postun devel
+/sbin/ldconfig || :
+
+%files
+%{tde_libdir}/libavahi-tqt.so.1
+%{tde_libdir}/libavahi-tqt.so.1.0.0
+
+%files devel
+%{tde_includedir}/avahi-tqt/
+%{tde_libdir}/libavahi-tqt.so
+%{tde_libdir}/libavahi-tqt.la
+%{tde_libdir}/pkgconfig/avahi-tqt.pc
+
+%changelog
+* Tue Sep 11 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
+- Initial build for TDE 3.5.13.1
diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.spec
index a79c06e55..18e0f0401 100644
--- a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.spec
+++ b/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.spec
@@ -8,11 +8,10 @@
 %define tde_includedir %{tde_prefix}/include
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
-%define tde_tdedocdir %{tde_docdir}/kde
 %define tde_libdir %{tde_prefix}/%{_lib}
 
 
-Name:		avahi-tqt
+Name:		trinity-avahi-tqt
 Version:	3.5.13
 Release:	1%{?dist}%{?_variant}
 License:	GPL
@@ -26,14 +25,18 @@ URL:		http://www.trinitydesktop.org/
 Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:	%{name}-%{version}.tar.gz
+Source0:	avahi-tqt-3.5.13.tar.gz
 
 BuildRequires:	gcc-c++
 BuildRequires:	cmake >= 2.8
-BuildRequires:	qt3-devel >= 3.3.8.d
+BuildRequires:	qt3-devel
 BuildRequires:	tqtinterface-devel >= 3.5.13
 BuildRequires:	gettext-devel
+%if 0%{?suse_version}
+BuildRequires:	dbus-1-devel
+%else
 BuildRequires:	dbus-devel
+%endif
 
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	%{_lib}avahi-client-devel
@@ -42,13 +45,18 @@ BuildRequires:	%{_lib}expat%{?mgaversion:1}-devel
 Provides:		%{_lib}avahi-qt3
 %else
 BuildRequires:	avahi-devel
+%if 0%{?suse_version}
+BuildRequires:	libexpat-devel
+%else
 BuildRequires:	expat-devel
 %endif
+%endif
 
-Requires:		qt3 >= 3.3.8.d
+Requires:		qt3
 Requires:		tqtinterface >= 3.5.13
 
-Provides:		avahi-qt3
+Obsoletes:		avahi-tqt < %{version}-%{release}
+Provides:		avahi-tqt = %{version}-%{release}
 
 %description
 Avahi TQT Interface
@@ -63,18 +71,25 @@ Group:		Development/Libraries
 Provides:		%{_lib}avahi-qt3-devel
 %endif
 
+Obsoletes:		avahi-tqt-devel < %{version}-%{release}
+Provides:		avahi-tqt-devel = %{version}-%{release}
+
 %description devel
 Development files for %{name}
 
 
+%if 0%{?suse_version}
+%debug_package
+%endif
+
+
 %prep
-%setup -q -n dependencies/%{name}
+%setup -q -n dependencies/avahi-tqt
 
 # Ugly hack to modify TQT include directory inside autoconf files.
 # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
 %__sed -i "acinclude.m4" \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
+  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g"
 
 %__cp -f "/usr/share/libtool/config/ltmain.sh" "./ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "./ltmain.sh"
 
@@ -82,7 +97,7 @@ Development files for %{name}
 %__rm -f common/libtool.m4 common/ltoptions.m4 common/lt~obsolete.m4 common/ltsugar.m4 common/ltversion.m4
 
 %build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
+unset QTDIR || : ; . /etc/profile.d/qt?.sh
 export PATH="%{tde_bindir}:${PATH}"
 export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir} -I%{tde_includedir}/tqt"
 export CXXFLAGS="${CXXFLAGS} ${LDFLAGS}"
@@ -125,13 +140,14 @@ export CXXFLAGS="${CXXFLAGS} ${LDFLAGS}"
 /sbin/ldconfig || :
 
 %files
-%{tde_libdir}/*.so.*
+%{tde_libdir}/libavahi-tqt.so.1
+%{tde_libdir}/libavahi-tqt.so.1.0.0
 
 %files devel
-%{tde_includedir}/%{name}
-%{tde_libdir}/*.so
-%{tde_libdir}/*.la
-%{tde_libdir}/pkgconfig/*.pc
+%{tde_includedir}/avahi-tqt/
+%{tde_libdir}/libavahi-tqt.so
+%{tde_libdir}/libavahi-tqt.la
+%{tde_libdir}/pkgconfig/avahi-tqt.pc
 
 %changelog
 * Mon Jul 30 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.1.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.1.spec
new file mode 100644
index 000000000..cfeb49b55
--- /dev/null
+++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.1.spec
@@ -0,0 +1,115 @@
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?tde_prefix}" != "/usr"
+%define _variant .opt
+%endif
+
+%define tde_bindir %{tde_prefix}/bin
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+
+Name:		trinity-dbus-1-tqt
+Version:	3.5.13.1
+Release:	1%{?dist}%{?_variant}
+License:	GPL
+Summary:	Dbus TQT Interface
+Group:		System Environment/Libraries
+
+Obsoletes:		dbus-1-tqt < %{version}-%{release}
+Provides:		dbus-1-tqt = %{version}-%{release}
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	dbus-1-tqt-3.5.13.1.tar.gz
+
+BuildRequires:	gcc-c++
+%if 0%{?suse_version}
+BuildRequires:	dbus-1-devel
+%else
+BuildRequires:	dbus-devel
+%endif
+BuildRequires:	trinity-tqtinterface-devel >= %{version}
+
+# TDE 3.5.13 specific building variables
+BuildRequires:	cmake >= 2.8
+BuildRequires:	qt3-devel
+Requires:		qt3
+
+
+%description
+Dbus TQT Interface
+
+
+%package devel
+Requires:	%{name}
+Summary:	%{name} - Development files
+Group:		Development/Libraries
+
+Obsoletes:		dbus-1-tqt-devel < %{version}-%{release}
+Provides:		dbus-1-tqt-devel = %{version}-%{release}
+
+%description devel
+Development files for %{name}
+
+%if 0%{?suse_version}
+%debug_package
+%endif
+
+
+%prep
+%setup -q -n dbus-1-tqt-3.5.13.1
+
+%build
+unset QTDIR || : ; . /etc/profile.d/qt?.sh
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
+%__mkdir_p build
+cd build
+%endif
+
+%cmake \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DINCLUDE_INSTALL_DIR=%{tde_includedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  ..
+
+%__make %{?_smp_mflags}
+
+
+%install
+%__rm -rf %{?buildroot}
+%__make install DESTDIR=%{?buildroot} -C build
+
+%clean
+%__rm -rf %{?buildroot}
+
+%post
+/sbin/ldconfig || :
+
+%postun
+/sbin/ldconfig || :
+
+%post devel
+/sbin/ldconfig || :
+
+%postun devel
+/sbin/ldconfig || :
+
+%files
+%{tde_bindir}/dbusxml2qt3
+%{tde_libdir}/libdbus-1-tqt.so.0
+%{tde_libdir}/libdbus-1-tqt.so.0.0.0
+
+%files devel
+%{tde_includedir}/*.h
+%{tde_libdir}/libdbus-1-tqt.so
+%{tde_libdir}/libdbus-1-tqt.la
+%{tde_libdir}/pkgconfig/*.pc
+
+%changelog
+* Tue Sep 11 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
+- Initial build for TDE 3.5.13.1
diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec
index 3e1bd40fb..5e3e98d18 100644
--- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec
+++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec
@@ -7,29 +7,36 @@
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
 
-Name:		dbus-1-tqt
+Name:		trinity-dbus-1-tqt
 Version:	3.5.13
 Release:	1%{?dist}%{?_variant}
 License:	GPL
 Summary:	Dbus TQT Interface
 Group:		System Environment/Libraries
 
+Obsoletes:		dbus-1-tqt < %{version}-%{release}
+Provides:		dbus-1-tqt = %{version}-%{release}
+
 Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 
 Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:	%{name}-%{version}.tar.gz
+Source0:	dbus-1-tqt-3.5.13.tar.gz
 
 BuildRequires:	gcc-c++
+%if 0%{?suse_version}
+BuildRequires:	dbus-1-devel
+%else
 BuildRequires:	dbus-devel
+%endif
 BuildRequires:	tqtinterface-devel >= 3.5.13
 
 # TDE 3.5.13 specific building variables
 BuildRequires:	cmake >= 2.8
-BuildRequires:	qt3-devel >= 3.3.8.d
-Requires:		qt3 >= 3.3.8.d
+BuildRequires:	qt3-devel
+Requires:		qt3
 
 
 %description
@@ -41,18 +48,25 @@ Requires:	%{name}
 Summary:	%{name} - Development files
 Group:		Development/Libraries
 
+Obsoletes:		dbus-1-tqt-devel < %{version}-%{release}
+Provides:		dbus-1-tqt-devel = %{version}-%{release}
+
 %description devel
 Development files for %{name}
 
+%if 0%{?suse_version}
+%debug_package
+%endif
+
 
 %prep
-%setup -q -n dependencies/%{name}
+%setup -q -n dependencies/dbus-1-tqt
 
 %build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
+unset QTDIR || : ; . /etc/profile.d/qt?.sh
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
 
-%if 0%{?rhel} || 0%{?fedora}
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
 %__mkdir_p build
 cd build
 %endif
@@ -87,12 +101,13 @@ cd build
 
 %files
 %{tde_bindir}/dbusxml2qt3
-%{tde_libdir}/*.so.*
+%{tde_libdir}/libdbus-1-tqt.so.0
+%{tde_libdir}/libdbus-1-tqt.so.0.0.0
 
 %files devel
 %{tde_includedir}/*.h
-%{tde_libdir}/*.so
-%{tde_libdir}/*.la
+%{tde_libdir}/libdbus-1-tqt.so
+%{tde_libdir}/libdbus-1-tqt.la
 %{tde_libdir}/pkgconfig/*.pc
 
 %changelog
diff --git a/redhat/dependencies/dbus-1-tqt/dbus1tqt-3.5.13-memory_leak.patch b/redhat/dependencies/dbus-1-tqt/dbus1tqt-3.5.13-memory_leak.patch
deleted file mode 100644
index cae8fea03..000000000
--- a/redhat/dependencies/dbus-1-tqt/dbus1tqt-3.5.13-memory_leak.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- dbus-1-tqt/tqdbusconnection.cpp.ORI	2011-11-11 20:37:57.684881138 +0100
-+++ dbus-1-tqt/tqdbusconnection.cpp	2011-11-11 20:40:33.910795465 +0100
-@@ -285,7 +285,12 @@
- 
-     dbus_message_unref(msg);
- 
--    return TQT_DBusMessage::fromDBusMessage(reply);
-+    TQT_DBusMessage mess = TQT_DBusMessage::fromDBusMessage(reply);
-+
-+    /* XXX fromDbusMessage do a ref(), avoid leaking */
-+    dbus_message_unref(reply);
-+
-+    return mess;
- }
- 
- void TQT_DBusConnection::flush() const
diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13-fix_old_dbus_types.patch b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13-fix_old_dbus_types.patch
new file mode 100644
index 000000000..e9e873d63
--- /dev/null
+++ b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13-fix_old_dbus_types.patch
@@ -0,0 +1,44 @@
+--- dbus-tqt/message.cpp.dbustypes	2011-08-24 20:23:14.000000000 +0200
++++ dbus-tqt/message.cpp	2012-09-06 19:54:47.037175413 +0200
+@@ -187,28 +210,28 @@
+   case DBUS_TYPE_INT32:
+     {
+       dbus_int32_t v;
+-      dbus_message_iter_get_basic (i, &v);
++      dbus_message_iter_get_int32 (i);
+       ret = TQVariant( v );
+     }
+     break;
+   case DBUS_TYPE_UINT32:
+     {
+       dbus_uint32_t v;
+-      dbus_message_iter_get_basic (i, &v);
++      dbus_message_iter_get_uint32 (i);
+       ret = TQVariant( v );
+     }
+     break;
+   case DBUS_TYPE_DOUBLE:
+     {
+       double v;
+-      dbus_message_iter_get_basic (i, &v);
++      dbus_message_iter_get_double (i);
+       ret = TQVariant( v );
+     }
+     break;
+   case DBUS_TYPE_STRING:
+     {
+       const char *v;
+-      dbus_message_iter_get_basic (i, &v);
++      dbus_message_iter_get_string (i);
+       ret = TQVariant( v );
+     }
+     break;
+@@ -241,7 +264,7 @@
+       while (dbus_message_iter_get_arg_type (&sub) != DBUS_TYPE_INVALID)
+         {
+           const char *v;
+-          dbus_message_iter_get_basic (&sub, &v);
++          dbus_message_iter_get_string (&sub);
+           tempList.append( TQString( v ) );
+           dbus_message_iter_next (&sub);
+         }
diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.1.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.1.spec
new file mode 100644
index 000000000..0fd6323fc
--- /dev/null
+++ b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.1.spec
@@ -0,0 +1,125 @@
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?tde_prefix}" != "/usr"
+%define _variant .opt
+%endif
+
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+
+Name:		trinity-dbus-tqt
+Version:	3.5.13.1
+Release:	1%{?dist}%{?_variant}
+License:	GPL
+Summary:	Dbus TQT Interface
+Group:		System Environment/Libraries
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	dbus-tqt-3.5.13.1.tar.gz
+
+# [dbus-tqt] Fix build on RHEL 4
+Patch1:		dbus-tqt-3.5.13-fix_old_dbus_types.patch
+
+BuildRequires:	gcc-c++
+%if 0%{?suse_version}
+BuildRequires:	dbus-1-devel
+%else
+BuildRequires:	dbus-devel
+%endif
+BuildRequires:	trinity-tqtinterface-devel >= %{version}
+
+# TDE 3.5.13 specific building variables
+BuildRequires:	cmake >= 2.8
+BuildRequires:	qt3-devel
+
+Requires:		qt3
+
+Obsoletes:		dbus-tqt < %{version}-%{release}
+Provides:		dbus-tqt = %{version}-%{release}
+
+
+%description
+Dbus TQT Interface
+
+
+%package devel
+Requires:		%{name}
+Summary:		%{name} - Development files
+Group:			Development/Libraries
+
+Obsoletes:		dbus-tqt-devel < %{version}-%{release}
+Provides:		dbus-tqt-devel = %{version}-%{release}
+
+%description devel
+Development files for %{name}
+
+
+%if 0%{?suse_version}
+%debug_package
+%endif
+
+
+%prep
+%setup -q -n dbus-tqt-3.5.13.1
+
+%if 0%{?rhel} == 4
+%patch1 -p1 -b .dbustypes
+%endif
+
+%build
+unset QTDIR || : ; . /etc/profile.d/qt?.sh
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+%if 0%{?rhel} == 4
+export CXXFLAGS="-DDBUS_API_SUBJECT_TO_CHANGE ${CXXFLAGS}"
+%endif
+
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
+%__mkdir_p build
+cd build
+%endif
+
+%cmake \
+  -DINCLUDE_INSTALL_DIR=%{tde_includedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  ..
+
+%__make %{?_smp_mflags}
+
+
+%install
+%__rm -rf %{?buildroot}
+%__make install DESTDIR=%{?buildroot} -C build
+
+%clean
+%__rm -rf %{?buildroot}
+
+%post
+/sbin/ldconfig || :
+
+%postun
+/sbin/ldconfig || :
+
+%post devel
+/sbin/ldconfig || :
+
+%postun devel
+/sbin/ldconfig || :
+
+%files
+%{tde_libdir}/libdbus-tqt-1.so.0
+%{tde_libdir}/libdbus-tqt-1.so.0.0.0
+
+%files devel
+%{tde_includedir}/dbus-1.0/*
+%{tde_libdir}/libdbus-tqt-1.so
+%{tde_libdir}/libdbus-tqt-1.la
+%{tde_libdir}/pkgconfig/dbus-tqt.pc
+
+%changelog
+* Tue Sep 11 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
+- Initial build for TDE 3.5.13.1
diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec
index fbeb990ed..2ee2c1a8a 100644
--- a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec
+++ b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec
@@ -6,7 +6,7 @@
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
 
-Name:		dbus-tqt
+Name:		trinity-dbus-tqt
 Version:	3.5.13
 Release:	3%{?dist}%{?_variant}
 License:	GPL
@@ -19,17 +19,27 @@ Packager:	Francois Andriot <francois.andriot@free.fr>
 Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:	%{name}-%{version}.tar.gz
+Source0:	dbus-tqt-3.5.13.tar.gz
+
+# [dbus-tqt] Fix build on RHEL 4
+Patch1:		dbus-tqt-3.5.13-fix_old_dbus_types.patch
 
 BuildRequires:	gcc-c++
+%if 0%{?suse_version}
+BuildRequires:	dbus-1-devel
+%else
 BuildRequires:	dbus-devel
+%endif
 BuildRequires:	tqtinterface-devel >= 3.5.13
 
 # TDE 3.5.13 specific building variables
 BuildRequires:	cmake >= 2.8
-BuildRequires:	qt3-devel >= 3.3.8.d
+BuildRequires:	qt3-devel
+
+Requires:		qt3
 
-Requires:		qt3 >= 3.3.8.d
+Obsoletes:		dbus-tqt < %{version}-%{release}
+Provides:		dbus-tqt = %{version}-%{release}
 
 
 %description
@@ -40,20 +50,35 @@ Dbus TQT Interface
 Requires:		%{name}
 Summary:		%{name} - Development files
 Group:			Development/Libraries
-#Provides:		dbus-qt-devel
+
+Obsoletes:		dbus-tqt-devel < %{version}-%{release}
+Provides:		dbus-tqt-devel = %{version}-%{release}
 
 %description devel
 Development files for %{name}
 
 
+%if 0%{?suse_version}
+%debug_package
+%endif
+
+
 %prep
-%setup -q -n dependencies/%{name}
+%setup -q -n dependencies/dbus-tqt
+
+%if 0%{?rhel} == 4
+%patch1 -p1 -b .dbustypes
+%endif
 
 %build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
+unset QTDIR || : ; . /etc/profile.d/qt?.sh
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
 
-%if 0%{?rhel} || 0%{?fedora}
+%if 0%{?rhel} == 4
+export CXXFLAGS="-DDBUS_API_SUBJECT_TO_CHANGE ${CXXFLAGS}"
+%endif
+
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
 %__mkdir_p build
 cd build
 %endif
@@ -86,13 +111,14 @@ cd build
 /sbin/ldconfig || :
 
 %files
-%{tde_libdir}/*.so.*
+%{tde_libdir}/libdbus-tqt-1.so.0
+%{tde_libdir}/libdbus-tqt-1.so.0.0.0
 
 %files devel
 %{tde_includedir}/dbus-1.0/*
-%{tde_libdir}/*.so
-%{tde_libdir}/*.la
-%{tde_libdir}/pkgconfig/*.pc
+%{tde_libdir}/libdbus-tqt-1.so
+%{tde_libdir}/libdbus-tqt-1.la
+%{tde_libdir}/pkgconfig/dbus-tqt.pc
 
 %changelog
 * Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
diff --git a/redhat/dependencies/libcaldav/libcaldav.spec b/redhat/dependencies/libcaldav/libcaldav.spec
index 9374a2fe6..7ad978c08 100644
--- a/redhat/dependencies/libcaldav/libcaldav.spec
+++ b/redhat/dependencies/libcaldav/libcaldav.spec
@@ -29,14 +29,18 @@ Source0:	libcaldav_0.6.5-2debian2.tar.gz
 Patch1:		libcaldav-0.6.2-fix_installation.patch
 
 BuildRequires:	libtool
+%if 0%{?rhel} == 4
+BuildRequires:	evolution28-gtk2-devel
+%else
 BuildRequires:	glib2-devel
 BuildRequires:	gtk2-devel
+%endif
 BuildRequires:	make
 
 Obsoletes:	libcaldav < %{version}-%{release}
 Provides:	libcaldav = %{version}-%{release}
 
-%if 0%{?fedora} || 0%{?rhel} >= 6
+%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version}
 BuildRequires:	libcurl-devel
 %else
 %if 0%{?mgaversion} || 0%{?mdkversion}
@@ -62,6 +66,10 @@ Provides:	libcaldav-devel = %{version}-%{release}
 %description devel
 %{summary}
 
+%if 0%{?suse_version}
+%debug_package
+%endif
+
 
 %prep
 %setup -q -n libcaldav-%{version}
@@ -70,6 +78,11 @@ Provides:	libcaldav-devel = %{version}-%{release}
 %build
 # CFLAGS required if CURL is installed on /opt/trinity, e.g. RHEL 5
 export CFLAGS="-I%{tde_includedir} -L%{tde_libdir} ${CFLAGS}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if [ -d /usr/evolution28 ]; then
+  export PKG_CONFIG_PATH="/usr/evolution28/%{_lib}/pkgconfig:${PKG_CONFIG_PATH}"
+fi
 
 autoreconf --force --install --symlink
 %configure \
diff --git a/redhat/dependencies/libcarddav/libcarddav.spec b/redhat/dependencies/libcarddav/libcarddav.spec
index 2c396ede1..68fdfcc8f 100644
--- a/redhat/dependencies/libcarddav/libcarddav.spec
+++ b/redhat/dependencies/libcarddav/libcarddav.spec
@@ -26,7 +26,7 @@ Source0:	libcarddav_0.6.2-2debian2.tar.gz
 # [libcarddav] Fix messy installation directories
 Patch1:		libcarddav-0.6.5-fix_installation.patch
 
-%if 0%{?fedora} || 0%{?rhel} >= 6
+%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version}
 BuildRequires:	libcurl-devel
 %else
 %if 0%{?mgaversion} || 0%{?mdkversion}
@@ -37,6 +37,14 @@ BuildRequires:	trinity-libcurl-devel
 %endif
 %endif
 
+%if 0%{?rhel} == 4
+BuildRequires:	evolution28-gtk2-devel
+%else
+BuildRequires:	glib2-devel
+BuildRequires:	gtk2-devel
+%endif
+BuildRequires:	make
+
 Obsoletes:	libcarddav < %{version}-%{release}
 Provides:	libcarddav = %{version}-%{release}
 
@@ -56,6 +64,10 @@ Provides:	libcarddav-devel = %{version}-%{release}
 %description devel
 %{summary}
 
+%if 0%{?suse_version}
+%debug_package
+%endif
+
 
 %prep
 %setup -q -n libcarddav-%{version}
@@ -64,6 +76,11 @@ Provides:	libcarddav-devel = %{version}-%{release}
 %build
 # CFLAGS required if CURL is installed on /opt/trinity, e.g. RHEL 5
 export CFLAGS="-I%{tde_includedir} -L%{tde_libdir} ${CFLAGS}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if [ -d /usr/evolution28 ]; then
+  export PKG_CONFIG_PATH="/usr/evolution28/%{_lib}/pkgconfig:${PKG_CONFIG_PATH}"
+fi
 
 autoreconf --force --install --symlink
 %configure \
@@ -76,7 +93,7 @@ autoreconf --force --install --symlink
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot} LIBTOOL=$(which libtool)
 
-%__rm -f %{buidroot}%{tde_libdir}/*.a
+%__rm -f %{buildroot}%{tde_libdir}/libcarddav.a
 
 %clean
 %__rm -rf %{buildroot}
diff --git a/redhat/dependencies/qt3/qt-3.3.6-fontrendering-gu-228452.patch b/redhat/dependencies/qt3/qt-3.3.6-fontrendering-gu-228452.patch
index 21081d1a6..84b885b8b 100644
--- a/redhat/dependencies/qt3/qt-3.3.6-fontrendering-gu-228452.patch
+++ b/redhat/dependencies/qt3/qt-3.3.6-fontrendering-gu-228452.patch
@@ -1,9 +1,8 @@
-diff -pruN qt-x11-free-3.3.6.org/src/kernel/qscriptengine_x11.cpp qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp
---- qt-x11-free-3.3.6.org/src/kernel/qscriptengine_x11.cpp	2007-02-13 14:41:25.000000000 +0530
-+++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp	2007-02-13 14:40:02.000000000 +0530
-@@ -253,7 +253,7 @@ static const unsigned char indicForms[0x
-     Unknown, Unknown, Unknown, Unknown,
-     Unknown, Unknown, Unknown, Unknown,
+--- qt3/src/kernel/qscriptengine_x11.cpp.fontrendering-gu-228452	2012-09-29 11:30:23.821539127 +0200
++++ qt3/src/kernel/qscriptengine_x11.cpp	2012-09-29 11:31:59.679413873 +0200
+@@ -261,7 +261,7 @@
+     Other, Other, Other, Other,
+     Other, Other, Other, Other,
  
 -    Other, Other, Other, Other,
 +    Other, Other, VowelMark, VowelMark,
diff --git a/redhat/dependencies/qt3/qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch b/redhat/dependencies/qt3/qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch
index 24982206d..ee960442e 100644
--- a/redhat/dependencies/qt3/qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch
+++ b/redhat/dependencies/qt3/qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch
@@ -1,6 +1,6 @@
---- qt-x11-free-3.3.6/src/widgets/qtextedit.cpp.preedit	2006-06-28 17:18:08.000000000 +0200
-+++ qt-x11-free-3.3.6/src/widgets/qtextedit.cpp	2006-06-28 17:20:09.000000000 +0200
-@@ -1906,9 +1906,6 @@
+--- ./src/widgets/qtextedit.cpp.resetinputcontext	2012-08-04 14:53:34.000000000 +0200
++++ ./src/widgets/qtextedit.cpp	2012-09-29 11:36:19.410163805 +0200
+@@ -1904,9 +1904,6 @@
  
  void QTextEdit::removeSelectedText( int selNum )
  {
@@ -10,7 +10,7 @@
      QTextCursor c1 = doc->selectionStartCursor( selNum );
      c1.restoreState();
      QTextCursor c2 = doc->selectionEndCursor( selNum );
-@@ -3171,7 +3168,6 @@
+@@ -3169,7 +3166,6 @@
  	return;
      }
  #endif
@@ -18,7 +18,7 @@
      QTextParagraph *p = doc->paragAt( para );
      if ( !p )
  	return;
-@@ -3198,7 +3194,6 @@
+@@ -3196,7 +3192,6 @@
  	return;
      }
  #endif
@@ -26,7 +26,7 @@
      for ( int i = 0; i < (int)doc->numSelections(); ++i )
  	doc->removeSelection( i );
  
-@@ -3240,7 +3235,6 @@
+@@ -3238,7 +3233,6 @@
      if ( d->optimMode )
  	return;
  #endif
@@ -34,7 +34,7 @@
      QTextParagraph *p = doc->paragAt( para );
      if ( !p )
  	return;
-@@ -3285,7 +3279,6 @@
+@@ -3283,7 +3277,6 @@
      if ( isReadOnly() || !doc->commands()->isUndoAvailable() || !undoEnabled )
  	return;
  
@@ -42,7 +42,7 @@
      for ( int i = 0; i < (int)doc->numSelections(); ++i )
  	doc->removeSelection( i );
  
-@@ -3336,7 +3329,6 @@
+@@ -3334,7 +3327,6 @@
      if ( isReadOnly() || !doc->commands()->isRedoAvailable() || !undoEnabled )
  	return;
  
@@ -50,7 +50,7 @@
      for ( int i = 0; i < (int)doc->numSelections(); ++i )
  	doc->removeSelection( i );
  
-@@ -3450,7 +3442,6 @@
+@@ -3448,7 +3440,6 @@
  {
      if ( isReadOnly() )
  	return;
@@ -58,7 +58,7 @@
      normalCopy();
      removeSelectedText();
      updateMicroFocusHint();
-@@ -3938,7 +3929,6 @@
+@@ -3936,7 +3927,6 @@
  	return;
      }
  #endif
@@ -66,7 +66,7 @@
      if ( !isModified() && isReadOnly() &&
  	 this->context() == context && this->text() == text )
  	return;
-@@ -4112,7 +4102,6 @@
+@@ -4110,7 +4100,6 @@
      if ( !p )
  	return;
  
@@ -74,7 +74,7 @@
      if ( index > p->length() - 1 )
  	index = p->length() - 1;
  
-@@ -4169,7 +4158,6 @@
+@@ -4167,7 +4156,6 @@
  	return;
      }
  #endif
@@ -82,8 +82,8 @@
      if ( doc->hasSelection( selNum ) ) {
  	doc->removeSelection( selNum );
  	repaintChanged();
-@@ -5072,7 +5060,6 @@
- {
+@@ -5074,7 +5062,6 @@
+     }
      if ( dc == doc )
  	return;
 -    resetInputContext();
diff --git a/redhat/dependencies/qt3/qt3-3.3.8.d.spec b/redhat/dependencies/qt3/qt3-3.3.8.d.spec
index 4c39df0cc..fb3f71ace 100644
--- a/redhat/dependencies/qt3/qt3-3.3.8.d.spec
+++ b/redhat/dependencies/qt3/qt3-3.3.8.d.spec
@@ -44,13 +44,8 @@ Patch3: qt-3.1.0-makefile.patch
 Patch4: qt-x11-free-3.3.7-umask.patch
 Patch5: qt-x11-free-3.3.6-strip.patch
 Patch7: qt-x11-free-3.3.2-quiet.patch
-#Patch8: qt-x11-free-3.3.3-qembed.patch
 Patch12: qt-uic-nostdlib.patch
 Patch13: qt-x11-free-3.3.6-qfontdatabase_x11.patch
-#Patch14: qt-x11-free-3.3.3-gl.patch
-#Patch19: qt-3.3.3-gtkstyle.patch 
-#Patch20: qt-x11-free-3.3.8b-gcc4-buildkey.patch
-#Patch24: qt-x11-free-3.3.5-uic.patch
 Patch25: qt-x11-free-3.3.8b-uic-multilib.patch
 Patch27: qt-3.3.6-fontrendering-ml_IN-209097.patch
 Patch29: qt-3.3.8-fontrendering-as_IN-209972.patch
@@ -65,24 +60,13 @@ Patch39: qt-x11-free-3.3.7-arm.patch
 Patch40: qt-x11-free-3.3.8b-typo.patch
 
 # immodule patches
-#Patch50: qt-x11-immodule-unified-qt3.3.8-20071116.diff.bz2
-#Patch51: qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch
-#Patch52: qt-x11-free-3.3.8b-fix-key-release-event-with-imm.diff
 Patch53: qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch
 
 # qt-copy patches
-#Patch100: 0038-dragobject-dont-prefer-unknown.patch
-#Patch101: 0047-fix-kmenu-width.diff
-#Patch102: 0048-qclipboard_hack_80072.patch
-#Patch103: 0056-khotkeys_input_84434.patch
-#patch105: 0073-xinerama-aware-qpopup.patch
-#Patch107: 0079-compositing-types.patch
-#Patch108: 0080-net-wm-sync-request-2.patch
 Patch110: 0084-compositing-properties.patch
 
 # upstream patches
 Patch200: qt-x11-free-3.3.4-fullscreen.patch
-#Patch201: qt-x11-free-3.3.8b-gcc43.patch
 
 # TDE 3.5.13 patches
 Patch300: qt3-3.3.8.d-updates_zh-tw_translations.patch
@@ -127,7 +111,6 @@ BuildRequires: glibc-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: zlib-devel
-BuildRequires: giflib-devel
 BuildRequires: perl
 BuildRequires: sed
 BuildRequires: findutils
@@ -135,6 +118,19 @@ BuildRequires: cups-devel
 BuildRequires: tar
 BuildRequires: freetype-devel
 BuildRequires: fontconfig-devel
+BuildRequires: desktop-file-utils
+BuildRequires: mysql-devel
+BuildRequires: postgresql-devel
+BuildRequires: unixODBC-devel
+BuildRequires: sqlite-devel
+BuildRequires: gcc-c++
+BuildRequires: make
+
+%if 0%{?rhel} == 4
+BuildRequires: libungif-devel
+BuildRequires: xorg-x11-devel
+%else
+BuildRequires: giflib-devel
 BuildRequires: libXrender-devel
 BuildRequires: libXrandr-devel
 BuildRequires: libXcursor-devel
@@ -150,13 +146,7 @@ BuildRequires: libXi-devel
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: mesa-libGL-devel
 BuildRequires: mesa-libGLU-devel
-BuildRequires: desktop-file-utils
-BuildRequires: mysql-devel
-BuildRequires: postgresql-devel
-BuildRequires: unixODBC-devel
-BuildRequires: sqlite-devel
-BuildRequires: gcc-c++
-BuildRequires: make
+%endif
 
 
 %package config
@@ -175,6 +165,12 @@ Group: Development/Libraries
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: freetype-devel
 Requires: fontconfig-devel
+Requires: libpng-devel
+Requires: libjpeg-devel
+Requires: libmng-devel
+%if 0%{?rhel} == 4
+BuildRequires: xorg-x11-devel
+%else
 Requires: libXrender-devel
 Requires: libXrandr-devel
 Requires: libXcursor-devel
@@ -186,11 +182,9 @@ Requires: libSM-devel
 Requires: libICE-devel
 Requires: libXt-devel
 Requires: xorg-x11-proto-devel
-Requires: libpng-devel
-Requires: libjpeg-devel
-Requires: libmng-devel
 Requires: mesa-libGL-devel
 Requires: mesa-libGLU-devel
+%endif
 %if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
 Obsoletes: qt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:  qt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -316,13 +310,8 @@ for the Qt 3 toolkit.
 %patch4 -p1 -b .umask
 %patch5 -p1
 %patch7 -p1 -b .quiet
-#patch8 -p1 -b .qembed
 %patch12 -p1 -b .nostdlib
 %patch13 -p1 -b .fonts
-#patch14 -p1 -b .gl
-#patch19 -p1 -b .gtk
-#patch20 -p1 -b .gcc4-buildkey
-#patch24 -p1 -b .uic
 %patch25 -p1 -b .uic-multilib
 %patch27 -p1 -b .fontrendering-ml_IN-bz#209097
 %patch29 -p1 -b .fontrendering-as_IN-bz#209972
@@ -341,25 +330,14 @@ for the Qt 3 toolkit.
 
 # immodule patches
 %if %{immodule}
-#patch50 -p1
-#patch51 -p1 -b .quiet
-#patch52 -p1 -b .fix-key-release-event-with-imm
 %patch53 -p1 -b .resetinputcontext
 %endif
 
 # qt-copy patches
-#patch100 -p0 -b .0038-dragobject-dont-prefer-unknown
-#patch101 -p0 -b .0047-fix-kmenu-width
-#patch102 -p0 -b .0048-qclipboard_hack_80072
-#patch103 -p0 -b .0056-khotkeys_input_84434
-#patch105 -p0 -b .0073-xinerama-aware-qpopup
-#patch107 -p0 -b .0079-compositing-types
-#patch108 -p0 -b .0080-net-wm-sync-request
 %patch110 -p0 -b .0084-compositing-properties
 
 # upstream patches
 %patch200 -p1 -b .fullscreen
-#patch201 -p1 -b .gcc34
 
 # TDE 3.5.13 patches
 %patch300 -p1
@@ -375,6 +353,12 @@ export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH"
 export PATH="$QTDIR/bin:$PATH"
 export QTDEST=%{qtdir}
 
+# Huho ... it looks like we are not detecting some libraries correctly under RHEL4 ...
+%if 0%{?rhel} == 4
+%__sed -i plugins/src/inputmethods/xim/xim.pro \
+  -e "/INCLUDEPATH/ s|$| /usr/include/freetype2|"
+%endif
+
 %if %{smp}
    export SMP_MFLAGS="%{?_smp_mflags}"
 %endif
@@ -384,8 +368,13 @@ export QTDEST=%{qtdir}
 %endif
 
 # set correct X11 prefix
-perl -pi -e "s,QMAKE_LIBDIR_X11.*,QMAKE_LIBDIR_X11\t=," mkspecs/*/qmake.conf
-perl -pi -e "s,QMAKE_INCDIR_X11.*,QMAKE_INCDIR_X11\t=," mkspecs/*/qmake.conf
+if [ -d /usr/X11R6 ]; then
+  perl -pi -e "s,QMAKE_LIBDIR_X11.*,QMAKE_LIBDIR_X11\t=/usr/X11R6/%{_lib}," mkspecs/*/qmake.conf
+  perl -pi -e "s,QMAKE_INCDIR_X11.*,QMAKE_INCDIR_X11\t=/usr/X11R6/include," mkspecs/*/qmake.conf
+else
+  perl -pi -e "s,QMAKE_LIBDIR_X11.*,QMAKE_LIBDIR_X11\t=," mkspecs/*/qmake.conf
+  perl -pi -e "s,QMAKE_INCDIR_X11.*,QMAKE_INCDIR_X11\t=," mkspecs/*/qmake.conf
+fi
 perl -pi -e "s,QMAKE_INCDIR_OPENGL.*,QMAKE_INCDIR_OPENGL\t=," mkspecs/*/qmake.conf
 perl -pi -e "s,QMAKE_LIBDIR_OPENGL.*,QMAKE_LIBDIR_OPENGL\t=," mkspecs/*/qmake.conf
 
@@ -441,13 +430,19 @@ echo yes | ./configure \
   -thread \
   -cups \
   -sm \
+%if 0%{?rhel} == 4
+  -no-xinerama \
+  -no-xrandr \
+%else
   -xinerama \
+  -xrandr \
+%endif
   -xrender \
   -xkb \
   -ipv6 \
   -dlopen-opengl \
   -xft \
-  -tablet
+  -tablet -v
 
 make $SMP_MFLAGS src-qmake
 
@@ -618,7 +613,6 @@ rm -rf %{buildroot}
 # QT 3.3.8.D (TDE): removes lots of unnecessary include files
 # (where do they come from ??? They were not in 3.3.8b !)
 %exclude %{qtdir}/include/btree.h
-#%exclude %{qtdir}/include/config.h
 %exclude %{qtdir}/include/crc32.h
 %exclude %{qtdir}/include/debian_qsql_odbc.h
 %exclude %{qtdir}/include/deflate.h
@@ -633,45 +627,12 @@ rm -rf %{buildroot}
 %exclude %{qtdir}/include/inffixed.h
 %exclude %{qtdir}/include/inflate.h
 %exclude %{qtdir}/include/inftrees.h
-%exclude %{qtdir}/include/jchuff.h
-%exclude %{qtdir}/include/jconfig.h
-%exclude %{qtdir}/include/jdct.h
-%exclude %{qtdir}/include/jdhuff.h
-%exclude %{qtdir}/include/jerror.h
-%exclude %{qtdir}/include/jinclude.h
-%exclude %{qtdir}/include/jmemsys.h
-%exclude %{qtdir}/include/jmorecfg.h
-#%exclude %{qtdir}/include/jpegint.h
-#%exclude %{qtdir}/include/jpeglib.h
-%exclude %{qtdir}/include/jversion.h
-#%exclude %{qtdir}/include/libmng.h
-#%exclude %{qtdir}/include/libmng_chunk_io.h
-#%exclude %{qtdir}/include/libmng_chunk_prc.h
-#%exclude %{qtdir}/include/libmng_chunks.h
-#%exclude %{qtdir}/include/libmng_cms.h
-#%exclude %{qtdir}/include/libmng_conf.h
-#%exclude %{qtdir}/include/libmng_data.h
-#%exclude %{qtdir}/include/libmng_display.h
-#%exclude %{qtdir}/include/libmng_dither.h
-#%exclude %{qtdir}/include/libmng_error.h
-#%exclude %{qtdir}/include/libmng_filter.h
-#%exclude %{qtdir}/include/libmng_jpeg.h
-#%exclude %{qtdir}/include/libmng_memory.h
-#%exclude %{qtdir}/include/libmng_object_prc.h
-#%exclude %{qtdir}/include/libmng_objects.h
-#%exclude %{qtdir}/include/libmng_pixels.h
-#%exclude %{qtdir}/include/libmng_read.h
-#%exclude %{qtdir}/include/libmng_trace.h
-#%exclude %{qtdir}/include/libmng_types.h
-#%exclude %{qtdir}/include/libmng_write.h
-#%exclude %{qtdir}/include/libmng_zlib.h
 %exclude %{qtdir}/include/moc_yacc.h
 %exclude %{qtdir}/include/opcodes.h
 %exclude %{qtdir}/include/os.h
 %exclude %{qtdir}/include/otlbuffer.h
 %exclude %{qtdir}/include/pager.h
 %exclude %{qtdir}/include/parse.h
-#%exclude %{qtdir}/include/png.h
 %exclude %{qtdir}/include/pngasmrd.h
 %exclude %{qtdir}/include/pngconf.h
 %exclude %{qtdir}/include/sqlite.h
@@ -679,10 +640,6 @@ rm -rf %{buildroot}
 %exclude %{qtdir}/include/trees.h
 %exclude %{qtdir}/include/vdbe.h
 %exclude %{qtdir}/include/vdbeInt.h
-#%exclude %{qtdir}/include/zconf.h
-#%exclude %{qtdir}/include/zconf.in.h
-#%exclude %{qtdir}/include/zlib.h
-#%exclude %{qtdir}/include/zutil.h
 %exclude %{qtdir}/mkspecs/linux-g++-sparc
 
 
diff --git a/redhat/dependencies/qt3/qt3-3.5.13.1.spec b/redhat/dependencies/qt3/qt3-3.5.13.1.spec
new file mode 100644
index 000000000..93e69b5ee
--- /dev/null
+++ b/redhat/dependencies/qt3/qt3-3.5.13.1.spec
@@ -0,0 +1,699 @@
+# Always install under standard prefix
+%define _prefix /usr
+
+# The following QT4 packages should NOT be installed to
+# allow QT3 compilation (please uninstall them prior to compile)
+#  qt
+#  qt-sqlite
+#  qt-mysql
+#  qt-x11
+#  qt-devel
+# ...maybe others !!!!
+
+Name:			qt3
+Epoch:			1
+Version:		3.3.8.d
+Release:		9%{?dist}
+Summary:		The shared library for the Qt 3 GUI toolkit
+
+License:		QPL or GPLv2 or GPLv3
+Group:			System Environment/Libraries
+URL:			http://www.trinitydesktop.org/
+
+%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
+Obsoletes:		qt < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		qt = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0: qt3-3.5.13.1.tar.gz
+Source2: qt.sh
+Source3: qt.csh
+Source4: designer3.desktop
+Source5: assistant3.desktop
+Source6: linguist3.desktop
+Source7: qtconfig3.desktop
+
+Patch1: qt-3.3.4-print-CJK.patch
+Patch2: qt-3.0.5-nodebug.patch
+Patch3: qt-3.1.0-makefile.patch
+Patch4: qt-x11-free-3.3.7-umask.patch
+Patch5: qt-x11-free-3.3.6-strip.patch
+Patch7: qt-x11-free-3.3.2-quiet.patch
+Patch12: qt-uic-nostdlib.patch
+Patch13: qt-x11-free-3.3.6-qfontdatabase_x11.patch
+Patch25: qt-x11-free-3.3.8b-uic-multilib.patch
+Patch27: qt-3.3.6-fontrendering-ml_IN-209097.patch
+Patch29: qt-3.3.8-fontrendering-as_IN-209972.patch
+Patch31: qt-3.3.6-fontrendering-te_IN-211259.patch
+Patch32: qt-3.3.6-fontrendering-214371.patch
+Patch33: qt-3.3.8-fontrendering-#214570.patch
+Patch34: qt-3.3.6-fontrendering-ml_IN-209974.patch
+Patch35: qt-3.3.6-fontrendering-ml_IN-217657.patch
+Patch37: qt-3.3.6-fontrendering-gu-228452.patch
+Patch38: qt-x11-free-3.3.8-odbc.patch
+Patch39: qt-x11-free-3.3.7-arm.patch
+Patch40: qt-x11-free-3.3.8b-typo.patch
+
+# immodule patches
+Patch53: qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch
+
+# qt-copy patches
+Patch110: 0084-compositing-properties.patch
+
+# upstream patches
+Patch200: qt-x11-free-3.3.4-fullscreen.patch
+
+# TDE 3.5.13 patches
+Patch300: qt3-3.3.8.d-updates_zh-tw_translations.patch
+
+%define qt_dirname qt-3.3
+%define qtdir %{_libdir}/%{qt_dirname}
+%define qt_docdir %{_docdir}/qt-devel-%{version}
+
+%define smp 1
+%define immodule 1
+%define debug 0
+
+# MySQL plugins
+%define plugin_mysql -plugin-sql-mysql
+%define mysql_include_dir %{_includedir}/mysql
+%define mysql_lib_dir %{_libdir}/mysql
+
+# Postgres plugins
+%define plugin_psql -plugin-sql-psql
+
+# ODBC plugins
+%define plugin_odbc -plugin-sql-odbc
+
+# sqlite plugins
+%define plugin_sqlite -plugin-sql-sqlite
+
+%define plugins_style -qt-style-cde -qt-style-motifplus -qt-style-platinum -qt-style-sgi -qt-style-windows -qt-style-compact -qt-imgfmt-png -qt-imgfmt-jpeg -qt-imgfmt-mng
+%define plugins %{plugin_mysql} %{plugin_psql} %{plugin_odbc} %{plugin_sqlite} %{plugins_style}
+
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+Requires: coreutils
+Requires: fontconfig >= 2.0
+Requires: /etc/ld.so.conf.d
+
+BuildRequires: desktop-file-utils
+BuildRequires: libmng-devel
+BuildRequires: glibc-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libpng-devel
+BuildRequires: zlib-devel
+BuildRequires: perl
+BuildRequires: sed
+BuildRequires: findutils
+BuildRequires: cups-devel
+BuildRequires: tar
+BuildRequires: freetype-devel
+BuildRequires: fontconfig-devel
+BuildRequires: desktop-file-utils
+BuildRequires: mysql-devel
+BuildRequires: postgresql-devel
+BuildRequires: unixODBC-devel
+BuildRequires: sqlite-devel
+BuildRequires: gcc-c++
+BuildRequires: make
+
+%if 0%{?rhel} == 4
+BuildRequires: libungif-devel
+BuildRequires: xorg-x11-devel
+%else
+BuildRequires: giflib-devel
+BuildRequires: libXrender-devel
+BuildRequires: libXrandr-devel
+BuildRequires: libXcursor-devel
+BuildRequires: libXinerama-devel
+BuildRequires: libXft-devel
+BuildRequires: libXext-devel
+BuildRequires: libX11-devel
+BuildRequires: libSM-devel
+BuildRequires: libICE-devel
+BuildRequires: libXt-devel
+BuildRequires: libXmu-devel
+BuildRequires: libXi-devel
+BuildRequires: xorg-x11-proto-devel
+BuildRequires: mesa-libGL-devel
+BuildRequires: mesa-libGLU-devel
+%endif
+
+
+%package config
+Summary: Graphical configuration tool for programs using Qt 3
+Group: User Interface/Desktops
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
+Obsoletes: qt-config < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:  qt-config = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+
+
+%package devel
+Summary: Development files for the Qt 3 GUI toolkit
+Group: Development/Libraries
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: freetype-devel
+Requires: fontconfig-devel
+Requires: libpng-devel
+Requires: libjpeg-devel
+Requires: libmng-devel
+%if 0%{?rhel} == 4
+BuildRequires: xorg-x11-devel
+%else
+Requires: libXrender-devel
+Requires: libXrandr-devel
+Requires: libXcursor-devel
+Requires: libXinerama-devel
+Requires: libXft-devel
+Requires: libXext-devel
+Requires: libX11-devel
+Requires: libSM-devel
+Requires: libICE-devel
+Requires: libXt-devel
+Requires: xorg-x11-proto-devel
+Requires: mesa-libGL-devel
+Requires: mesa-libGLU-devel
+%endif
+%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
+Obsoletes: qt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:  qt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+
+%package devel-docs
+Summary: Documentation for the Qt 3 GUI toolkit
+Group: Development/Libraries
+Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
+Obsoletes: qt-devel-docs < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:  qt-devel-docs = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+
+%package ODBC
+Summary: ODBC drivers for Qt 3's SQL classes
+Group: System Environment/Libraries
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
+Obsoletes: qt-ODBC < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:  qt-ODBC = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+
+%package MySQL
+Summary: MySQL drivers for Qt 3's SQL classes
+Group: System Environment/Libraries
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
+Obsoletes: qt-MySQL < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:  qt-MySQL = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+
+%package PostgreSQL
+Summary: PostgreSQL drivers for Qt 3's SQL classes
+Group: System Environment/Libraries
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
+Obsoletes: qt-PostgreSQL < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:  qt-PostgreSQL = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+
+%package sqlite
+Summary: sqlite drivers for Qt 3's SQL classes
+Group: System Environment/Libraries
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
+Obsoletes: qt-sqlite < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:  qt-sqlite = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+
+
+%package designer
+Summary: Interface designer (IDE) for the Qt 3 toolkit
+Group: Development/Tools
+Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
+Obsoletes: qt-designer < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:  qt-designer = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+
+
+%description
+Qt is a GUI software toolkit which simplifies the task of writing and
+maintaining GUI (Graphical User Interface) applications
+for the X Window System.
+
+Qt is written in C++ and is fully object-oriented.
+
+This package contains the shared library needed to run Qt 3
+applications, as well as the README files for Qt 3.
+
+
+%description config
+Qt is a GUI software toolkit which simplifies the task of writing and
+maintaining GUI (Graphical User Interface) applications
+for the X Window System.
+
+Qt is written in C++ and is fully object-oriented.
+
+This package contains a graphical configuration tool for programs using Qt 3.
+
+
+%description devel
+The %{name}-devel package contains the files necessary to develop
+applications using the Qt GUI toolkit: the header files, the Qt meta
+object compiler.
+
+Install %{name}-devel if you want to develop GUI applications using the Qt 3
+toolkit.
+
+
+%description devel-docs
+The %{name}-devel-docs package contains the man pages, the HTML documentation and
+example programs for Qt 3.
+
+
+%description ODBC
+ODBC driver for Qt 3's SQL classes (QSQL)
+
+
+%description MySQL
+MySQL driver for Qt 3's SQL classes (QSQL)
+
+
+%description PostgreSQL
+PostgreSQL driver for Qt 3's SQL classes (QSQL)
+
+
+%description sqlite
+sqlite driver for Qt 3's SQL classes (QSQL)
+
+
+%description designer
+The %{name}-designer package contains an User Interface designer tool
+for the Qt 3 toolkit.
+
+
+%prep
+%setup -q -n qt3-3.5.13.1
+
+%patch1 -p1 -b .cjk
+%patch2 -p1 -b .ndebug
+%patch3 -p1 -b .makefile
+%patch4 -p1 -b .umask
+%patch5 -p1
+%patch7 -p1 -b .quiet
+%patch12 -p1 -b .nostdlib
+%patch13 -p1 -b .fonts
+%patch25 -p1 -b .uic-multilib
+%patch27 -p1 -b .fontrendering-ml_IN-bz#209097
+%patch29 -p1 -b .fontrendering-as_IN-bz#209972
+%patch31 -p1 -b .fontrendering-te_IN-bz#211259
+%patch32 -p1 -b .fontrendering-bz#214371
+%patch33 -p1 -b .fontrendering-#214570
+%patch34 -p1 -b .fontrendering-#209974
+%patch35 -p1 -b .fontrendering-ml_IN-217657
+%patch37 -p1 -b .fontrendering-gu-228452
+%patch38 -p1 -b .odbc
+# it's not 100% clear to me if this is safe for all archs -- Rex
+%ifarch armv5tel
+%patch39 -p1 -b .arm
+%endif
+%patch40 -p1
+
+# immodule patches
+%if %{immodule}
+%patch53 -p1 -b .resetinputcontext
+%endif
+
+# qt-copy patches
+%patch110 -p0 -b .0084-compositing-properties
+
+# upstream patches
+%patch200 -p1 -b .fullscreen
+
+# TDE 3.5.13 patches
+%patch300 -p1
+
+# convert to UTF-8
+iconv -f iso-8859-1 -t utf-8 < doc/man/man3/qdial.3qt > doc/man/man3/qdial.3qt_
+mv doc/man/man3/qdial.3qt_ doc/man/man3/qdial.3qt
+
+%build
+export QTDIR=`/bin/pwd`
+export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH"
+export PATH="$QTDIR/bin:$PATH"
+export QTDEST=%{qtdir}
+
+# Huho ... it looks like we are not detecting some libraries correctly under RHEL4 ...
+%if 0%{?rhel} == 4
+%__sed -i plugins/src/inputmethods/xim/xim.pro \
+  -e "/INCLUDEPATH/ s|$| /usr/include/freetype2|"
+%endif
+
+%if %{smp}
+   export SMP_MFLAGS="%{?_smp_mflags}"
+%endif
+
+%if %{immodule}
+   sh ./make-symlinks.sh
+%endif
+
+# set correct X11 prefix
+if [ -d /usr/X11R6 ]; then
+  perl -pi -e "s,QMAKE_LIBDIR_X11.*,QMAKE_LIBDIR_X11\t=/usr/X11R6/%{_lib}," mkspecs/*/qmake.conf
+  perl -pi -e "s,QMAKE_INCDIR_X11.*,QMAKE_INCDIR_X11\t=/usr/X11R6/include," mkspecs/*/qmake.conf
+else
+  perl -pi -e "s,QMAKE_LIBDIR_X11.*,QMAKE_LIBDIR_X11\t=," mkspecs/*/qmake.conf
+  perl -pi -e "s,QMAKE_INCDIR_X11.*,QMAKE_INCDIR_X11\t=," mkspecs/*/qmake.conf
+fi
+perl -pi -e "s,QMAKE_INCDIR_OPENGL.*,QMAKE_INCDIR_OPENGL\t=," mkspecs/*/qmake.conf
+perl -pi -e "s,QMAKE_LIBDIR_OPENGL.*,QMAKE_LIBDIR_OPENGL\t=," mkspecs/*/qmake.conf
+
+# don't use rpath
+perl -pi -e "s|-Wl,-rpath,| |" mkspecs/*/qmake.conf
+
+perl -pi -e "s|-O2|$INCLUDES %{optflags} -fno-strict-aliasing|g" mkspecs/*/qmake.conf
+
+# set correct lib path
+if [ "%{_lib}" == "lib64" ] ; then
+  perl -pi -e "s,/usr/lib /lib,/usr/%{_lib} /%{_lib},g" config.tests/{unix,x11}/*.test
+  perl -pi -e "s,/lib /usr/lib,/%{_lib} /usr/%{_lib},g" config.tests/{unix,x11}/*.test
+fi
+
+# build shared, threaded (default) libraries
+echo yes | ./configure \
+  -prefix $QTDEST \
+  -docdir %{qt_docdir} \
+%if %{_lib} == lib64
+  -platform linux-g++-64 \
+%else
+  -platform linux-g++ \
+%endif
+%if %{debug}
+  -debug \
+%else
+  -release \
+%endif
+  -shared \
+  -largefile \
+  -qt-gif \
+  -system-zlib \
+  -system-libpng \
+  -system-libmng \
+  -system-libjpeg \
+  -no-exceptions \
+  -enable-styles \
+  -enable-tools \
+  -enable-kernel \
+  -enable-widgets \
+  -enable-dialogs \
+  -enable-iconview \
+  -enable-workspace \
+  -enable-network \
+  -enable-canvas \
+  -enable-table \
+  -enable-xml \
+  -enable-opengl \
+  -enable-sql \
+  -qt-style-motif \
+  %{plugins} \
+  -stl \
+  -thread \
+  -cups \
+  -sm \
+%if 0%{?rhel} == 4
+  -no-xinerama \
+  -no-xrandr \
+%else
+  -xinerama \
+  -xrandr \
+%endif
+  -xrender \
+  -xkb \
+  -ipv6 \
+  -dlopen-opengl \
+  -xft \
+  -tablet -v
+
+make $SMP_MFLAGS src-qmake
+
+# build sqlite plugin
+pushd plugins/src/sqldrivers/sqlite
+qmake -o Makefile sqlite.pro
+popd
+
+# build psql plugin
+pushd plugins/src/sqldrivers/psql
+qmake -o Makefile "INCLUDEPATH+=%{_includedir}/pgsql %{_includedir}/pgsql/server %{_includedir}/pgsql/internal" "LIBS+=-lpq" psql.pro
+popd
+
+# build mysql plugin
+pushd plugins/src/sqldrivers/mysql
+qmake -o Makefile "INCLUDEPATH+=%{mysql_include_dir}" "LIBS+=-L%{mysql_lib_dir} -lmysqlclient" mysql.pro
+popd
+
+# build odbc plugin
+pushd plugins/src/sqldrivers/odbc
+qmake -o Makefile "LIBS+=-lodbc" odbc.pro
+popd
+
+make $SMP_MFLAGS src-moc
+make $SMP_MFLAGS sub-src
+make $SMP_MFLAGS sub-tools UIC="$QTDIR/bin/uic -nostdlib -L $QTDIR/plugins"
+
+%install
+rm -rf %{buildroot}
+
+export QTDIR=`/bin/pwd`
+export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH"
+export PATH="$QTDIR/bin:$PATH"
+export QTDEST=%{qtdir}
+
+make install INSTALL_ROOT=%{buildroot}
+
+for i in findtr qt20fix qtrename140 lrelease lupdate ; do
+   install bin/$i %{buildroot}%{qtdir}/bin/
+done
+
+mkdir -p %{buildroot}%{_libdir}/pkgconfig/
+mv %{buildroot}%{qtdir}/lib/pkgconfig/*.pc %{buildroot}%{_libdir}/pkgconfig/
+
+# install man pages
+mkdir -p %{buildroot}%{_mandir}
+cp -fR doc/man/* %{buildroot}%{_mandir}/
+
+# clean up
+make -C tutorial clean
+make -C examples clean
+
+# Make sure the examples can be built outside the source tree.
+# Our binaries fulfill all requirements, so...
+perl -pi -e "s,^DEPENDPATH.*,,g;s,^REQUIRES.*,,g" `find examples -name "*.pro"`
+
+# don't include Makefiles of qt examples/tutorials
+find examples -name "Makefile" | xargs rm -f
+find examples -name "*.obj" | xargs rm -rf
+find examples -name "*.moc" | xargs rm -rf
+find tutorial -name "Makefile" | xargs rm -f
+
+for a in */*/Makefile ; do
+  sed 's|^SYSCONF_MOC.*|SYSCONF_MOC		= %{qtdir}/bin/moc|' < $a > ${a}.2
+  mv -v ${a}.2 $a
+done
+
+install -D -m 644 %{SOURCE2} %{buildroot}/etc/profile.d/qt3.sh
+install -D -m 644 %{SOURCE3} %{buildroot}/etc/profile.d/qt3.csh
+
+# Add desktop files
+mkdir -p %{buildroot}%{_datadir}/applications
+desktop-file-install \
+  --dir %{buildroot}%{_datadir}/applications \
+  --vendor="qt" \
+  %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7}
+
+# Patch qmake to use qt-mt unconditionally
+perl -pi -e "s,-lqt ,-lqt-mt ,g;s,-lqt$,-lqt-mt,g" %{buildroot}%{qtdir}/mkspecs/*/qmake.conf
+
+# remove broken links
+rm -f %{buildroot}%{qtdir}/mkspecs/default/linux-g++*
+rm -f %{buildroot}%{qtdir}/lib/*.la
+
+mkdir -p %{buildroot}/etc/ld.so.conf.d
+echo "%{qtdir}/lib" > %{buildroot}/etc/ld.so.conf.d/qt-%{_arch}.conf
+
+# install icons
+mkdir %{buildroot}%{_datadir}/pixmaps
+install -m 644 tools/assistant/images/qt.png %{buildroot}%{_datadir}/pixmaps/qtconfig3.png
+install -m 644 tools/assistant/images/designer.png %{buildroot}%{_datadir}/pixmaps/designer3.png
+install -m 644 tools/assistant/images/assistant.png %{buildroot}%{_datadir}/pixmaps/assistant3.png
+install -m 644 tools/assistant/images/linguist.png %{buildroot}%{_datadir}/pixmaps/linguist3.png
+
+# own style directory
+mkdir -p %{buildroot}%{qtdir}/plugins/styles
+
+%clean
+rm -rf %{buildroot}
+
+%post
+/sbin/ldconfig
+
+%postun
+/sbin/ldconfig
+
+%files
+%defattr(-,root,root,-)
+%doc FAQ LICENSE* README* changes*
+%dir %{qtdir}
+%dir %{qtdir}/bin
+%dir %{qtdir}/lib
+%dir %{qtdir}/plugins
+%dir %{qtdir}/plugins/sqldrivers
+%dir %{qtdir}/plugins/styles
+%{qtdir}/translations
+%{qtdir}/plugins/designer/
+%if %{immodule}
+%{qtdir}/plugins/inputmethods
+%endif
+%config /etc/profile.d/*
+/etc/ld.so.conf.d/*
+%{qtdir}/lib/libqui.so.*
+%{qtdir}/lib/libqt*.so.*
+
+%files config
+%defattr(-,root,root,-)
+%{qtdir}/bin/qtconfig
+%{_datadir}/applications/*qtconfig*.desktop
+%{_datadir}/pixmaps/qtconfig3.png
+
+%files devel
+%defattr(-,root,root,-)
+%{qt_docdir}/
+%{qtdir}/bin/moc
+%{qtdir}/bin/uic
+%{qtdir}/bin/findtr
+%{qtdir}/bin/qt20fix
+%{qtdir}/bin/qtrename140
+%{qtdir}/bin/assistant
+%{qtdir}/bin/qm2ts
+%{qtdir}/bin/qmake
+%{qtdir}/bin/qembed
+%{qtdir}/bin/linguist
+%{qtdir}/bin/lupdate
+%{qtdir}/bin/lrelease
+%{qtdir}/include
+%{qtdir}/mkspecs
+%{qtdir}/lib/libqt*.so
+%{qtdir}/lib/libqui.so
+%{qtdir}/lib/libeditor.a
+%{qtdir}/lib/libdesigner*.a
+%{qtdir}/lib/libqassistantclient.a
+%{qtdir}/lib/*.prl
+%{qtdir}/phrasebooks
+%{_libdir}/pkgconfig/*
+%{_datadir}/applications/*linguist*.desktop
+%{_datadir}/applications/*assistant*.desktop
+%{_datadir}/pixmaps/linguist3.png
+%{_datadir}/pixmaps/assistant3.png
+
+# QT 3.3.8.D (TDE): 4 binaries have appeared
+%{qtdir}/bin/createcw
+%{qtdir}/bin/makeqpf
+%{qtdir}/bin/mergetr
+%{qtdir}/bin/msg2qm
+
+# QT 3.3.8.D (TDE): removes lots of unnecessary include files
+# (where do they come from ??? They were not in 3.3.8b !)
+%exclude %{qtdir}/include/btree.h
+%exclude %{qtdir}/include/crc32.h
+%exclude %{qtdir}/include/debian_qsql_odbc.h
+%exclude %{qtdir}/include/deflate.h
+%exclude %{qtdir}/include/ftglue.h
+%exclude %{qtdir}/include/ftxgdef.h
+%exclude %{qtdir}/include/ftxgpos.h
+%exclude %{qtdir}/include/ftxgsub.h
+%exclude %{qtdir}/include/ftxopen.h
+%exclude %{qtdir}/include/ftxopenf.h
+%exclude %{qtdir}/include/hash.h
+%exclude %{qtdir}/include/inffast.h
+%exclude %{qtdir}/include/inffixed.h
+%exclude %{qtdir}/include/inflate.h
+%exclude %{qtdir}/include/inftrees.h
+%exclude %{qtdir}/include/moc_yacc.h
+%exclude %{qtdir}/include/opcodes.h
+%exclude %{qtdir}/include/os.h
+%exclude %{qtdir}/include/otlbuffer.h
+%exclude %{qtdir}/include/pager.h
+%exclude %{qtdir}/include/parse.h
+%exclude %{qtdir}/include/pngasmrd.h
+%exclude %{qtdir}/include/pngconf.h
+%exclude %{qtdir}/include/sqlite.h
+%exclude %{qtdir}/include/sqliteInt.h
+%exclude %{qtdir}/include/trees.h
+%exclude %{qtdir}/include/vdbe.h
+%exclude %{qtdir}/include/vdbeInt.h
+%exclude %{qtdir}/mkspecs/linux-g++-sparc
+
+
+
+%files devel-docs
+%defattr(-,root,root,-)
+%doc examples
+%doc tutorial
+%{_mandir}/*/*
+
+%files sqlite
+%defattr(-,root,root,-)
+%{qtdir}/plugins/sqldrivers/libqsqlite.so
+
+%files ODBC
+%defattr(-,root,root,-)
+%{qtdir}/plugins/sqldrivers/libqsqlodbc.so
+
+%files PostgreSQL
+%defattr(-,root,root,-)
+%{qtdir}/plugins/sqldrivers/libqsqlpsql.so
+
+%files MySQL
+%defattr(-,root,root,-)
+%{qtdir}/plugins/sqldrivers/libqsqlmysql.so
+
+%files designer
+%defattr(-,root,root,-)
+%{qtdir}/templates
+%{qtdir}/bin/designer
+%{_datadir}/applications/*designer*.desktop
+%{_datadir}/pixmaps/designer3.png
+
+
+%changelog
+* Sat Sep 29 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-9
+- Initial build for TDE 3.5.13.1
+
+* Sat Apr 28 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-8
+- Fix Provides and Obsoletes, again and again ...
+
+* Sat Apr 28 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-7
+- Fix Provides and Obsoletes. Now only for RHEL 5.
+
+* Tue Apr 24 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-6
+- Fix Qt3 builds with libpng15. [Bug #683]
+
+* Sat Apr 21 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-5
+- Fix 'Provides' AGAIN !! [Bug #823]
+
+* Mon Apr 02 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-4
+- Fix 'Provides' [Bug #823]
+
+* Sun Dec 18 2011 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-3
+- Updates zh_TW translations, thanks to Wei-Lun Chao .
+
+* Thu Nov 03 2011 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-2
+- Add missing BuildRequires
+
+* Fri Sep 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-1
+- Initial build for RHEL 6, RHEL 5, and Fedora 15
+- Switch to Trinity Version
+- Spec file based on RHEL 6 'qt3-3.3.8b-29'
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.1.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.1.spec
new file mode 100755
index 000000000..4b52eaa1c
--- /dev/null
+++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.1.spec
@@ -0,0 +1,150 @@
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?tde_prefix}" != "/usr"
+%define _variant .opt
+%define cmake_modules_dir %{tde_prefix}/share/cmake
+%else
+%define cmake_modules_dir %{_datadir}/cmake/Modules
+%endif
+
+# TQT include files may conflict with QT4 includes, so we move them to a subdirectory.
+# Later compiled Trinity products should be aware of that !
+%define tde_bindir %{tde_prefix}/bin
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+
+Name:		trinity-tqtinterface
+Version:	3.5.13.1
+Release:	1%{?dist}%{?_variant}
+License:	GPL
+Summary:	Trinity QT Interface
+Group:		System Environment/Libraries
+
+Vendor:		Trinity Project
+URL:		http://www.trinitydesktop.org/
+Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:	tqtinterface-3.5.13.1.tar.gz
+
+# [tqtinterface] Add missing endian-ness defines [Bug #727] [Commit #458e74a6]
+Patch1:		tqtinterface-3.5.13-add_missing_endianness_defines.patch
+
+# TDE 3.5.13 specific building variables
+BuildRequires:	cmake >= 2.8
+BuildRequires:	qt3-devel
+Requires:		qt3
+
+BuildRequires:	gcc-c++
+%if 0%{?rhel} == 4
+BuildRequires:	xorg-x11-devel
+%else
+BuildRequires:	pth-devel
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}xi-devel
+%else
+BuildRequires:	libXi-devel
+%endif
+%endif
+
+Obsoletes:	tqtinterface < %{version}-%{release}
+Provides:	tqtinterface = %{version}-%{release}
+
+
+%description
+Trinity QT Interface
+
+%package devel
+Group:		Development/Libraries
+Summary:	%{name} - Development files
+Requires:	%{name} = %{version}-%{release}
+Requires:	qt3-devel
+
+Obsoletes:	tqtinterface-devel < %{version}-%{release}
+Provides:	tqtinterface-devel = %{version}-%{release}
+
+%description devel
+Development files for %{name}
+
+%if 0%{?suse_version}
+%debug_package
+%endif
+
+
+%prep
+%setup -q -n tqtinterface-3.5.13.1
+%patch1 -p1
+
+%build
+unset QTDIR; . /etc/profile.d/qt3.sh
+
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
+%__mkdir_p build
+cd build
+%endif
+
+# Note: specifying 'QT_LIBRARY_DIR' allow using QT3 libraries under
+#  another directory than QT3_PREFIX. (E.g. Mageia 2, Mandriva ...)
+#  Otherwise, it defaults to ${QTDIR}/lib !
+%cmake \
+  -DQT_PREFIX_DIR=${QTDIR} \
+  -DQT_VERSION=3 \
+  -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+  -DINCLUDE_INSTALL_DIR=%{tde_includedir}/tqt \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DPKGCONFIG_INSTALL_DIR=%{tde_libdir}/pkgconfig \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DQT_LIBRARY_DIR=${QTLIB:-${QTDIR}/%{_lib}} \
+  ..
+
+%__make %{?_smp_mflags}
+
+
+%install
+%__rm -rf %{?buildroot}
+%__mkdir_p %{?buildroot}%{_includedir}
+%__make install DESTDIR=%{?buildroot} -C build
+
+# RHEL 5: add newline at end of include files to avoid warnings
+%if 0%{?rhel} && 0%{?rhel} <= 5
+for i in %{?buildroot}%{tde_includedir}/tqt/*.h; do
+  echo "" >>${i}
+done
+%endif
+
+# Install 'cmake' modules for development use
+%__mkdir_p %{?buildroot}%{cmake_modules_dir}
+for i in cmake/modules/*.cmake; do
+  %__install -m 644 $i %{?buildroot}%{cmake_modules_dir}
+done
+
+%clean
+%__rm -rf %{?buildroot}
+
+%post
+/sbin/ldconfig || :
+
+%postun
+/sbin/ldconfig || :
+
+%post devel
+/sbin/ldconfig || :
+
+%postun devel
+/sbin/ldconfig || :
+
+%files
+%{tde_bindir}/*
+%{tde_libdir}/*.so.*
+
+%files devel
+%{tde_includedir}/tqt
+%{tde_libdir}/*.so
+%{tde_libdir}/*.la
+%{tde_libdir}/pkgconfig/*.pc
+%{cmake_modules_dir}/*.cmake
+
+
+%changelog
+* Tue Sep 11 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
+- Switch to v3.5.13-sru branch
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec
index 598e2d874..2616720d7 100755
--- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec
@@ -12,7 +12,7 @@
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
 
-Name:		tqtinterface
+Name:		trinity-tqtinterface
 Version:	3.5.13
 Release:	3%{?dist}%{?_variant}
 License:	GPL
@@ -25,23 +25,30 @@ Packager:	Francois Andriot <francois.andriot@free.fr>
 
 Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0:	%{name}-%{version}.tar.gz
+Source0:	tqtinterface-3.5.13.tar.gz
 
 # [tqtinterface] Add missing endian-ness defines [Bug #727] [Commit #458e74a6]
 Patch1:		tqtinterface-3.5.13-add_missing_endianness_defines.patch
 
 # TDE 3.5.13 specific building variables
 BuildRequires:	cmake >= 2.8
-BuildRequires:	qt3-devel >= 3.3.8.d
-Requires:		qt3 >= 3.3.8.d
+BuildRequires:	qt3-devel
+Requires:		qt3
 
 BuildRequires:	gcc-c++
+%if 0%{?rhel} == 4
+BuildRequires:	xorg-x11-devel
+%else
 BuildRequires:	pth-devel
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	%{_lib}xi-devel
 %else
 BuildRequires:	libXi-devel
 %endif
+%endif
+
+Obsoletes:	tqtinterface < %{version}-%{release}
+Provides:	tqtinterface = %{version}-%{release}
 
 
 %description
@@ -51,19 +58,27 @@ Trinity QT Interface
 Group:		Development/Libraries
 Summary:	%{name} - Development files
 Requires:	%{name} = %{version}-%{release}
-Requires:	qt3-devel >= 3.3.8.d
+Requires:	qt3-devel
+
+Obsoletes:	tqtinterface-devel < %{version}-%{release}
+Provides:	tqtinterface-devel = %{version}-%{release}
 
 %description devel
 Development files for %{name}
 
+%if 0%{?suse_version}
+%debug_package
+%endif
+
+
 %prep
-%setup -q -n dependencies/%{name}
+%setup -q -n dependencies/tqtinterface
 %patch1 -p1
 
 %build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
+unset QTDIR; . /etc/profile.d/qt?.sh
 
-%if 0%{?rhel} || 0%{?fedora}
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
 %__mkdir_p build
 cd build
 %endif
@@ -79,7 +94,7 @@ cd build
   -DLIB_INSTALL_DIR=%{tde_libdir} \
   -DPKGCONFIG_INSTALL_DIR=%{tde_libdir}/pkgconfig \
   -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DQT_LIBRARY_DIR=${QTLIB} \
+  -DQT_LIBRARY_DIR=${QTLIB:-${QTDIR}/%{_lib}} \
   ..
 
 %__make %{?_smp_mflags}