RPM Packaging: update packages R14

12 files changed, 118 insertions, 196 deletions

diff --git a/redhat/applications/k9copy/k9copy-14.0.0.spec b/redhat/applications/k9copy/k9copy-14.0.0.spec
index 74c5402da..13f59ddd9 100644
--- a/redhat/applications/k9copy/k9copy-14.0.0.spec
+++ b/redhat/applications/k9copy/k9copy-14.0.0.spec
@@ -43,7 +43,6 @@ Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
 Patch1:			k9copy-14.0.0-fix_k3b_link.patch
 Patch2:			k9copy-3.5.13.2-ftbfs.patch
-Patch3:			k9copy-14.0.0-fix_author.patch
 
 BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
 BuildRequires:	trinity-arts-devel >= 1:1.5.10
@@ -73,7 +72,6 @@ This is the Trinity version.
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 %patch1 -p1 -b .ftbfs
 %patch2 -p1 -b .ftbfs
-%patch3 -p1 -b .k9author
 
 # Removes internal dvdread headers
 %__rm -rf dvdread
diff --git a/redhat/applications/kbiff/kbiff-14.0.0.spec b/redhat/applications/kbiff/kbiff-14.0.0.spec
index 23cc770bf..ac1633c80 100644
--- a/redhat/applications/kbiff/kbiff-14.0.0.spec
+++ b/redhat/applications/kbiff/kbiff-14.0.0.spec
@@ -35,10 +35,12 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
+BuildRequires:	tqt3-compat-headers >= 3.5.0
+BuildRequires:	libtqt4-devel >= 2:4.2.0
+BuildRequires:	trinity-arts-devel >= 2:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+
 BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
diff --git a/redhat/applications/kmymoney/kmymoney-14.0.0.spec b/redhat/applications/kmymoney/kmymoney-14.0.0.spec
index af1666131..0a169c4c1 100644
--- a/redhat/applications/kmymoney/kmymoney-14.0.0.spec
+++ b/redhat/applications/kmymoney/kmymoney-14.0.0.spec
@@ -75,8 +75,8 @@ BuildRequires:	openjade-devel
 %endif
 
 # TQT3-sqlite3
-BuildRequires:	trinity-tqt3-sqlite3
-Requires:		trinity-tqt3-sqlite3
+BuildRequires:	libtqt3-mt-sqlite3
+Requires:		libtqt3-mt-sqlite3
 
 Requires:		%{name}-common == %{version}-%{release}
 
diff --git a/redhat/applications/kpilot/kpilot-14.0.0.spec b/redhat/applications/kpilot/kpilot-14.0.0.spec
index 801b4b89f..3ae6d12ea 100644
--- a/redhat/applications/kpilot/kpilot-14.0.0.spec
+++ b/redhat/applications/kpilot/kpilot-14.0.0.spec
@@ -49,7 +49,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
 # FLEX
-%if 0%{?suse_version}
+%if 0%{?suse_version} || 0%{?mgaversion}
 BuildRequires:	flex
 %else
 BuildRequires:	flex-devel
@@ -66,7 +66,7 @@ software does for Windows.  KPilot can back-up and restore your Palm Pilot
 and synchronize the built-in applications with their TDE counterparts.
 
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos}
 %debug_package
 %endif
 
diff --git a/redhat/applications/ksensors/ksensors-14.0.0.spec b/redhat/applications/ksensors/ksensors-14.0.0.spec
index 5cb57fb87..f0396bafa 100644
--- a/redhat/applications/ksensors/ksensors-14.0.0.spec
+++ b/redhat/applications/ksensors/ksensors-14.0.0.spec
@@ -74,7 +74,6 @@ temperatures with KSensors.
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 # Warning: --enable-final causes FTBFS
 %configure \
@@ -93,7 +92,7 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
   --enable-rpath \
   --disable-gcc-hidden-visibility
 
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
 
 
 %install
diff --git a/redhat/dependencies/arts/arts-14.0.0.spec b/redhat/dependencies/arts/arts-14.0.0.spec
index 781df345c..cee5c0bae 100644
--- a/redhat/dependencies/arts/arts-14.0.0.spec
+++ b/redhat/dependencies/arts/arts-14.0.0.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package arts
 #
