1 files changed, 24 insertions, 9 deletions
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}