RHEL/Fedora: massive updates for Fedora 17 (TDE 3.5.13 entire build)

5 files changed, 35 insertions, 70 deletions

diff --git a/redhat/dependencies/arts/trinity-arts-3.5.13.spec b/redhat/dependencies/arts/trinity-arts-3.5.13.spec
index 8b639a8f0..29f683e77 100755
--- a/redhat/dependencies/arts/trinity-arts-3.5.13.spec
+++ b/redhat/dependencies/arts/trinity-arts-3.5.13.spec
@@ -1,21 +1,11 @@
-# Default version for this component
-%if "%{?version}" == ""
-%define version 3.5.13
-%endif
-%define release 4
-
 # 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
 
-# TDE 3.5.13 specific building variables
-BuildRequires: cmake >= 2.8
-
-
 Name:		trinity-arts
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	3.5.13
+Release:	4%{?dist}%{?_variant}
 License:	GPL
 Summary:	aRts (analog realtime synthesizer) - the KDE sound system
 Group:		System Environment/Daemons 
@@ -45,6 +35,9 @@ BuildRequires:	libvorbis-devel
 BuildRequires:	esound-devel
 BuildRequires:	jack-audio-connection-kit-devel
 
+# TDE 3.5.13 specific building variables
+BuildRequires: cmake >= 2.8
+
 Requires:		tqtinterface
 Requires:		audiofile
 
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 27a167636..125031f36 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
@@ -1,23 +1,11 @@
-# Default version for this component
-%if "%{?version}" == ""
-%define version 3.5.13
-%endif
-%define release 1
-
 # 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
 
-# TDE 3.5.13 specific building variables
-BuildRequires: cmake >= 2.8
-BuildRequires:	qt3-devel >= 3.3.8d
-Requires:	qt3 >= 3.3.8d
-
-
 Name:		dbus-1-tqt
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	3.5.13
+Release:	1%{?dist}%{?_variant}
 License:	GPL
 Summary:	Dbus TQT Interface
 Group:		System Environment/Libraries
@@ -30,13 +18,16 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{version}.tar.gz
 
-# Fix for a nasty memleak in knetworkmanager
-Patch0:		dbus1tqt-3.5.13-memory_leak.patch
-
 BuildRequires:	gcc-c++
 BuildRequires:	dbus-devel
 BuildRequires:	tqtinterface-devel
 
+# TDE 3.5.13 specific building variables
+BuildRequires:	cmake >= 2.8
+BuildRequires:	qt3-devel >= 3.3.8.d
+Requires:		qt3 >= 3.3.8.d
+
+
 %description
 Dbus TQT Interface
 
@@ -52,7 +43,6 @@ Development files for %{name}
 
 %prep
 %setup -q -n dependencies/%{name}
-#patch0 -p1
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
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 556479efc..8020e2ee2 100644
--- a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec
+++ b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec
@@ -1,23 +1,11 @@
-# Default version for this component
-%if "%{?version}" == ""
-%define version 3.5.13
-%endif
-%define release 3
-
 # 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
 
-# TDE 3.5.13 specific building variables
-BuildRequires: cmake >= 2.8
-BuildRequires:	qt3-devel >= 3.3.8.d
-Requires:	qt3 >= 3.3.8.d
-
-
 Name:		dbus-tqt
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	3.5.13
+Release:	3%{?dist}%{?_variant}
 License:	GPL
 Summary:	Dbus TQT Interface
 Group:		System Environment/Libraries
@@ -34,17 +22,23 @@ BuildRequires:	gcc-c++
 BuildRequires:	dbus-devel
 BuildRequires:	tqtinterface-devel
 
-Provides:		dbus-qt
+# TDE 3.5.13 specific building variables
+BuildRequires:	cmake >= 2.8
+BuildRequires:	qt3-devel >= 3.3.8.d
+
+Requires:		qt3 >= 3.3.8.d
+
+#Provides:		dbus-qt
 
 %description
 Dbus TQT Interface
 
 
 %package devel
-Requires:	%{name}
-Summary:	%{name} - Development files
-Group:		Development/Libraries
-Provides:		dbus-qt-devel
+Requires:		%{name}
+Summary:		%{name} - Development files
+Group:			Development/Libraries
+#Provides:		dbus-qt-devel
 
 %description devel
 Development files for %{name}
diff --git a/redhat/dependencies/qt3/qt3.spec b/redhat/dependencies/qt3/qt3-3.3.8.d.spec
index 626de8744..afb20801a 100644
--- a/redhat/dependencies/qt3/qt3.spec
+++ b/redhat/dependencies/qt3/qt3-3.3.8.d.spec
@@ -1,8 +1,3 @@
-# Default version for this component
-%if "%{?version}" == ""
-%define version 3.3.8.d
-%endif
-
 # Always install under standard prefix
 %define _prefix /usr
 
@@ -20,7 +15,7 @@
 
 Name:			qt3
 Epoch:			1
-Version:		%{?version}
+Version:		3.3.8.d
 Release:		8%{?dist}
 Summary:		The shared library for the Qt 3 GUI toolkit
 
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec
index bbb9a48d7..3da953661 100755
--- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec
@@ -1,9 +1,3 @@
-# Default version for this component
-%if "%{?version}" == ""
-%define version 3.5.13
-%endif
-%define release 3
-
 # 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
@@ -16,15 +10,9 @@
 # Later compiled Trinity products should be aware of that !
 %define _includedir %{_prefix}/include/tqt
 
-# TDE 3.5.13 specific building variables
-BuildRequires:	cmake >= 2.8
-BuildRequires:	qt3-devel >= 3.3.8d
-Requires:		qt3 >= 3.3.8d
-
-
 Name:		tqtinterface
-Version:	%{version}
-Release:	%{release}%{?dist}%{?_variant}
+Version:	3.5.13
+Release:	3%{?dist}%{?_variant}
 License:	GPL
 Summary:	Trinity QT Interface
 Group:		System Environment/Libraries
@@ -40,6 +28,11 @@ Source0:	%{name}-%{version}.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:	gcc-c++
 BuildRequires:	libXi-devel
 BuildRequires:	pth-devel
@@ -52,7 +45,7 @@ Trinity QT Interface
 Group:		Development/Libraries
 Summary:	%{name} - Development files
 Requires:	%{name} = %{version}-%{release}
-Requires:	qt3-devel >= 3.3.8d
+Requires:	qt3-devel >= 3.3.8.d
 
 %description devel
 Development files for %{name}