-# Copyright (c) 2014 François Andriot <francois.andriot@free.fr>
+# Copyright (c) 2014 Trinity Desktop Environment
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,15 +15,23 @@
 # Please submit bugfixes or comments via http:/www.trinitydesktop.org/
 #
 
+# BUILD WARNING:
+#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
+#  Having KDE libraries may cause FTBFS here !
+
 # TDE variables
 %define tde_version 14.0.0
+%define tde_pkg tdeaddons
 %define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_datadir %{tde_prefix}/share
+%define tde_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
-%define _docdir %{tde_datadir}/doc
+%define tde_tdelibdir %{tde_libdir}/trinity
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?tde_prefix}" != "/usr"
@@ -75,14 +83,15 @@ BuildRequires:	esound-devel
 %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version}
 %define with_jack 1
 %if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}jack-devel
+%define jack_devel %{_lib}jack-devel
 %endif
 %if 0%{?rhel} >= 5 || 0%{?fedora}
-BuildRequires:	jack-audio-connection-kit-devel
+%define jack_devel jack-audio-connection-kit-devel
 %endif
 %if 0%{?suse_version}
-BuildRequires:	libjack-devel
+%define jack_devel libjack-devel
 %endif
+BuildRequires:	%{jack_devel}
 %endif
 
 # LIBTOOL
@@ -105,11 +114,12 @@ BuildRequires:	libtool
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} 
 %define with_libmad 1
 %if 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires:		%{_lib}mad-devel
+%define mad_devel %{_lib}mad-devel
 %endif
 %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
-BuildRequires:		libmad-devel
+%define mad_devel libmad-devel
 %endif
+BuildRequires:		%{mad_devel}
 %endif
 %endif
 
@@ -153,7 +163,7 @@ playing a wave file with some effects.
 %{tde_bindir}/artsrec
 %{tde_bindir}/artsshell
 %{tde_bindir}/artswrapper
-# The '.la' files are runtime, not devel !
+# The '.la' files are needed for runtime, not devel !
 %{tde_libdir}/lib*.la
 
 %post
@@ -176,28 +186,8 @@ Requires:	alsa-lib-devel
 Requires:	audiofile-devel
 Requires:	libvorbis-devel
 Requires:	esound-devel
-
-%if 0%{?with_libmad}
-%if 0%{?mdkversion} || 0%{?mgaversion}
-Requires:		%{_lib}mad-devel
-%endif
-%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
-Requires:		libmad-devel
-%endif
-%endif
-
-%if 0%{?with_jack}
-%if 0%{?mgaversion} || 0%{?mdkversion}
-Requires:	%{_lib}jack-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora}
-Requires:	jack-audio-connection-kit-devel
-%endif
-%if 0%{?suse_version}
-Requires:	libjack-devel
-%endif
-%endif
-
+%{?with_libmad:Requires: %{mad_devel}}
+%{?with_jack:Requires: %{jack_devel}}
 
 %description devel
 arts (analog real-time synthesizer) is the sound system of TDE.
@@ -235,11 +225,12 @@ playing a wave file with some effects.
 
 %package config-pulseaudio
 Group:		System Environment/Daemons
-Summary:	%{name} - Default configuration file for Pulseaudio
+Summary:	ARTS - Default configuration file for Pulseaudio
 Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description config-pulseaudio
-%{summary}
+This package contains a default ARTS configuration file, that is 
+intended for systems running the Pulseaudio server.
 
 %files config-pulseaudio
 %defattr(-,root,root,-)
@@ -320,5 +311,5 @@ chmod 644 "%{?buildroot}%{tde_datadir}/config/kcmartsrc"
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1:1.5.10-2
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:1.5.10-2
 - Initial release for TDE R14.0.0
diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
index 42c73bff1..58400a76d 100644
--- a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
+++ b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package avahi-tqt
 #
-# Copyright (c) 2014 François Andriot <francois.andriot@free.fr>
+# Copyright (c) 2014 Trinity Desktop Environment
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -66,11 +66,12 @@ BuildRequires:	dbus-devel
 
 # AVAHI support
 %if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}avahi-client-devel
