Update dependencies SPECS file with more version-independant macros

2 files changed, 19 insertions, 12 deletions

diff --git a/redhat/dependencies/arts/trinity-arts-3.5.12.spec b/redhat/dependencies/arts/trinity-arts-3.5.12.spec
index 734ce3074..16ccd741e 100755
--- a/redhat/dependencies/arts/trinity-arts-3.5.12.spec
+++ b/redhat/dependencies/arts/trinity-arts-3.5.12.spec
@@ -1,29 +1,35 @@
+# Default version for this component
+%if "%{?version}" == ""
+%define version 3.5.12
+%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.12 specific building variables
+BuildRequires:	autoconf automake libtool m4
+
 
 Name:		trinity-arts
-Version:	3.5.12
-Release:	4%{?dist}%{?_variant}
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
 License:	GPL
 Summary:	aRts (analog realtime synthesizer) - the KDE sound system
 Vendor:		Trinity Project
 Packager:	Francois Andriot <[email protected]>
 
-Source0:	http://mirror3.tokra.lv/releases/3.5.12/dependencies/arts-3.5.12.tar.gz
+Source0:	arts-%{version}.tar.gz
 Prefix:		%{_prefix}
 
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	qt3-devel >= 3.3.8b
 BuildRequires:	tqtinterface-devel
 BuildRequires:	audiofile-devel
 BuildRequires:	alsa-lib-devel
 BuildRequires:	glib2-devel
 BuildRequires:	libtool-ltdl-devel
 
-Requires:	qt3 >= 3.3.8b
 Requires:	tqtinterface
 Requires:	audiofile
 
@@ -64,6 +70,7 @@ Development files for %{name}
 %build
 export PATH="%{_bindir}:${PATH}"
 export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
 %configure \
   --disable-rpath \
   --disable-debug --disable-warnings \
diff --git a/redhat/dependencies/arts/trinity-arts-3.5.13.spec b/redhat/dependencies/arts/trinity-arts-3.5.13.spec
index e86dfbf5b..2a2cd2fba 100755
--- a/redhat/dependencies/arts/trinity-arts-3.5.13.spec
+++ b/redhat/dependencies/arts/trinity-arts-3.5.13.spec
@@ -2,16 +2,20 @@
 %if "%{?version}" == ""
 %define version 1.5.10
 %endif
+%define release 0
 
 # 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:	0%{?dist}%{?_variant}
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
 License:	GPL
 Summary:	aRts (analog realtime synthesizer) - the KDE sound system
 Vendor:		Trinity Project
@@ -20,16 +24,12 @@ Packager:	Francois Andriot <[email protected]>
 Source0:	arts-%{version}.tar.gz
 Prefix:		%{_prefix}
 
-BuildRequires:	cmake >= 2.8
-BuildRequires:	tde-cmake-macros
-BuildRequires:	qt3-devel >= 3.3.8d
 BuildRequires:	tqtinterface-devel
 BuildRequires:	audiofile-devel
 BuildRequires:	alsa-lib-devel
 BuildRequires:	glib2-devel
 BuildRequires:	libtool-ltdl-devel
 
-Requires:	qt3 >= 3.3.8d
 Requires:	tqtinterface
 Requires:	audiofile