RPM: merge redhat directory with master branch

1 files changed, 7 insertions, 16 deletions

diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec
index dd8704c7d..127e0b908 100755..100644
--- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 #
-# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
 #
 
 # BUILD WARNING:
@@ -25,11 +25,6 @@
 %define tde_pkg tqtinterface
 %define cmake_modules_dir %{_datadir}/cmake/Modules
 
-# 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
 %else
@@ -39,7 +34,7 @@
 Name:		trinity-%{tde_pkg}
 Epoch:		%{tde_epoch}
 Version:	4.2.0
-Release:	%{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant}
+Release:	%{?!preversion:3}%{?preversion:0_%{preversion}}%{?dist}
 Summary:	The Trinity Qt Interface Libraries
 Group:		System/GUI/Other
 URL:		http://www.trinitydesktop.org/
@@ -69,6 +64,9 @@ BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
+# UUID support
+BuildRequires: libuuid-devel
+
 # PTHREAD support
 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
 BuildRequires:	pth-devel
@@ -92,7 +90,7 @@ BuildRequires: Mesa-libGLU-devel
 BuildRequires:	xorg-x11-devel
 %endif
 %if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}xi-devel
+BuildRequires:	libxi-devel
 %endif
 %if 0%{?suse_version} >= 1220 || 0%{?rhel} >= 5 || 0%{?fedora}
 BuildRequires:	libXi-devel
@@ -152,6 +150,7 @@ Provides:	libtqt4-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 Requires:	%{libtqt4} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	qt3-devel >= 3.3.8d
+Requires:	libuuid-devel
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1300
 Requires:		trinity-cmake-macros
@@ -269,11 +268,3 @@ done
 
 
 %changelog
-* Sat Oct 11 2014 Francois Andriot <francois.andriot@free.fr> - 1:4.2.0-3
-- Rename package to 'libtqt4'
-
-* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2
-- Build for Fedora 19
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial release for TDE 3.5.13.2