+%define avahi_devel %{_lib}avahi-client-devel
 %endif
 %if 0%{?suse_version} || 0%{?rhel} || 0%{?fedora}
-BuildRequires:	avahi-devel
+%define avahi_devel avahi-devel
 %endif
+%{?avahi_devel:BuildRequires: %{avahi_devel}}
 
 # EXPAT support
 %if 0%{?rhel} || 0%{?fedora}
@@ -141,18 +142,11 @@ Provides:	libavahi-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 Requires:	%{libavahi}-tqt1 = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	libtqt4-devel >= 2:4.2.0
+%{?avahi_devel:Requires: %{avahi_devel}}
 
 Obsoletes:		trinity-avahi-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:		trinity-avahi-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
-# AVAHI support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-Requires:	%{_lib}avahi-client-devel
-%endif
-%if 0%{?suse_version} || 0%{?rhel} || 0%{?fedora}
-Requires:	avahi-devel
-%endif
-
 %description -n %{libavahi}-tqt-devel
 Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
 It allows programs to publish and discover services and hosts
@@ -214,8 +208,7 @@ export PATH="%{tde_bindir}:${PATH}"
   --with-distro=mandriva \
 %endif
 
-
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
 
 
 %install
diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
index cc19f5ed6..067cc3e7c 100644
--- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
+++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package dbus-1-tqt
 #
-# Copyright (c) 2014 François Andriot <francois.andriot@free.fr>
+# Copyright (c) 2014 Trinity Desktop Environment
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
index 1916afe60..ff27c4a95 100644
--- a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
+++ b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package dbus-tqt
 #
-# Copyright (c) 2014 François Andriot <francois.andriot@free.fr>
+# Copyright (c) 2014 Trinity Desktop Environment
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
diff --git a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
index 29b3a4f5e..002a9574c 100644
--- a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
+++ b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libart-lgpl
 #
-# Copyright (c) 2014 François Andriot <francois.andriot@free.fr>
+# Copyright (c) 2014 Trinity Desktop Environment
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index 43d1f1d3b..05392e61b 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package tqt3
 #
-# Copyright (c) 2014 François Andriot <francois.andriot@free.fr>
+# Copyright (c) 2014 Trinity Desktop Environment
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -95,16 +95,18 @@ BuildRequires: cups-devel
 # GLIB2 support
 %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} || 0%{?rhel} >= 6
 %define with_glibmainloop 1
-BuildRequires: glib2-devel
+%define glib2_devel glib2-devel
 %endif
+%{?glib2_devel:BuildRequires: %{glib2_devel}}
 
 # UUID support
 %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} || 0%{?rhel} >= 6
-BuildRequires: libuuid-devel
+%define uuid_devel libuuid-devel
 %endif
 %if 0%{?rhel} == 5
-BuildRequires: e2fsprogs-devel
+%define uuid_devel e2fsprogs-devel
 %endif
+%{?uuid_devel:BuildRequires: %{uuid_devel}}
 
 # NAS support
 %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
@@ -114,75 +116,84 @@ BuildRequires: nas-devel
 
 # Xrender support
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-BuildRequires: libXrender-devel
+%define xrender_devel libXrender-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires: libxrender-devel
+%define xrender_devel libxrender-devel
 %endif
+%{?xrender_devel:BuildRequires: %{xrender_devel}}
 
 # Xrandr support
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-BuildRequires: libXrandr-devel
+%define xrandr_devel libXrandr-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires: libxrandr-devel
+%define xrandr_devel libxrandr-devel
 %endif
+%{?xrandr_devel:BuildRequires: %{xrandr_devel}}
 
 # Xcursor support
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-BuildRequires: libXcursor-devel
+%define xcursor_devel libXcursor-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires: libxcursor-devel
+%define xcursor_devel libxcursor-devel
 %endif
+%{?xcursor_devel:BuildRequires: %{xcursor_devel}}
 
 # Xinerama support
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-BuildRequires: libXinerama-devel
+%define xinerama_devel libXinerama-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires: libxinerama-devel
+%define xinerama_devel libxinerama-devel
 %endif
