80 files changed, 1093 insertions, 183 deletions

diff --git a/redhat/components.txt b/redhat/components.txt
index f8b06c9aa..b2f84234b 100644
--- a/redhat/components.txt
+++ b/redhat/components.txt
@@ -4,12 +4,15 @@ libraries/libkipi
 libraries/libksquirrel
 libraries/python-trinity
 libraries/pykdeextensions
-qt3
+dependencies/qt3
+dependencies/tqt3
+dependencies/tqca-tls
 dependencies/libcaldav
 dependencies/libcarddav
 dependencies/tqtinterface
 dependencies/dbus-tqt
 dependencies/dbus-1-tqt
+dependencies/avahi-tqt
 dependencies/arts
 dependencies/tqscintilla
 kdelibs
@@ -119,3 +122,4 @@ applications/kmplayer
 applications/kvkbd
 applications/potracegui
 applications/soundkonverter
+
diff --git a/redhat/dependencies/arts/trinity-arts-r14.spec b/redhat/dependencies/arts/trinity-arts-r14.spec
new file mode 100755
index 000000000..4e9c33264
--- /dev/null
+++ b/redhat/dependencies/arts/trinity-arts-r14.spec
@@ -0,0 +1,123 @@
+# 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
+%endif
+
+
+Name:		trinity-arts
+Version:	r14
+Release:	1%{?dist}%{?_variant}
+License:	GPL
+Summary:	aRts (analog realtime synthesizer) - the TDE sound system
+Group:		System Environment/Daemons 
+
+Vendor:		Trinity Project
+URL:		http://www.trinitydesktop.org/
+Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	arts-%{version}.tar.gz
+
+BuildRequires:	cmake >= 2.8
+BuildRequires:	tqtinterface-devel
+BuildRequires:	audiofile-devel
+BuildRequires:	alsa-lib-devel
+BuildRequires:	glib2-devel
+BuildRequires:	libtool-ltdl-devel
+BuildRequires:	gsl-devel
+BuildRequires:	libvorbis-devel
+BuildRequires:	esound-devel
+BuildRequires:	jack-audio-connection-kit-devel
+
+Requires:		tqtinterface == %{version}
+Requires:		audiofile
+
+%if "%{?_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.
+
+
+%package devel
+Group:		Development/Libraries
+Summary:	%{name} - Development files
+Requires:	%{name} = %{version}-%{release}
+%if "%{?_prefix}" == "/usr"
+Obsoletes:	arts-devel
+%endif
+
+%description devel
+Development files for %{name}
+
+%prep
+%setup -q -n dependencies/arts
+
+%build
+%__mkdir build
+cd build
+%cmake \
+  -DINCLUDE_INSTALL_DIR=%{_includedir}/arts \
+  -DPKGCONFIG_INSTALL_DIR=%{_libdir}/pkgconfig \
+  -DWITH_ALSA=ON \
+  -DWITH_AUDIOFILE=ON \
+  -DWITH_VORBIS=ON \
+  -DWITH_MAD=OFF \
+  -DWITH_ESOUND=ON \
+  -DWITH_JACK=ON \
+  ..
+
+
+%__make %{?_smp_mflags}
+
+%install
+%__rm -rf %{?buildroot}
+%__make install -C build DESTDIR=%{?buildroot}
+
+%clean
+%__rm -rf %{?buildroot}
+
+%files
+%defattr(-,root,root,-)
+%doc COPYING.LIB
+%dir %{_libdir}/mcop
+%dir %{_libdir}/mcop/Arts
+%{_libdir}/mcop/Arts/*
+%{_libdir}/mcop/*.mcopclass
+%{_libdir}/mcop/*.mcoptype
+%{_libdir}/lib*.so.*
+%{_libdir}/lib*.la
+%{_bindir}/artscat
+%{_bindir}/artsd
+%{_bindir}/artsdsp
+%{_bindir}/artsplay
+%{_bindir}/artsrec
+%{_bindir}/artsshell
+%{_bindir}/artswrapper
+
+%files devel
+%defattr(-,root,root,-)
+%{_bindir}/mcopidl
+%dir %{_includedir}
+%{_includedir}/*/
+%{_bindir}/artsc-config
+%{_libdir}/lib*.so
+%{_libdir}/pkgconfig/*.pc
+%{_libdir}/*.a
+
+
+%changelog
+* Thu Feb 16 2012 Francois Andriot <francois.andriot@free.fr> - r14-1
+- Initial build for TDE R14, using 'tqt3' instead of 'qt3'
diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-r14.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-r14.spec
new file mode 100644
index 000000000..faa71a064
--- /dev/null
+++ b/redhat/dependencies/avahi-tqt/avahi-tqt-r14.spec
@@ -0,0 +1,76 @@
+# Always build under "/usr"
+%define _prefix /usr
+
+
+Name:		avahi-tqt
+Version:	r14
+Release:	1%{?dist}
+License:	GPL
+Summary:	Avahi TQT Interface
+Group:		System Environment/Libraries
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{name}-%{version}.tar.gz
+Patch0:		git.patch
+
+BuildRequires:	gcc-c++
+BuildRequires:	avahi-devel
+BuildRequires:	cmake >= 2.8
+BuildRequires:	tqt3-devel >= 3.4.0
+BuildRequires:	tqtinterface-devel
+Requires:		tqt3 >= 3.4.0
+Requires:		tqtinterface
+
+%description
+Avahi TQT Interface
+
+
+%package devel
+Requires:	%{name}
+Summary:	%{name} - Development files
+Group:		Development/Libraries
+
+
+%description devel
+Development files for %{name}
+
+
+%prep
+%setup -q -n dependencies/%{name}
+%patch0 -p1
+
+%build
+./autogen.sh
+%configure \
+	--enable-compat-libdns_sd \
+	--disable-mono --disable-monodoc \
+	--disable-gtk3 \
+	--with-systemdsystemunitdir=/lib/systemd/system
+
+
+
+%install
+%__rm -rf %{?buildroot}
+%__make install DESTDIR=%{?buildroot}
+
+%clean
+%__rm -rf %{?buildroot}
+
+%files
+%{_libdir}/*.so.*
+
+%files devel
+%{_includedir}/%{name}
+%{_libdir}/*.so
+%{_libdir}/*.la
+%{_libdir}/pkgconfig/*.pc
+%exclude %{_libdir}/libavahi-tqt.a
+
+%changelog
+* Thu Feb 16 2012 Francois Andriot <francois.andriot@free.fr> - r14-1
+- Initial build for TDE R14, using 'tqt3' instead of 'qt3'
diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-r14.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-r14.spec
new file mode 100644
index 000000000..112520c32
--- /dev/null
+++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-r14.spec
@@ -0,0 +1,73 @@
+# Always build under "/usr"
+%define _prefix /usr
+
+
+Name:		dbus-1-tqt
+Version:	r14
+Release:	1%{?dist}
+License:	GPL
+Summary:	Dbus TQT Interface
+Group:		System Environment/Libraries
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{name}-%{version}.tar.gz
+
+BuildRequires:	gcc-c++
+BuildRequires:	dbus-devel
+BuildRequires:	tqtinterface-devel
+BuildRequires:	cmake >= 2.8
+BuildRequires:	tqt3-devel >= 3.4.0
+BuildRequires:	dbus-tqt-devel == %{version}
+Requires:		tqt3 >= 3.4.0
+Requires:		dbus-tqt == %{version}
+
+%description
+Dbus TQT Interface
+
+
+%package devel
+Requires:	%{name}
+Summary:	%{name} - Development files
+Group:		Development/Libraries
+
+%description devel
+Development files for %{name}
+
+
+%prep
+%setup -q -n dependencies/%{name}
+
+%build
+%__mkdir build
+cd build
+%cmake ..
+%__make %{?_smp_mflags}
+
+
+%install
+%__rm -rf %{?buildroot}
+%__mkdir_p %{?buildroot}%{_includedir}
+%__make install DESTDIR=%{?buildroot} -C build
+
+%clean
+%__rm -rf %{?buildroot}
+
+%files
+%{_bindir}/dbusxml2qt3
+%{_libdir}/*.so.*
+
+%files devel
+%{_includedir}/*.h
+%{_libdir}/*.so
+%{_libdir}/*.la
+%{_libdir}/pkgconfig/*.pc
+
+%changelog
+* Thu Feb 16 2012 Francois Andriot <francois.andriot@free.fr> - r14-1
+- Initial build for TDE R14, using 'tqt3' instead of 'qt3'
+
diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-r14.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-r14.spec
new file mode 100644
index 000000000..aaf57264a
--- /dev/null
+++ b/redhat/dependencies/dbus-tqt/dbus-tqt-r14.spec
@@ -0,0 +1,71 @@
+# Always build under "/usr"
+%define _prefix /usr
+
+
+Name:		dbus-tqt
+Version:	r14
+Release:	1%{?dist}
+License:	GPL
+Summary:	Dbus TQT Interface
+Group:		System Environment/Libraries
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{name}-%{version}.tar.gz
+
+BuildRequires:	gcc-c++
+BuildRequires:	dbus-devel
+BuildRequires:	cmake >= 2.8
+BuildRequires:	tqt3-devel >= 3.4.0
+BuildRequires:	tqtinterface-devel
+Requires:		tqt3 >= 3.4.0
+Requires:		tqtinterface
+
+%description
+Dbus TQT Interface
+
+
+%package devel
+Requires:	%{name}
+Summary:	%{name} - Development files
+Group:		Development/Libraries
+
+
+%description devel
+Development files for %{name}
+
+
+%prep
+%setup -q -n dependencies/%{name}
+
+%build
+%__mkdir build
+cd build
+%cmake ..
+
+%__make %{?_smp_mflags}
+
+
+%install
+%__rm -rf %{?buildroot}
+%__make install DESTDIR=%{?buildroot} -C build
+
+%clean
+%__rm -rf %{?buildroot}
+
+%files
+%{_libdir}/*.so.*
+
+%files devel
+%{_includedir}/dbus-1.0/*
+%{_libdir}/*.so
+%{_libdir}/*.la
+%{_libdir}/pkgconfig/*.pc
+
+%changelog
+* Thu Feb 16 2012 Francois Andriot <francois.andriot@free.fr> - r14-1
+- Initial build for TDE R14, using 'tqt3' instead of 'qt3'
diff --git a/redhat/qt3/0084-compositing-properties.patch b/redhat/dependencies/qt3/0084-compositing-properties.patch
index 368b6c267..368b6c267 100644
--- a/redhat/qt3/0084-compositing-properties.patch
+++ b/redhat/dependencies/qt3/0084-compositing-properties.patch
diff --git a/redhat/qt3/assistant3.desktop b/redhat/dependencies/qt3/assistant3.desktop
index 49e718c5d..49e718c5d 100644
--- a/redhat/qt3/assistant3.desktop
+++ b/redhat/dependencies/qt3/assistant3.desktop
diff --git a/redhat/qt3/designer3.desktop b/redhat/dependencies/qt3/designer3.desktop
index 23f1f549a..23f1f549a 100644
--- a/redhat/qt3/designer3.desktop
+++ b/redhat/dependencies/qt3/designer3.desktop
diff --git a/redhat/qt3/linguist3.desktop b/redhat/dependencies/qt3/linguist3.desktop
index c6fce02c8..c6fce02c8 100644
--- a/redhat/qt3/linguist3.desktop
+++ b/redhat/dependencies/qt3/linguist3.desktop
diff --git a/redhat/qt3/qt-3.0.5-nodebug.patch b/redhat/dependencies/qt3/qt-3.0.5-nodebug.patch
index 09d697fb4..09d697fb4 100644
--- a/redhat/qt3/qt-3.0.5-nodebug.patch
+++ b/redhat/dependencies/qt3/qt-3.0.5-nodebug.patch
diff --git a/redhat/qt3/qt-3.1.0-makefile.patch b/redhat/dependencies/qt3/qt-3.1.0-makefile.patch
index 009ab81fb..009ab81fb 100644
--- a/redhat/qt3/qt-3.1.0-makefile.patch
+++ b/redhat/dependencies/qt3/qt-3.1.0-makefile.patch
diff --git a/redhat/qt3/qt-3.3.4-print-CJK.patch b/redhat/dependencies/qt3/qt-3.3.4-print-CJK.patch
index 5bd5e9e0a..5bd5e9e0a 100644
--- a/redhat/qt3/qt-3.3.4-print-CJK.patch
+++ b/redhat/dependencies/qt3/qt-3.3.4-print-CJK.patch
diff --git a/redhat/qt3/qt-3.3.6-fontrendering-214371.patch b/redhat/dependencies/qt3/qt-3.3.6-fontrendering-214371.patch
index 9dca7998d..9dca7998d 100644
--- a/redhat/qt3/qt-3.3.6-fontrendering-214371.patch
+++ b/redhat/dependencies/qt3/qt-3.3.6-fontrendering-214371.patch
diff --git a/redhat/qt3/qt-3.3.6-fontrendering-gu-228452.patch b/redhat/dependencies/qt3/qt-3.3.6-fontrendering-gu-228452.patch
index 21081d1a6..21081d1a6 100644
--- a/redhat/qt3/qt-3.3.6-fontrendering-gu-228452.patch
+++ b/redhat/dependencies/qt3/qt-3.3.6-fontrendering-gu-228452.patch
diff --git a/redhat/qt3/qt-3.3.6-fontrendering-ml_IN-209097.patch b/redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-209097.patch
index 01f3824c1..01f3824c1 100644
--- a/redhat/qt3/qt-3.3.6-fontrendering-ml_IN-209097.patch
+++ b/redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-209097.patch
diff --git a/redhat/qt3/qt-3.3.6-fontrendering-ml_IN-209974.patch b/redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-209974.patch
index 8dbb2ae98..8dbb2ae98 100644
--- a/redhat/qt3/qt-3.3.6-fontrendering-ml_IN-209974.patch
+++ b/redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-209974.patch
diff --git a/redhat/qt3/qt-3.3.6-fontrendering-ml_IN-217657.patch b/redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-217657.patch
index eb880b1cc..eb880b1cc 100644
--- a/redhat/qt3/qt-3.3.6-fontrendering-ml_IN-217657.patch
+++ b/redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-217657.patch
diff --git a/redhat/qt3/qt-3.3.6-fontrendering-te_IN-211259.patch b/redhat/dependencies/qt3/qt-3.3.6-fontrendering-te_IN-211259.patch
index eb3868c96..eb3868c96 100644
--- a/redhat/qt3/qt-3.3.6-fontrendering-te_IN-211259.patch
+++ b/redhat/dependencies/qt3/qt-3.3.6-fontrendering-te_IN-211259.patch
diff --git a/redhat/qt3/qt-3.3.8-fontrendering-#214570.patch b/redhat/dependencies/qt3/qt-3.3.8-fontrendering-#214570.patch
index 41a74fba7..41a74fba7 100644
--- a/redhat/qt3/qt-3.3.8-fontrendering-#214570.patch
+++ b/redhat/dependencies/qt3/qt-3.3.8-fontrendering-#214570.patch
diff --git a/redhat/qt3/qt-3.3.8-fontrendering-as_IN-209972.patch b/redhat/dependencies/qt3/qt-3.3.8-fontrendering-as_IN-209972.patch
index 7583239cc..7583239cc 100644
--- a/redhat/qt3/qt-3.3.8-fontrendering-as_IN-209972.patch
+++ b/redhat/dependencies/qt3/qt-3.3.8-fontrendering-as_IN-209972.patch
diff --git a/redhat/qt3/qt-uic-nostdlib.patch b/redhat/dependencies/qt3/qt-uic-nostdlib.patch
index 02a40b225..02a40b225 100644
--- a/redhat/qt3/qt-uic-nostdlib.patch
+++ b/redhat/dependencies/qt3/qt-uic-nostdlib.patch
diff --git a/redhat/qt3/qt-x11-free-3.3.2-quiet.patch b/redhat/dependencies/qt3/qt-x11-free-3.3.2-quiet.patch
index 6dce7aa80..6dce7aa80 100644
--- a/redhat/qt3/qt-x11-free-3.3.2-quiet.patch
+++ b/redhat/dependencies/qt3/qt-x11-free-3.3.2-quiet.patch
diff --git a/redhat/qt3/qt-x11-free-3.3.4-fullscreen.patch b/redhat/dependencies/qt3/qt-x11-free-3.3.4-fullscreen.patch
index 0d03f0809..0d03f0809 100644
--- a/redhat/qt3/qt-x11-free-3.3.4-fullscreen.patch
+++ b/redhat/dependencies/qt3/qt-x11-free-3.3.4-fullscreen.patch
diff --git a/redhat/qt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch b/redhat/dependencies/qt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch
index a9cfaf4c3..a9cfaf4c3 100644
--- a/redhat/qt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch
+++ b/redhat/dependencies/qt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch
diff --git a/redhat/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..24982206d 100644
--- a/redhat/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
diff --git a/redhat/qt3/qt-x11-free-3.3.6-strip.patch b/redhat/dependencies/qt3/qt-x11-free-3.3.6-strip.patch
index efc24c8a1..efc24c8a1 100644
--- a/redhat/qt3/qt-x11-free-3.3.6-strip.patch
+++ b/redhat/dependencies/qt3/qt-x11-free-3.3.6-strip.patch
diff --git a/redhat/qt3/qt-x11-free-3.3.7-arm.patch b/redhat/dependencies/qt3/qt-x11-free-3.3.7-arm.patch
index 0c93c416a..0c93c416a 100644
--- a/redhat/qt3/qt-x11-free-3.3.7-arm.patch
+++ b/redhat/dependencies/qt3/qt-x11-free-3.3.7-arm.patch
diff --git a/redhat/qt3/qt-x11-free-3.3.7-umask.patch b/redhat/dependencies/qt3/qt-x11-free-3.3.7-umask.patch
index f2351909f..f2351909f 100644
--- a/redhat/qt3/qt-x11-free-3.3.7-umask.patch
+++ b/redhat/dependencies/qt3/qt-x11-free-3.3.7-umask.patch
diff --git a/redhat/qt3/qt-x11-free-3.3.8-odbc.patch b/redhat/dependencies/qt3/qt-x11-free-3.3.8-odbc.patch
index 6f21e3cf1..6f21e3cf1 100644
--- a/redhat/qt3/qt-x11-free-3.3.8-odbc.patch
+++ b/redhat/dependencies/qt3/qt-x11-free-3.3.8-odbc.patch
diff --git a/redhat/qt3/qt-x11-free-3.3.8b-typo.patch b/redhat/dependencies/qt3/qt-x11-free-3.3.8b-typo.patch
index c1ff66c2c..c1ff66c2c 100644
--- a/redhat/qt3/qt-x11-free-3.3.8b-typo.patch
+++ b/redhat/dependencies/qt3/qt-x11-free-3.3.8b-typo.patch
diff --git a/redhat/qt3/qt-x11-free-3.3.8b-uic-multilib.patch b/redhat/dependencies/qt3/qt-x11-free-3.3.8b-uic-multilib.patch
index 341cab7e1..341cab7e1 100644
--- a/redhat/qt3/qt-x11-free-3.3.8b-uic-multilib.patch
+++ b/redhat/dependencies/qt3/qt-x11-free-3.3.8b-uic-multilib.patch
diff --git a/redhat/qt3/qt.csh b/redhat/dependencies/qt3/qt.csh
index 93fd941ed..93fd941ed 100755
--- a/redhat/qt3/qt.csh
+++ b/redhat/dependencies/qt3/qt.csh
diff --git a/redhat/qt3/qt.sh b/redhat/dependencies/qt3/qt.sh
index f9ca654c1..f9ca654c1 100755
--- a/redhat/qt3/qt.sh
+++ b/redhat/dependencies/qt3/qt.sh
diff --git a/redhat/qt3/qt3-3.3.8.d-updates_zh-tw_translations.patch b/redhat/dependencies/qt3/qt3-3.3.8.d-updates_zh-tw_translations.patch
index c5da1ad4c..c5da1ad4c 100644
--- a/redhat/qt3/qt3-3.3.8.d-updates_zh-tw_translations.patch
+++ b/redhat/dependencies/qt3/qt3-3.3.8.d-updates_zh-tw_translations.patch
diff --git a/redhat/qt3/qt3.spec b/redhat/dependencies/qt3/qt3.spec
index fcadb5b6d..fcadb5b6d 100644
--- a/redhat/qt3/qt3.spec
+++ b/redhat/dependencies/qt3/qt3.spec
diff --git a/redhat/qt3/qtconfig3.desktop b/redhat/dependencies/qt3/qtconfig3.desktop
index 11df0abab..11df0abab 100644
--- a/redhat/qt3/qtconfig3.desktop
+++ b/redhat/dependencies/qt3/qtconfig3.desktop
diff --git a/redhat/dependencies/tqca-tls/qca-tls-1.0-mach.patch b/redhat/dependencies/tqca-tls/qca-tls-1.0-mach.patch
new file mode 100644
index 000000000..9bac68b83
--- /dev/null
+++ b/redhat/dependencies/tqca-tls/qca-tls-1.0-mach.patch
@@ -0,0 +1,10 @@
+--- ./qca-tls.pro.mach	2004-06-10 11:55:22.411187448 +0200
++++ ./qca-tls.pro	2004-06-10 11:55:43.460987392 +0200
+@@ -2,6 +2,7 @@
+ 
+ TEMPLATE = lib
+ CONFIG  += qt thread release plugin
++CONFIG += no_fixpath
+ TARGET   = qca-tls
+ 
+ !exists(qcaprovider.h) {
diff --git a/redhat/dependencies/tqca-tls/qca-tls-1.0-ossl10.patch b/redhat/dependencies/tqca-tls/qca-tls-1.0-ossl10.patch
new file mode 100644
index 000000000..7b2406f61
--- /dev/null
+++ b/redhat/dependencies/tqca-tls/qca-tls-1.0-ossl10.patch
@@ -0,0 +1,15 @@
+diff -up qca-tls-1.0/qca-tls.cpp.ossl10 qca-tls-1.0/qca-tls.cpp
+--- qca-tls-1.0/qca-tls.cpp.ossl10	2009-08-26 10:08:36.000000000 +0200
++++ qca-tls-1.0/qca-tls.cpp	2009-08-26 10:11:57.000000000 +0200
+@@ -953,7 +953,11 @@ public:
+ 	RSAKeyContext *key;
+ 
+ 	SSL *ssl;
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++	const SSL_METHOD *method;
++#else
+ 	SSL_METHOD *method;
++#endif
+ 	SSL_CTX *context;
+ 	BIO *rbio, *wbio;
+ 	CertContext cc;
diff --git a/redhat/dependencies/tqca-tls/tqca-tls-qmake-tqt3.patch b/redhat/dependencies/tqca-tls/tqca-tls-qmake-tqt3.patch
new file mode 100644
index 000000000..5dd7c5a47
--- /dev/null
+++ b/redhat/dependencies/tqca-tls/tqca-tls-qmake-tqt3.patch
@@ -0,0 +1,74 @@
+diff -Nuar tqca-tls.ORI//configure tqca-tls.P//configure
+--- tqca-tls.ORI//configure	2012-02-18 11:09:57.695893820 +0100
++++ tqca-tls.P//configure	2012-02-18 11:28:09.442846406 +0100
+@@ -60,7 +60,7 @@
+ 	if [ "$QC_DEBUG" = "Y" ]; then
+ 		echo \$QTDIR not set... trying to find Qt manually
+ 	fi
+-	for p in /usr/lib/tqt /usr/share/tqt /usr/share/tqt3 /usr/local/lib/tqt /usr/local/share/tqt /usr/lib/tqt3 /usr/local/lib/tqt3 /usr/lib/qt /usr/share/qt /usr/share/qt3 /usr/local/lib/qt /usr/local/share/qt /usr/lib/qt3 /usr/local/lib/qt3 /usr/X11R6/share/qt /usr/qt/3 ; do
++	for p in /usr/lib64/tqt /usr/lib/tqt /usr/share/tqt /usr/share/tqt3 /usr/local/lib64/tqt /usr/local/lib/tqt /usr/local/share/tqt /usr/lib64/tqt3 /usr/lib/tqt3 /usr/local/lib64/tqt3 /usr/local/lib/tqt3 /usr/lib64/qt /usr/lib/qt /usr/share/qt /usr/share/qt3 /usr/local/lib64/qt /usr/local/lib/qt /usr/local/share/qt /usr/lib64/qt3 /usr/lib/qt3 /usr/local/lib64/qt3 /usr/local/lib/qt3 /usr/X11R6/share/qt /usr/qt/3 ; do
+ 		if [ -d "$p/mkspecs" ]; then
+ 			QTDIR=$p
+ 			break;
+@@ -79,15 +79,15 @@
+ 	fi
+ fi
+ 
+-if [ ! -x "$QTDIR/bin/qmake" ]; then
++if [ ! -x "$QTDIR/bin/qmake-tqt3" ]; then
+ 	if [ "$QC_DEBUG" = "Y" ]; then
+-		echo Warning: qmake not in \$QTDIR/bin/qmake
++		echo Warning: qmake-tqt3 not in \$QTDIR/bin/qmake-tqt3
+ 		echo trying to find it in \$PATH
+ 	fi
+-	qm=`type -p qmake`
++	qm=`type -p qmake-tqt3`
+ 	if [ -x "$qm" ]; then
+ 		if [ "$QC_DEBUG" = "Y" ]; then
+-			echo qmake found in $qm
++			echo qmake-tqt3 found in $qm
+ 		fi
+ 	else
+ 		echo fail
+@@ -96,12 +96,12 @@
+ 		echo or I missdetected \$QTDIR=$QTDIR
+ 		echo
+ 		echo Please set \$QTDIR manually and make sure that
+-		echo \$QTDIR/bin/qmake exists.
++		echo \$QTDIR/bin/qmake-tqt3 exists.
+ 		echo
+ 		exit 1;
+ 	fi
+ else
+-	qm=$QTDIR/bin/qmake
++	qm=$QTDIR/bin/qmake-tqt3
+ fi
+ 
+ gen_files() {
+@@ -185,6 +185,8 @@
+ 
+ 		// Make sure tqtinterface can be found
+ 		conf->addIncludePath("/usr/include/tqt");
++		// Make sure tqt3 can be found
++		conf->addIncludePath("/usr/include/tqt3");
+ 
+ 		return true;
+ 	}
+@@ -507,7 +509,7 @@
+ TEMPLATE = app
+ CONFIG += qt x11 thread console
+ TARGET = conf
+-INCLUDEPATH += '/usr/include/tqt'
++INCLUDEPATH += '/usr/include/tqt' '/usr/include/tqt3'
+ 
+ DEFINES += X11_INC='"\$\$QMAKE_INCDIR_X11"'
+ DEFINES += X11_LIBDIR='"\$\$QMAKE_LIBDIR_X11"'
+@@ -533,7 +535,7 @@
+ )
+ 
+ if [ "$?" != "0" ]; then
+-	rm -rf .qconftemp
++#	rm -rf .qconftemp
+ 	echo fail
+ 	echo
+ 	echo "There was an error compiling 'conf'.  Be sure you have a proper"
diff --git a/redhat/dependencies/tqca-tls/tqca-tls.spec b/redhat/dependencies/tqca-tls/tqca-tls.spec
new file mode 100644
index 000000000..4f1cb6fa4
--- /dev/null
+++ b/redhat/dependencies/tqca-tls/tqca-tls.spec
@@ -0,0 +1,69 @@
+%define _prefix /usr
+
+Name:		tqca-tls
+Version:	r14
+Release:	1%{?dist}
+
+Summary:	TLS plugin for the Qt Cryptographic Architecture
+License:	LGPLv2+
+Group:		Applications/Internet
+
+URL:		http://delta.affinix.com/qca/
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Source0:	%{name}-%{version}.tar.gz
+
+# Fix build in mach for QT apps
+Patch0:		qca-tls-1.0-mach.patch
+# Missing ifdefs for openssl 0.9.8
+Patch1:     qca-tls-1.0-ossl098.patch
+# Build with openssl 1.0.0
+Patch2:     qca-tls-1.0-ossl10.patch
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Patch10:	tqca-tls-qmake-tqt3.patch
+
+BuildRequires:	tqt3-devel >= 3.4.0
+# To build with openssl 0.9.7, disable patch1
+BuildRequires:	openssl-devel >= 0.9.8
+
+
+%description
+This is a plugin to provide SSL/TLS capability to programs that use the TQt
+Cryptographic Architecture (TQCA).  TQCA is a library providing an easy API
+for several cryptographic algorithms to TQt programs.  This package only
+contains the TLS plugin.
+
+%prep
+%setup -q -n dependencies/%{name}
+%patch0 -p0 -b .mach
+#patch1 -p0 -b .ossl098
+%patch2 -p1 -b .ossl10
+%patch10 -p1
+
+%build
+./configure \
+  --qtdir=/usr
+%__make %{?_smp_mflags}
+
+
+%install
+%__rm -rf %{?buildroot}
+%__mkdir -p %{?buildroot}%{_libdir}/tqt3/plugins/crypto
+%__make install INSTALL_ROOT=%{?buildroot}
+
+
+%clean
+%__rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(0644,root,root,0755)
+%doc README COPYING
+%attr(755,root,root) %{_libdir}/tqt3/plugins/crypto
+
+
+%changelog
+* Sat Feb 18 2012 Francois Andriot <francois.andriot@free.fr> - r14-1
+- Initial build for TDE R14
+- Spec file based on Fedora 12 'qca-tls-1.0-18'
diff --git a/redhat/tqt3/0084-compositing-properties.patch b/redhat/dependencies/tqt3/0084-compositing-properties.patch
index 368b6c267..368b6c267 100644
--- a/redhat/tqt3/0084-compositing-properties.patch
+++ b/redhat/dependencies/tqt3/0084-compositing-properties.patch
diff --git a/redhat/tqt3/assistant3.desktop b/redhat/dependencies/tqt3/assistant3.desktop
index 49e718c5d..49e718c5d 100644
--- a/redhat/tqt3/assistant3.desktop
+++ b/redhat/dependencies/tqt3/assistant3.desktop
diff --git a/redhat/tqt3/designer3.desktop b/redhat/dependencies/tqt3/designer3.desktop
index 23f1f549a..23f1f549a 100644
--- a/redhat/tqt3/designer3.desktop
+++ b/redhat/dependencies/tqt3/designer3.desktop
diff --git a/redhat/tqt3/linguist3.desktop b/redhat/dependencies/tqt3/linguist3.desktop
index c6fce02c8..c6fce02c8 100644
--- a/redhat/tqt3/linguist3.desktop
+++ b/redhat/dependencies/tqt3/linguist3.desktop
diff --git a/redhat/tqt3/qt-3.1.0-makefile.patch b/redhat/dependencies/tqt3/qt-3.1.0-makefile.patch
index 7d8ae65a2..7d8ae65a2 120000
--- a/redhat/tqt3/qt-3.1.0-makefile.patch
+++ b/redhat/dependencies/tqt3/qt-3.1.0-makefile.patch
diff --git a/redhat/tqt3/qt-3.3.4-print-CJK.patch b/redhat/dependencies/tqt3/qt-3.3.4-print-CJK.patch
index 99cdc6e1d..99cdc6e1d 120000
--- a/redhat/tqt3/qt-3.3.4-print-CJK.patch
+++ b/redhat/dependencies/tqt3/qt-3.3.4-print-CJK.patch
diff --git a/redhat/tqt3/qt-3.3.6-fontrendering-gu-228452.patch b/redhat/dependencies/tqt3/qt-3.3.6-fontrendering-gu-228452.patch
index b015af122..b015af122 120000
--- a/redhat/tqt3/qt-3.3.6-fontrendering-gu-228452.patch
+++ b/redhat/dependencies/tqt3/qt-3.3.6-fontrendering-gu-228452.patch
diff --git a/redhat/tqt3/qt-3.3.6-fontrendering-ml_IN-209974.patch b/redhat/dependencies/tqt3/qt-3.3.6-fontrendering-ml_IN-209974.patch
index 388a5cbe5..388a5cbe5 120000
--- a/redhat/tqt3/qt-3.3.6-fontrendering-ml_IN-209974.patch
+++ b/redhat/dependencies/tqt3/qt-3.3.6-fontrendering-ml_IN-209974.patch
diff --git a/redhat/tqt3/qt-3.3.6-fontrendering-te_IN-211259.patch b/redhat/dependencies/tqt3/qt-3.3.6-fontrendering-te_IN-211259.patch
index 93c6ba3d8..93c6ba3d8 120000
--- a/redhat/tqt3/qt-3.3.6-fontrendering-te_IN-211259.patch
+++ b/redhat/dependencies/tqt3/qt-3.3.6-fontrendering-te_IN-211259.patch
diff --git a/redhat/tqt3/qt-3.3.8-fontrendering-as_IN-209972.patch b/redhat/dependencies/tqt3/qt-3.3.8-fontrendering-as_IN-209972.patch
index 4ded8f792..4ded8f792 120000
--- a/redhat/tqt3/qt-3.3.8-fontrendering-as_IN-209972.patch
+++ b/redhat/dependencies/tqt3/qt-3.3.8-fontrendering-as_IN-209972.patch
diff --git a/redhat/tqt3/qt-x11-free-3.3.4-fullscreen.patch b/redhat/dependencies/tqt3/qt-x11-free-3.3.4-fullscreen.patch
index 09d41d4b3..09d41d4b3 120000
--- a/redhat/tqt3/qt-x11-free-3.3.4-fullscreen.patch
+++ b/redhat/dependencies/tqt3/qt-x11-free-3.3.4-fullscreen.patch
diff --git a/redhat/tqt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch b/redhat/dependencies/tqt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch
index f8342f9f9..f8342f9f9 120000
--- a/redhat/tqt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch
+++ b/redhat/dependencies/tqt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch
diff --git a/redhat/tqt3/qt-x11-free-3.3.6-strip.patch b/redhat/dependencies/tqt3/qt-x11-free-3.3.6-strip.patch
index 7121216bc..7121216bc 120000
--- a/redhat/tqt3/qt-x11-free-3.3.6-strip.patch
+++ b/redhat/dependencies/tqt3/qt-x11-free-3.3.6-strip.patch
diff --git a/redhat/tqt3/qt-x11-free-3.3.7-arm.patch b/redhat/dependencies/tqt3/qt-x11-free-3.3.7-arm.patch
index b7682272a..b7682272a 120000
--- a/redhat/tqt3/qt-x11-free-3.3.7-arm.patch
+++ b/redhat/dependencies/tqt3/qt-x11-free-3.3.7-arm.patch
diff --git a/redhat/tqt3/qt-x11-free-3.3.8b-typo.patch b/redhat/dependencies/tqt3/qt-x11-free-3.3.8b-typo.patch
index 4e2537345..4e2537345 120000
--- a/redhat/tqt3/qt-x11-free-3.3.8b-typo.patch
+++ b/redhat/dependencies/tqt3/qt-x11-free-3.3.8b-typo.patch
diff --git a/redhat/tqt3/qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch b/redhat/dependencies/tqt3/qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch
index 5e5d9773a..5e5d9773a 100644
--- a/redhat/tqt3/qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch
+++ b/redhat/dependencies/tqt3/qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch
diff --git a/redhat/tqt3/qt-x11-immodule-unified-qt3.3.8-20071116.diff.bz2 b/redhat/dependencies/tqt3/qt-x11-immodule-unified-qt3.3.8-20071116.diff.bz2
index 7c122a375..7c122a375 100644
--- a/redhat/tqt3/qt-x11-immodule-unified-qt3.3.8-20071116.diff.bz2
+++ b/redhat/dependencies/tqt3/qt-x11-immodule-unified-qt3.3.8-20071116.diff.bz2
diff --git a/redhat/tqt3/qt.csh b/redhat/dependencies/tqt3/qt.csh
index 7efcd89c5..7efcd89c5 100755
--- a/redhat/tqt3/qt.csh
+++ b/redhat/dependencies/tqt3/qt.csh
diff --git a/redhat/tqt3/qt.sh b/redhat/dependencies/tqt3/qt.sh
index 88b3e0cea..88b3e0cea 100755
--- a/redhat/tqt3/qt.sh
+++ b/redhat/dependencies/tqt3/qt.sh
diff --git a/redhat/tqt3/qt3-3.3.8.d-updates_zh-tw_translations.patch b/redhat/dependencies/tqt3/qt3-3.3.8.d-updates_zh-tw_translations.patch
index 06a4852dc..06a4852dc 120000
--- a/redhat/tqt3/qt3-3.3.8.d-updates_zh-tw_translations.patch
+++ b/redhat/dependencies/tqt3/qt3-3.3.8.d-updates_zh-tw_translations.patch
diff --git a/redhat/tqt3/qtconfig3.desktop b/redhat/dependencies/tqt3/qtconfig3.desktop
index 11df0abab..11df0abab 100644
--- a/redhat/tqt3/qtconfig3.desktop
+++ b/redhat/dependencies/tqt3/qtconfig3.desktop
diff --git a/redhat/tqt3/tqt3-3.4.0-embed.patch b/redhat/dependencies/tqt3/tqt3-3.4.0-embed.patch
index 10d7704ae..10d7704ae 100644
--- a/redhat/tqt3/tqt3-3.4.0-embed.patch
+++ b/redhat/dependencies/tqt3/tqt3-3.4.0-embed.patch
diff --git a/redhat/tqt3/tqt3-3.4.0-fontrendering-#214570.patch b/redhat/dependencies/tqt3/tqt3-3.4.0-fontrendering-#214570.patch
index 77ca43101..77ca43101 100644
--- a/redhat/tqt3/tqt3-3.4.0-fontrendering-#214570.patch
+++ b/redhat/dependencies/tqt3/tqt3-3.4.0-fontrendering-#214570.patch
diff --git a/redhat/tqt3/tqt3-3.4.0-fontrendering-214371.patch b/redhat/dependencies/tqt3/tqt3-3.4.0-fontrendering-214371.patch
index 9dca7998d..9dca7998d 100644
--- a/redhat/tqt3/tqt3-3.4.0-fontrendering-214371.patch
+++ b/redhat/dependencies/tqt3/tqt3-3.4.0-fontrendering-214371.patch
diff --git a/redhat/tqt3/tqt3-3.4.0-fontrendering-ml_IN-209097.patch b/redhat/dependencies/tqt3/tqt3-3.4.0-fontrendering-ml_IN-209097.patch
index cdb543b25..cdb543b25 100644
--- a/redhat/tqt3/tqt3-3.4.0-fontrendering-ml_IN-209097.patch
+++ b/redhat/dependencies/tqt3/tqt3-3.4.0-fontrendering-ml_IN-209097.patch
diff --git a/redhat/tqt3/tqt3-3.4.0-fontrendering-ml_IN-217657.patch b/redhat/dependencies/tqt3/tqt3-3.4.0-fontrendering-ml_IN-217657.patch
index 276441c22..276441c22 100644
--- a/redhat/tqt3/tqt3-3.4.0-fontrendering-ml_IN-217657.patch
+++ b/redhat/dependencies/tqt3/tqt3-3.4.0-fontrendering-ml_IN-217657.patch
diff --git a/redhat/tqt3/tqt3-3.4.0-nodebug.patch b/redhat/dependencies/tqt3/tqt3-3.4.0-nodebug.patch
index ccfd411ff..ccfd411ff 100644
--- a/redhat/tqt3/tqt3-3.4.0-nodebug.patch
+++ b/redhat/dependencies/tqt3/tqt3-3.4.0-nodebug.patch
diff --git a/redhat/tqt3/tqt3-3.4.0-odbc.patch b/redhat/dependencies/tqt3/tqt3-3.4.0-odbc.patch
index 3a5aea885..3a5aea885 100644
--- a/redhat/tqt3/tqt3-3.4.0-odbc.patch
+++ b/redhat/dependencies/tqt3/tqt3-3.4.0-odbc.patch
diff --git a/redhat/tqt3/tqt3-3.4.0-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch b/redhat/dependencies/tqt3/tqt3-3.4.0-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch
index 88e066aa9..88e066aa9 100644
--- a/redhat/tqt3/tqt3-3.4.0-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch
+++ b/redhat/dependencies/tqt3/tqt3-3.4.0-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch
diff --git a/redhat/tqt3/tqt3-3.4.0-quiet.patch b/redhat/dependencies/tqt3/tqt3-3.4.0-quiet.patch
index cb6080ab5..cb6080ab5 100644
--- a/redhat/tqt3/tqt3-3.4.0-quiet.patch
+++ b/redhat/dependencies/tqt3/tqt3-3.4.0-quiet.patch
diff --git a/redhat/tqt3/tqt3-3.4.0-uic-nostdlib.patch b/redhat/dependencies/tqt3/tqt3-3.4.0-uic-nostdlib.patch
index 39a42e6f5..39a42e6f5 100644
--- a/redhat/tqt3/tqt3-3.4.0-uic-nostdlib.patch
+++ b/redhat/dependencies/tqt3/tqt3-3.4.0-uic-nostdlib.patch
diff --git a/redhat/tqt3/tqt3-3.4.0-umask.patch b/redhat/dependencies/tqt3/tqt3-3.4.0-umask.patch
index 9c24f9903..9c24f9903 100644
--- a/redhat/tqt3/tqt3-3.4.0-umask.patch
+++ b/redhat/dependencies/tqt3/tqt3-3.4.0-umask.patch
diff --git a/redhat/tqt3/tqt3-3.4.0.spec b/redhat/dependencies/tqt3/tqt3-3.4.0.spec
index 87d7d2bd4..f2530f3b4 100644
--- a/redhat/tqt3/tqt3-3.4.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-3.4.0.spec
@@ -20,18 +20,18 @@ Version: 3.4.0
 Release: 1%{?dist}
 Name: tqt3
 
-Obsoletes: qt < 1:%{version}-%{release}
-Provides: qt = 1:%{version}-%{release}
-Obsoletes: qt3 < 1:%{version}-%{release}
-Provides: qt3 = 1:%{version}-%{release}
+#Obsoletes: qt < 1:%{version}-%{release}
+#Provides: qt = 1:%{version}-%{release}
+#Obsoletes: qt3 < 1:%{version}-%{release}
+#Provides: qt3 = 1:%{version}-%{release}
 
 License: QPL or GPLv2 or GPLv3
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Url: http://www.troll.no
 Source0: %{name}-%{version}.tar.gz
-Source2: qt.sh
-Source3: qt.csh
+#Source2: qt.sh
+#Source3: qt.csh
 Source4: designer3.desktop
 Source5: assistant3.desktop
 Source6: linguist3.desktop
@@ -70,11 +70,6 @@ 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
 
@@ -141,10 +136,10 @@ BuildRequires: sqlite-devel
 Summary: Graphical configuration tool for programs using Qt 3
 Group: User Interface/Desktops
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: qt-config < 1:%{version}-%{release}
-Provides:  qt-config = 1:%{version}-%{release}
-Obsoletes: qt3-config < 1:%{version}-%{release}
-Provides:  qt3-config = 1:%{version}-%{release}
+#Obsoletes: qt-config < 1:%{version}-%{release}
+#Provides:  qt-config = 1:%{version}-%{release}
+#Obsoletes: qt3-config < 1:%{version}-%{release}
+#Provides:  qt3-config = 1:%{version}-%{release}
 
 
 %package devel
@@ -170,10 +165,10 @@ Requires: libmng-devel
 Requires: mesa-libGL-devel
 Requires: mesa-libGLU-devel
 
-Obsoletes: qt-devel < 1:%{version}-%{release}
-Provides:  qt-devel = 1:%{version}-%{release}
-Obsoletes: qt3-devel < 1:%{version}-%{release}
-Provides:  qt3-devel = 1:%{version}-%{release}
+#Obsoletes: qt-devel < 1:%{version}-%{release}
+#Provides:  qt-devel = 1:%{version}-%{release}
+#Obsoletes: qt3-devel < 1:%{version}-%{release}
+#Provides:  qt3-devel = 1:%{version}-%{release}
 
 
 %package devel-docs
@@ -181,10 +176,10 @@ Summary: Documentation for the Qt 3 GUI toolkit
 Group: Development/Libraries
 Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
-Obsoletes: qt-devel-docs < 1:%{version}-%{release}
-Provides:  qt-devel-docs = 1:%{version}-%{release}
-Obsoletes: qt3-devel-docs < 1:%{version}-%{release}
-Provides:  qt3-devel-docs = 1:%{version}-%{release}
+#Obsoletes: qt-devel-docs < 1:%{version}-%{release}
+#Provides:  qt-devel-docs = 1:%{version}-%{release}
+#Obsoletes: qt3-devel-docs < 1:%{version}-%{release}
+#Provides:  qt3-devel-docs = 1:%{version}-%{release}
 
 
 %package ODBC
@@ -192,10 +187,10 @@ Summary: ODBC drivers for Qt 3's SQL classes
 Group: System Environment/Libraries
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
-Obsoletes: qt-ODBC < 1:%{version}-%{release}
-Provides:  qt-ODBC = 1:%{version}-%{release}
-Obsoletes: qt3-ODBC < 1:%{version}-%{release}
-Provides:  qt3-ODBC = 1:%{version}-%{release}
+#Obsoletes: qt-ODBC < 1:%{version}-%{release}
+#Provides:  qt-ODBC = 1:%{version}-%{release}
+#Obsoletes: qt3-ODBC < 1:%{version}-%{release}
+#Provides:  qt3-ODBC = 1:%{version}-%{release}
 
 
 %package MySQL
@@ -203,10 +198,10 @@ Summary: MySQL drivers for Qt 3's SQL classes
 Group: System Environment/Libraries
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
-Obsoletes: qt-MySQL < 1:%{version}-%{release}
-Provides:  qt-MySQL = 1:%{version}-%{release}
-Obsoletes: qt3-MySQL < 1:%{version}-%{release}
-Provides:  qt3-MySQL = 1:%{version}-%{release}
+#Obsoletes: qt-MySQL < 1:%{version}-%{release}
+#Provides:  qt-MySQL = 1:%{version}-%{release}
+#Obsoletes: qt3-MySQL < 1:%{version}-%{release}
+#Provides:  qt3-MySQL = 1:%{version}-%{release}
 
 
 %package PostgreSQL
@@ -214,10 +209,10 @@ Summary: PostgreSQL drivers for Qt 3's SQL classes
 Group: System Environment/Libraries
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
-Obsoletes: qt-PostgreSQL < 1:%{version}-%{release}
-Provides:  qt-PostgreSQL = 1:%{version}-%{release}
-Obsoletes: qt3-PostgreSQL < 1:%{version}-%{release}
-Provides:  qt3-PostgreSQL = 1:%{version}-%{release}
+#Obsoletes: qt-PostgreSQL < 1:%{version}-%{release}
+#Provides:  qt-PostgreSQL = 1:%{version}-%{release}
+#Obsoletes: qt3-PostgreSQL < 1:%{version}-%{release}
+#Provides:  qt3-PostgreSQL = 1:%{version}-%{release}
 
 
 %package sqlite
@@ -225,10 +220,10 @@ Summary: sqlite drivers for Qt 3's SQL classes
 Group: System Environment/Libraries
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
-Obsoletes: qt-sqlite < 1:%{version}-%{release}
-Provides:  qt-sqlite = 1:%{version}-%{release}
-Obsoletes: qt3-sqlite < 1:%{version}-%{release}
-Provides:  qt3-sqlite = 1:%{version}-%{release}
+#Obsoletes: qt-sqlite < 1:%{version}-%{release}
+#Provides:  qt-sqlite = 1:%{version}-%{release}
+#Obsoletes: qt3-sqlite < 1:%{version}-%{release}
+#Provides:  qt3-sqlite = 1:%{version}-%{release}
 
 
 %package designer
@@ -236,10 +231,10 @@ Summary: In3erface designer (IDE) for the Qt 3 toolkit
 Group: Development/Tools
 Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
-Obsoletes: qt-designer < 1:%{version}-%{release}
-Provides:  qt-designer = 1:%{version}-%{release}
-Obsoletes: qt3-designer < 1:%{version}-%{release}
-Provides:  qt3-designer = 1:%{version}-%{release}
+#Obsoletes: qt-designer < 1:%{version}-%{release}
+#Provides:  qt-designer = 1:%{version}-%{release}
+#Obsoletes: qt3-designer < 1:%{version}-%{release}
+#Provides:  qt3-designer = 1:%{version}-%{release}
 
 
 %description
@@ -343,15 +338,6 @@ 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}
-
-%if %{smp}
-   export SMP_MFLAGS="%{?_smp_mflags}"
-%endif
-
 %if %{immodule}
    sh ./make-symlinks.sh
 %endif
@@ -375,8 +361,14 @@ fi
 
 # build shared, threaded (default) libraries
 echo yes | ./configure \
-  -prefix $QTDEST \
-  -docdir %{qt_docdir} \
+  -prefix "%{_prefix}" \
+  -libdir "%{_libdir}" \
+  -docdir "%{_docdir}/%{name}-%{version}" \
+  -sysconfdir "%{_sysconfdir}/%{name}" \
+  -datadir "%{_datadir}/%{name}" \
+  -headerdir "%{_includedir}/%{name}" \
+  -plugindir "%{_libdir}/%{name}/plugins" \
+  -translationdir "%{_datadir}/%{name}/translations" \
 %if %{_lib} == lib64
   -platform linux-g++-64 \
 %else
@@ -422,7 +414,8 @@ echo yes | ./configure \
   -xft \
   -tablet
 
-make $SMP_MFLAGS src-qmake
+%__make %{?_smp_mflags} src-qmake
+
 
 # build sqlite plugin
 pushd plugins/src/sqldrivers/sqlite
@@ -444,34 +437,25 @@ 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"
+%__make %{?_smp_mflags} src-moc
+%__make %{?_smp_mflags} sub-src
+%__make %{?_smp_mflags} sub-tools
 
 %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}
+%__rm -rf %{buildroot}
+%__make install INSTALL_ROOT=%{buildroot}
 
 for i in findtr qt20fix qtrename140 lrelease lupdate ; do
-   install bin/$i %{buildroot}%{qtdir}/bin/
+   %__install bin/$i %{buildroot}%{_bindir}
 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}/
+%__mkdir_p %{buildroot}%{_mandir}
+%__cp -fR doc/man/* %{buildroot}%{_mandir}/
 
 # clean up
-make -C tutorial clean
-make -C examples clean
+%__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...
@@ -484,42 +468,41 @@ 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
+  sed 's|^SYSCONF_MOC.*|SYSCONF_MOC		= %{_bindir}/moc|' < $a > ${a}.2
   mv -v ${a}.2 $a
 done
 
-mkdir -p %{buildroot}/etc/profile.d
-install -m 644 %{SOURCE2} %{SOURCE3} %{buildroot}/etc/profile.d/
-
 # Add desktop files
-mkdir -p %{buildroot}%{_datadir}/applications
+%__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
+perl -pi -e "s,-lqt ,-lqt-mt ,g;s,-lqt$,-lqt-mt,g" %{buildroot}%{_datadir}/%{name}/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
+%__rm -f %{buildroot}%{_datadir}/%{name}/mkspecs/default/linux-g++*
+%__rm -f %{buildroot}%{_libdir}/*.la
 
 # 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
+%__mkdir_p %{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
+%__mkdir_p %{buildroot}%{_libdir}/%{name}/plugins/styles
+
+# rename some binaries to make tqt3/4 installations possible
+for b in designer uic moc lupdate lrelease qmake qtconfig assistant linguist; do
+  %__mv -f %{buildroot}%{_bindir}/${b} %{buildroot}%{_bindir}/${b}-%{name}
+done
 
 %clean
-rm -rf %{buildroot}
+%__rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -528,55 +511,50 @@ rm -rf %{buildroot}
 %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/
+%dir %{_libdir}/%{name}/plugins
+%dir %{_libdir}/%{name}/plugins/sqldrivers
+%dir %{_libdir}/%{name}/plugins/styles
+%{_datadir}/%{name}/translations
+%{_libdir}/%{name}/plugins/designer/
 %if %{immodule}
-%{qtdir}/plugins/inputmethods
+%{_libdir}/%{name}/plugins/inputmethods
 %endif
-%config /etc/profile.d/*
-/etc/ld.so.conf.d/*
-%{qtdir}/lib/libtqui.so.*
-%{qtdir}/lib/libtqt*.so.*
+%{_libdir}/libtqui.so.*
+%{_libdir}/libtqt*.so.*
 
 # TQT 3.4.0: WTF is this file ??
 %exclude %{_mandir}/README
 
 %files config
 %defattr(-,root,root,-)
-%{qtdir}/bin/qtconfig
+%{_bindir}/qtconfig-%{name}
 %{_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/libtqt*.so
-%{qtdir}/lib/libtqui.so
-%{qtdir}/lib/libeditor.a
-%{qtdir}/lib/libdesigner*.a
-%{qtdir}/lib/libqassistantclient.a
-%{qtdir}/lib/*.prl
-%{qtdir}/phrasebooks
+%{_docdir}/%{name}-%{version}
+%{_bindir}/moc-%{name}
+%{_bindir}/uic-%{name}
+%{_bindir}/findtr
+%{_bindir}/qt20fix
+%{_bindir}/qtrename140
+%{_bindir}/assistant-%{name}
+%{_bindir}/qm2ts
+%{_bindir}/qmake-%{name}
+%{_bindir}/qembed
+%{_bindir}/linguist-%{name}
+%{_bindir}/lupdate-%{name}
+%{_bindir}/lrelease-%{name}
+%{_includedir}/%{name}
+%{_datadir}/%{name}/mkspecs
+%{_libdir}/libtqt*.so
+%{_libdir}/libtqui.so
+%{_libdir}/libeditor.a
+%{_libdir}/libdesigner*.a
+%{_libdir}/libqassistantclient.a
+%{_libdir}/*.prl
+%{_datadir}/%{name}/phrasebooks
 %{_libdir}/pkgconfig/*
 %{_datadir}/applications/*linguist*.desktop
 %{_datadir}/applications/*assistant*.desktop
@@ -584,51 +562,51 @@ rm -rf %{buildroot}
 %{_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
+%{_bindir}/createcw
+%{_bindir}/makeqpf
+%{_bindir}/mergetr
+%{_bindir}/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/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/jversion.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
+%exclude %{_includedir}/%{name}/btree.h
+%exclude %{_includedir}/%{name}/crc32.h
+%exclude %{_includedir}/%{name}/debian_qsql_odbc.h
+%exclude %{_includedir}/%{name}/deflate.h
+%exclude %{_includedir}/%{name}/ftglue.h
+%exclude %{_includedir}/%{name}/ftxgdef.h
+%exclude %{_includedir}/%{name}/ftxgpos.h
+%exclude %{_includedir}/%{name}/ftxgsub.h
+%exclude %{_includedir}/%{name}/ftxopen.h
+%exclude %{_includedir}/%{name}/ftxopenf.h
+%exclude %{_includedir}/%{name}/hash.h
+%exclude %{_includedir}/%{name}/inffast.h
+%exclude %{_includedir}/%{name}/inffixed.h
+%exclude %{_includedir}/%{name}/inflate.h
+%exclude %{_includedir}/%{name}/inftrees.h
+%exclude %{_includedir}/%{name}/jchuff.h
+%exclude %{_includedir}/%{name}/jconfig.h
+%exclude %{_includedir}/%{name}/jdct.h
+%exclude %{_includedir}/%{name}/jdhuff.h
+%exclude %{_includedir}/%{name}/jerror.h
+%exclude %{_includedir}/%{name}/jinclude.h
+%exclude %{_includedir}/%{name}/jmemsys.h
+%exclude %{_includedir}/%{name}/jmorecfg.h
+%exclude %{_includedir}/%{name}/jversion.h
+%exclude %{_includedir}/%{name}/moc_yacc.h
+%exclude %{_includedir}/%{name}/opcodes.h
+%exclude %{_includedir}/%{name}/os.h
+%exclude %{_includedir}/%{name}/otlbuffer.h
+%exclude %{_includedir}/%{name}/pager.h
+%exclude %{_includedir}/%{name}/parse.h
+%exclude %{_includedir}/%{name}/pngasmrd.h
+%exclude %{_includedir}/%{name}/pngconf.h
+%exclude %{_includedir}/%{name}/sqlite.h
+%exclude %{_includedir}/%{name}/sqliteInt.h
+%exclude %{_includedir}/%{name}/trees.h
+%exclude %{_includedir}/%{name}/vdbe.h
+%exclude %{_includedir}/%{name}/vdbeInt.h
+%exclude %{_datadir}/%{name}/mkspecs/linux-g++-sparc
 
 %files devel-docs
 %defattr(-,root,root,-)
@@ -638,24 +616,24 @@ rm -rf %{buildroot}
 
 %files sqlite
 %defattr(-,root,root,-)
-%{qtdir}/plugins/sqldrivers/libqsqlite.so
+%{_libdir}/%{name}/plugins/sqldrivers/libqsqlite.so
 
 %files ODBC
 %defattr(-,root,root,-)
-%{qtdir}/plugins/sqldrivers/libqsqlodbc.so
+%{_libdir}/%{name}/plugins/sqldrivers/libqsqlodbc.so
 
 %files PostgreSQL
 %defattr(-,root,root,-)
-%{qtdir}/plugins/sqldrivers/libqsqlpsql.so
+%{_libdir}/%{name}/plugins/sqldrivers/libqsqlpsql.so
 
 %files MySQL
 %defattr(-,root,root,-)
-%{qtdir}/plugins/sqldrivers/libqsqlmysql.so
+%{_libdir}/%{name}/plugins/sqldrivers/libqsqlmysql.so
 
 %files designer
 %defattr(-,root,root,-)
-%{qtdir}/templates
-%{qtdir}/bin/designer
+%{_datadir}/%{name}/templates
+%{_bindir}/designer-%{name}
 %{_datadir}/applications/*designer*.desktop
 %{_datadir}/pixmaps/designer3.png
 
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-r14.spec b/redhat/dependencies/tqtinterface/tqtinterface-r14.spec
new file mode 100755
index 000000000..97cfa834c
--- /dev/null
+++ b/redhat/dependencies/tqtinterface/tqtinterface-r14.spec
@@ -0,0 +1,91 @@
+# Always build under "/usr"
+%define _prefix /usr
+%define cmake_modules_dir %{_datadir}/cmake/Modules
+
+Name:		tqtinterface
+Version:	r14
+Release:	1%{?dist}
+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:		%{_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:	%{name}-%{version}.tar.gz
+
+
+BuildRequires:	cmake >= 2.8
+BuildRequires:	tqt3-devel >= 3.4.0
+BuildRequires:	gcc-c++
+BuildRequires:	libXi-devel
+BuildRequires:	pth-devel
+
+Requires:		tqt3 >= 3.4.0
+
+%description
+Trinity QT Interface
+
+%package devel
+Group:		Development/Libraries
+Summary:	%{name} - Development files
+Requires:	%{name} = %{version}-%{release}
+Requires:	tqt3-devel >= 3.4.0
+
+%description devel
+Development files for %{name}
+
+%prep
+%setup -q -n dependencies/%{name}
+
+%build
+%__mkdir build
+cd build
+%cmake \
+  -DQT_VERSION=3 \
+  -DINCLUDE_INSTALL_DIR=%{_includedir}/tqt \
+  -DMOC_EXECUTABLE=/usr/bin/moc-tqt3 \
+  -DUIC_EXECUTABLE=/usr/bin/uic-tqt3 \
+  ..
+
+%__make %{?_smp_mflags}
+
+
+%install
+%__rm -rf %{?buildroot}
+%__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}%{_includedir}/*.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}
+
+%files
+%{_bindir}/*
+%{_libdir}/*.so.*
+
+%files devel
+%{_includedir}/tqt/
+%{_libdir}/*.so
+%{_libdir}/*.la
+%{_libdir}/pkgconfig/*.pc
+%{cmake_modules_dir}/*.cmake
+
+
+%changelog
+* Tue Feb 14 2012 Francois Andriot <francois.andriot@free.fr> - r14-1
+- Initial build for TDE R14, using 'tqt3' instead of 'qt3'
diff --git a/redhat/extras/trinity-live/fedora-live-tde-base.ks b/redhat/extras/trinity-live/fedora-live-tde-base.ks
index 827a0b2bf..593b44ca1 100644
--- a/redhat/extras/trinity-live/fedora-live-tde-base.ks
+++ b/redhat/extras/trinity-live/fedora-live-tde-base.ks
@@ -86,6 +86,14 @@ touch /usr/share/icons/hicolor/
 mkdir -p /home/liveuser/Desktop
 mkdir -p /home/liveuser/Documents
 
+# Kmix (from TDE) should be started automatically
+#mkdir -p /home/liveuser/.trinity/Autostart
+#ln -sf /opt/trinity/share/applications/kde/kmix.desktop /home/liveuser/.trinity/Autostart/kmix.desktop
+cat <<EOF >/home/liveuser/.trinity/share/config/kmixrc
+Autostart=true
+Visible=false
+EOF
+
 # make sure to set the right permissions and selinux contexts
 chown -R liveuser:liveuser /home/liveuser/
 restorecon -R /home/liveuser/
@@ -97,7 +105,7 @@ EOF
 
 ### TDE LIVECD specific features ###
 
-# Sets 'nm-applet' to run automatically
+# Sets 'nm-applet' to run automatically (system-wide)
 ln -sf /usr/share/applications/nm-applet.desktop /opt/trinity/share/autostart/nm-applet.desktop
 
 %end
diff --git a/redhat/extras/trinity-live/fedora-livecd-tde.ks b/redhat/extras/trinity-live/fedora-livecd-tde.ks
index efc379f6a..b9e0f78f1 100644
--- a/redhat/extras/trinity-live/fedora-livecd-tde.ks
+++ b/redhat/extras/trinity-live/fedora-livecd-tde.ks
@@ -25,6 +25,7 @@ trinity-k3b
 trinity-kaffeine
 trinity-kasablanca
 trinity-kbookreader
+trinity-kdebluetooth
 trinity-kde-style-lipstik
 trinity-kgtk-qt3
 trinity-kio-umountwrapper
@@ -43,11 +44,10 @@ trinity-kde-i18n-French
 #trinity-kde-i18n-Spanish
 trinity-kde-i18n-Chinese-Big5
 
-
 # Fedora stuff
 fuse
 liveusb-creator
-
+yumex
 
 ### more desktop stuff
 fedora-icon-theme
diff --git a/redhat/extras/trinity-live/trinity-live.spec b/redhat/extras/trinity-live/trinity-live.spec
index 89f09e7f9..52c7612ad 100644
--- a/redhat/extras/trinity-live/trinity-live.spec
+++ b/redhat/extras/trinity-live/trinity-live.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.13
 %endif
-%define release 2
+%define release 3
 
 %define _datadir %{_usr}/share
 
@@ -79,6 +79,10 @@ EOF
 
 
 %changelog
+* Sat Jan 07 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
+- Start kmix automatically in LiveCD
+- Add 'yumex' package manager
+
 * Mon Dec 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
 - More TDE 3.5.13 specific visual settings
 - Updates all packages to fix TDE bugs
diff --git a/redhat/genrpm.sh b/redhat/genrpm.sh
index 68a82b470..20f8d45ce 100755
--- a/redhat/genrpm.sh
+++ b/redhat/genrpm.sh
@@ -121,5 +121,3 @@ if grep -q "error: Failed build dependencies:" ${LOGFILE}; then
 	set $( grep " is needed by " ${LOGFILE} | cut -d " " -f1 )
 	exit 2
 fi
-
-
diff --git a/redhat/kdelibs/tdelibs-r14.spec b/redhat/kdelibs/tdelibs-r14.spec
new file mode 100755
index 000000000..bbbcf60da
--- /dev/null
+++ b/redhat/kdelibs/tdelibs-r14.spec
@@ -0,0 +1,315 @@
+# 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 specific variables
+BuildRequires: cmake >= 2.8
+%define tde_docdir %{_docdir}/trinity
+%define tde_libdir %{_libdir}/trinity
+
+# Older RHEL/Fedora versions use packages named "qt", "qt-devel", ..
+# whereas newer versions use "qt3", "qt3-devel" ...
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 8
+%define _qt_suffix 3
+%endif
+
+
+Name:		tdelibs
+Version:	r14
+Release:	1%{?dist}%{?_variant}
+License:	GPL
+Summary:	TDE Libraries
+Group:		System Environment/Libraries
+
+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:	tdelibs-%{version}.tar.gz
+Patch0:		git.patch
+
+## [kdelibs/kio] Disable 'max line length' detection [Bug #656]
+Patch10:	kdelibs-3.5.13-maxlinelength.patch
+
+BuildRequires:	libtool
+BuildRequires:	tqtinterface-devel
+BuildRequires:	trinity-arts-devel
+BuildRequires:	avahi-devel
+BuildRequires:	lua-devel
+BuildRequires:	krb5-devel libxslt-devel cups-devel libart_lgpl-devel pcre-devel
+BuildRequires:	libutempter-devel
+BuildRequires:	bzip2-devel
+BuildRequires:	openssl-devel
+BuildRequires:	gcc-c++
+BuildRequires:	alsa-lib-devel
+BuildRequires:	libidn-devel
+BuildRequires:	tqt3-devel >= 3.4.0
+BuildRequires:	avahi-tqt-devel
+BuildRequires:	jasper-devel
+BuildRequires:	libtiff-devel
+BuildRequires:	OpenEXR-devel
+BuildRequires:	libtool-ltdl-devel
+BuildRequires:	glib2-devel
+BuildRequires:	gamin-devel
+BuildRequires:	xorg-x11-proto-devel
+
+Requires:		tqtinterface
+Requires:		trinity-arts
+Requires:		avahi
+Requires:		tqt3 >= 3.4.0
+Requires:		avahi-tqt
+
+Obsoletes:		trinity-kdelibs <= 3.5.13
+
+%if "%{?_prefix}" == "/usr"
+Provides:	kdelibs%{?_qt_suffix} = %{version}
+Obsoletes:		kdelibs%{?_qt_suffix} <= 3.5.10
+%endif
+
+%description
+Libraries for the Trinity Desktop Environment:
+KDE Libraries included: kdecore (KDE core library), kdeui (user interface),
+kfm (file manager), khtmlw (HTML widget), kio (Input/Output, networking),
+kspell (spelling checker), jscript (javascript), kab (addressbook),
+kimgio (image manipulation).
+
+
+%package devel
+Summary:	%{name} - Development files
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+Obsoletes:		trinity-kdelibs-devel <= 3.5.13
+%if "%{?_prefix}" == "/usr"
+Provides:	kdelibs%{?_qt_suffix}-devel = %{version}
+Obsoletes:	kdelibs%{?_qt_suffix}-devel <= 3.5.10
+%endif
+
+%description devel
+This package includes the header files you will need to compile
+applications for TDE.
+
+%package apidocs
+Group:		Development/Libraries
+Summary:	%{name} - API documentation
+Requires:	%{name} = %{version}-%{release}
+Obsoletes:		trinity-kdelibs-apidocs <= 3.5.13
+%if "%{?_prefix}" == "/usr"
+Provides:	kdelibs%{?_qt_suffix}-apidocs = %{version}
+Obsoletes:	kdelibs%{?_qt_suffix}-apidocs <= 3.5.10
+%endif
+
+%description apidocs
+This package includes the TDE API documentation in HTML
+format for easy browsing
+
+
+%prep
+%setup -q -n tdelibs
+#patch0 -p1
+%patch10 -p1
+
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LD_LIBRARY_PATH="%{_libdir}"
+export PKG_CONFIG_PATH="%{_libdir}/pkgconfig"
+export CMAKE_INCLUDE_PATH="%{_includedir}:%{_includedir}/tqt"
+
+%__mkdir build
+cd build
+%cmake \
+  -DHAVE_REAL_TQT=ON \
+  -DWITH_ARTS=ON \
+  -DWITH_ALSA=ON \
+  -DWITH_LIBART=ON \
+  -DWITH_LIBIDN=OFF \
+  -DWITH_SSL=ON \
+  -DWITH_CUPS=ON \
+  -DWITH_LUA=OFF \
+  -DWITH_TIFF=ON \
+  -DWITH_JASPER=ON \
+  -DWITH_OPENEXR=ON \
+  -DWITH_UTEMPTER=ON \
+  -DWITH_AVAHI=ON \
+  -DWITH_ASPELL=OFF \
+  -DWITH_HSPELL=OFF \
+  -DWITH_PCRE=ON \
+  -DWITH_INOTIFY=ON \
+  -DWITH_GAMIN=ON \
+  ..
+
+%__make %{?_smp_mflags}
+
+
+%install
+%__rm -rf %{?buildroot}
+%__make install DESTDIR=%{?buildroot} -C build
+
+%__mkdir_p %{?buildroot}%{_sysconfdir}/ld.so.conf.d
+cat <<EOF >%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf
+%if "%{?_prefix}" != "/usr"
+%{_libdir}
+%endif
+%{tde_libdir}
+EOF
+
+# Moves the XDG configuration files to TDE directory
+%if "%{_prefix}" != "/usr"
+  %__install -p -D -m644 \
+    "%{?buildroot}%{_sysconfdir}/xdg/menus/applications.menu" \
+    "%{?buildroot}%{_prefix}/etc/xdg/menus/kde-applications.menu"
+  %__rm -rf "%{?buildroot}%{_sysconfdir}/xdg"
+%else
+  %__mv -f "%{?buildroot}%{_sysconfdir}/xdg/menus/applications.menu" "%{?buildroot}%{_sysconfdir}/xdg/menus/kde-applications.menu"
+%endif
+
+
+%clean
+%__rm -rf %{?buildroot}
+
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+
+%files
+%defattr(-,root,root,-)
+%doc README
+%doc COPYING.LIB
+%{_bindir}/artsmessage
+%{_bindir}/cupsdconf
+%{_bindir}/cupsdoprint
+%{_bindir}/dcop
+%{_bindir}/dcopclient
+%{_bindir}/dcopfind
+%{_bindir}/dcopobject
+%{_bindir}/dcopquit
+%{_bindir}/dcopref
+%{_bindir}/dcopserver
+%{_bindir}/dcopserver_shutdown
+%{_bindir}/dcopstart
+%{_bindir}/filesharelist
+%{_bindir}/fileshareset
+%{_bindir}/imagetops
+%{_bindir}/kab2kabc
+%{_bindir}/kaddprinterwizard
+%{_bindir}/kbuildsycoca
+%{_bindir}/kcmshell
+%{_bindir}/kconf_update
+%{_bindir}/kcookiejar
+%{_bindir}/kde-config
+%{_bindir}/kde-menu
+%{_bindir}/kded
+%{_bindir}/kdeinit
+%{_bindir}/kdeinit_shutdown
+%{_bindir}/kdeinit_wrapper
+%{_bindir}/kdesu_stub
+%{_bindir}/kdontchangethehostname
+%{_bindir}/kdostartupconfig
+%{_bindir}/kfile
+%{_bindir}/kfmexec
+%{_bindir}/khotnewstuff
+%{_bindir}/kinstalltheme
+%{_bindir}/kio_http_cache_cleaner
+%{_bindir}/kio_uiserver
+%{_bindir}/kioexec
+%{_bindir}/kioslave
+%{_bindir}/klauncher
+%{_bindir}/kmailservice
+%{_bindir}/kmimelist
+%attr(4755,root,root) %{_bindir}/kpac_dhcp_helper
+%{_bindir}/ksendbugmail
+%{_bindir}/kshell
+%{_bindir}/kstartupconfig
+%{_bindir}/ktelnetservice
+%{_bindir}/ktradertest
+%{_bindir}/kwrapper
+%{_bindir}/lnusertemp
+%{_bindir}/make_driver_db_cups
+%{_bindir}/make_driver_db_lpr
+%{_bindir}/meinproc
+%{_bindir}/networkstatustestservice
+%{_bindir}/start_kdeinit
+%{_bindir}/start_kdeinit_wrapper
+%attr(4755,root,root) %{_bindir}/kgrantpty
+%{_libdir}/lib*.so.*
+%{_libdir}/libkdeinit_*.so
+%{_libdir}/lib*.la
+%{tde_libdir}/
+%{_datadir}/applications/kde/*.desktop
+%{_datadir}/autostart/kab2kabc.desktop
+%{_datadir}/applnk/kio_iso.desktop
+%{_datadir}/apps/*
+%exclude %{_datadir}/apps/ksgmltools2/
+%config(noreplace) %{_datadir}/config/*
+%{_datadir}/emoticons/*
+%{_datadir}/icons/default.kde
+%{_datadir}/mimelnk/magic
+%{_datadir}/mimelnk/*/*.desktop
+%{_datadir}/services/*
+%{_datadir}/servicetypes/*
+%{_datadir}/icons/crystalsvg/
+%{tde_docdir}/HTML/en/kspell
+# remove conflicts with kdelibs-4
+%if "%{?_prefix}" != "/usr"
+%{_bindir}/checkXML
+%{_bindir}/ksvgtopng
+%{_bindir}/kunittestmodrunner
+%{_bindir}/preparetips
+%{_datadir}/icons/hicolor/index.theme
+%{_datadir}/locale/all_languages
+%{tde_docdir}/HTML/en/common/*
+%else
+%exclude %{_bindir}/checkXML
+%exclude %{_bindir}/ksvgtopng
+%exclude %{_bindir}/kunittestmodrunner
+%exclude %{_bindir}/preparetips
+%exclude %{_datadir}/config/colors
+%exclude %{_datadir}/config/kdebug.areas
+%exclude %{_datadir}/config/kdebugrc
+%exclude %{_datadir}/config/ksslcalist
+%exclude %{_datadir}/config/ui/ui_standards.rc
+%exclude %{_datadir}/icons/hicolor/index.theme
+%exclude %{_datadir}/locale/all_languages
+%exclude %{tde_docdir}/HTML/en/common/*
+%endif
+%{_sysconfdir}/ld.so.conf.d/trinity.conf
+
+# Avoid conflict with 'redhat-menus' package
+%if "%{_prefix}" == "/usr"
+%{_sysconfdir}/xdg/menus/kde-applications.menu
+%else
+%{_prefix}/etc/xdg/menus/kde-applications.menu
+%endif
+
+# New in TDE 3.5.13
+%{_bindir}/kdetcompmgr
+
+%files devel
+%defattr(-,root,root,-)
+%{_bindir}/dcopidl*
+%{_bindir}/kconfig_compiler
+%{_bindir}/makekdewidgets
+%{_datadir}/apps/ksgmltools2/
+%{_includedir}/
+%{_libdir}/lib*.so
+%{_libdir}/lib*.a
+%exclude %{_libdir}/libkdeinit_*.so
+
+# New in TDE 3.5.13
+%{_datadir}/cmake/kdelibs.cmake
+
+%files apidocs
+%defattr(-,root,root,-)
+%{_docdir}/%{name}-%{version}/
+
+
+%changelog
+* Thu Feb 16 2012 Francois Andriot <francois.andriot@free.fr> - r14-1
+- Initial build for TDE R14, using 'tqt3' instead of 'qt3'
diff --git a/redhat/tdelibs b/redhat/tdelibs
new file mode 120000
index 000000000..028555378
--- /dev/null
+++ b/redhat/tdelibs
@@ -0,0 +1 @@
+kdelibs
\ No newline at end of file