+%{?xinerama_devel:BuildRequires: %{xinerama_devel}}
 
 # Xft support
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-BuildRequires: libXft-devel
+%define xft_devel libXft-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires: libxft-devel
+%define xft_devel libxft-devel
 %endif
+%{?xft_devel:BuildRequires: %{xft_devel}}
 
 # Xext support
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-BuildRequires: libXext-devel
+%define xext_devel libXext-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires: libxext-devel
+%define xext_devel libxext-devel
 %endif
+%{?xext_devel:BuildRequires: %{xext_devel}}
 
 # X11 support
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-BuildRequires: libX11-devel
+%define x11_devel libX11-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires: libx11-devel
+%define x11_devel libx11-devel
 %endif
+%{?x11_devel:BuildRequires: %{x11_devel}}
 
 # SM support
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-BuildRequires: libSM-devel
+%define sm_devel libSM-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires: libsm-devel
+%define sm_devel libsm-devel
 %endif
+%{?sm_devel:BuildRequires: %{sm_devel}}
 
 # ICE support
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-BuildRequires: libICE-devel
+%define ice_devel libICE-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires: libice-devel
+%define ice_devel libice-devel
 %endif
+%{?ice_devel:BuildRequires: %{ice_devel}}
 
 # XT support
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
@@ -199,17 +210,18 @@ BuildRequires: libxmu-devel
 
 # XI support
 %if 0%{?rhel} == 4
-BuildRequires:	xorg-x11-devel
+%define xi_devel xorg-x11-devel
 %endif
 %if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}xi-devel
+%define xi_devel %{_lib}xi-devel
 %endif
 %if 0%{?suse_version} >= 1220 || 0%{?rhel} >= 5 || 0%{?fedora}
-BuildRequires:	libXi-devel
+%define xi_devel libXi-devel
 %endif
 %if 0%{?suse_version} == 1140
-BuildRequires:	libXi6-devel
+%define xi_devel libXi6-devel
 %endif
+%{?%define xi_devel:BuildRequires: %{xi_devel}}
 
 # Xorg support
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
@@ -334,106 +346,18 @@ Requires: libjpeg-devel
 Requires: libpng-devel
 Requires: zlib-devel
 
-# GLIB2 support
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} || 0%{?rhel} >= 6
-%define with_glibmainloop 1
-Requires: glib2-devel
-%endif
-
-# UUID support
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} || 0%{?rhel} >= 6
-Requires: libuuid-devel
-%endif
-%if 0%{?rhel} == 5
-Requires: e2fsprogs-devel
-%endif
-
-# XI support
-%if 0%{?rhel} == 4
-Requires:	xorg-x11-devel
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-Requires:	%{_lib}xi-devel
-%endif
-%if 0%{?suse_version} >= 1220 || 0%{?rhel} >= 5 || 0%{?fedora}
-Requires:	libXi-devel
-%endif
-%if 0%{?suse_version} == 1140
-Requires:	libXi6-devel
-%endif
-
-# Xrender support
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-Requires: libXrender-devel
-%endif
-%if 0%{?mdkversion} || 0%{?mgaversion}
-Requires: libxrender-devel
-%endif
-
-# Xrandr support
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-Requires: libXrandr-devel
-%endif
-%if 0%{?mdkversion} || 0%{?mgaversion}
-Requires: libxrandr-devel
-%endif
-
-# Xcursor support
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-Requires: libXcursor-devel
-%endif
-%if 0%{?mdkversion} || 0%{?mgaversion}
-Requires: libxcursor-devel
-%endif
-
-# Xinerama support
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-Requires: libXinerama-devel
-%endif
-%if 0%{?mdkversion} || 0%{?mgaversion}
-Requires: libxinerama-devel
-%endif
-
-# Xft support
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-Requires: libXft-devel
-%endif
-%if 0%{?mdkversion} || 0%{?mgaversion}
-Requires: libxft-devel
-%endif
-
-# Xext support
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-Requires: libXext-devel
-%endif
-%if 0%{?mdkversion} || 0%{?mgaversion}
-Requires: libxext-devel
-%endif
-
-# X11 support
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-Requires: libX11-devel
-%endif
-%if 0%{?mdkversion} || 0%{?mgaversion}
-Requires: libx11-devel
-%endif
-
-# SM support
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-Requires: libSM-devel
-%endif
-%if 0%{?mdkversion} || 0%{?mgaversion}
-Requires: libsm-devel
-%endif
-
-# ICE support
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-Requires: libICE-devel
-%endif
-%if 0%{?mdkversion} || 0%{?mgaversion}
-Requires: libice-devel
-%endif
-
+%{?glib2_devel:Requires: %{glib2_devel}}
+%{?uuid_devel:Requires: %{uuid_devel}}
+%{?xi_devel:Requires: %{xi_devel}}
+%{?xrender_devel:Requires: %{xrender_devel}}
+%{?xrandr_devel:Requires: %{xrandr_devel}}
+%{?xcursor_devel:Requires: %{xcursor_devel}}
+%{?xinerama_devel:Requires: %{xinerama_devel}}
+%{?xft_devel:Requires: %{xft_devel}}
+%{?xext_devel:Requires: %{xext_devel}}
+%{?x11_devel:Requires: %{x11_devel}}
+%{?sm_devel:Requires: %{sm_devel}}
+%{?ice_devel:Requires: %{ice_devel}}
 
 %description -n %{libtqt3}-mt-devel
 TQt is a C++ class library optimized for graphical user interface
@@ -1456,7 +1380,7 @@ export PATH="${QTDIR}/bin:${PATH}"
 export LD_LIBRARY_PATH=${QTDIR}/lib
 
 # Installs 'libtqt-mt.so.3' library
-%__make -C src INSTALL_ROOT=%{?buildroot} install_target
+%__make -C src INSTALL_ROOT="%{?buildroot}" install_target
 
 # Installs all the remaining
 %__make INSTALL_ROOT=%{?buildroot} install
@@ -1476,8 +1400,8 @@ export LD_LIBRARY_PATH=${QTDIR}/lib
 %__install -m644 -D "tools/tqvfb/pda_up.png" "%{?buildroot}%{_datadir}/tqvfb/pda_up.png"
 
 ## create tqt3-apps-dev-package
-cp tools/designer/interfaces/*.h %{?buildroot}%{?_includedir}/tqt3/
-cp tools/designer/editor/*.h %{?buildroot}%{?_includedir}/tqt3/
+cp tools/designer/interfaces/*.h "%{?buildroot}%{?_includedir}/tqt3/"
+cp tools/designer/editor/*.h "%{?buildroot}%{?_includedir}/tqt3/"
 
 # language file for linguist
 %__install -D -m644 "translations/qt_untranslated.ts" "%{?buildroot}%{?_docdir}/tqt3-linguist/qt_untranslated.ts"
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
index 6f781b4ca..1f7430170 100755
--- a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package tqtinterface
 #
-# Copyright (c) 2014 François Andriot <francois.andriot@free.fr>
+# Copyright (c) 2014 Trinity Desktop Environment
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,13 +15,28 @@
 # Please submit bugfixes or comments via http:/www.trinitydesktop.org/
 #
 
+# BUILD WARNING:
+#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
+#  Having KDE libraries may cause FTBFS here !
+
 # TDE variables
 %define tde_version 14.0.0
+%define tde_pkg tdeaddons
 %define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
-%define cmake_modules_dir %{_datadir}/cmake/Modules
+%define tde_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+# 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
 
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
 %define libtqt4 %{_lib}tqt4
@@ -222,18 +237,18 @@ fi
 
 
 %install
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot} -C build
+%__rm -rf "%{?buildroot}"
+%__make install DESTDIR="%{?buildroot}" -C build
 
 # Install 'cmake' modules for development use
-%__mkdir_p %{?buildroot}%{cmake_modules_dir}
+%__mkdir_p "%{?buildroot}%{cmake_modules_dir}"
 for i in cmake/modules/*.cmake; do
-  %__install -m 644 $i %{?buildroot}%{cmake_modules_dir}
+  %__install -m 644 "$i" "%{?buildroot}%{cmake_modules_dir}"
 done
 
 
 %clean
-%__rm -rf %{?buildroot}
+%__rm -rf "%{?buildroot}"
 
 
 %changelog