From 48f1832df5ee410ddfd05ab8b771bfdc6c2aa9e2 Mon Sep 17 00:00:00 2001 From: albator Date: Mon, 5 Sep 2011 20:15:43 +0200 Subject: Update dependencies SPECS file with more version-independant macros --- redhat/dependencies/arts/trinity-arts-3.5.12.spec | 19 ++++++++----- redhat/dependencies/arts/trinity-arts-3.5.13.spec | 12 ++++----- redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec | 15 +++++++---- .../tqtinterface/tqtinterface-3.5.12.spec | 31 +++++++++++----------- .../tqtinterface/tqtinterface-3.5.13.spec | 25 +++++++---------- 5 files changed, 54 insertions(+), 48 deletions(-) (limited to 'redhat') 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 -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 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 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 e0c34fb5e..f1762a9d7 100644 --- a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec +++ b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec @@ -2,15 +2,22 @@ %if "%{?version}" == "" %define version 3.5.13 %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 +BuildRequires: qt3-devel >= 3.3.8d +Requires: qt3 >= 3.3.8d + + Name: dbus-tqt Version: %{?version} -Release: 0%{?dist}%{?_variant} +Release: %{?release}%{?dist}%{?_variant} License: GPL Summary: Dbus TQT Interface Vendor: Trinity Project @@ -19,17 +26,14 @@ Packager: Francois Andriot Prefix: %{_prefix} Source0: %{name}-%{version}.tar.gz -BuildRequires: qt3-devel >= 3.3.8d BuildRequires: gcc-c++ BuildRequires: dbus-qt-devel BuildRequires: tqtinterface-devel -BuildRequires: cmake >= 2.8 - -Requires: qt3 >= 3.3.8d %description Dbus TQT Interface + %package devel Requires: %{name} Summary: %{name} - Development files @@ -37,6 +41,7 @@ Summary: %{name} - Development files %description devel Development files for %{name} + %prep %setup -q -n dependencies/%{name} diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.12.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.12.spec index 5fd726021..10c5fd0d6 100755 --- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.12.spec +++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.12.spec @@ -1,3 +1,9 @@ +# Default version for this component +%if "%{?version}" == "" +%define version 3.5.12 +%endif +%define release 7 + # 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 @@ -7,36 +13,28 @@ # Later compiled Trinity products should be aware of that ! %define _includedir %{_prefix}/include/tqt -# Currently we build with (RHEL 6): -# automake-1.11.1-1.2.el6.noarch -# autoconf-2.63-5.1.el6.noarch -# libtool-2.2.6-15.5.el6.x86_64 -# m4-1.4.13-5.el6.x86_64 +# TDE 3.5.12 specific building variables +BuildRequires: autoconf automake libtool m4 +BuildRequires: qt3-devel >= 3.3.8b +Requires: qt3 >= 3.3.8b -# Currently we build with (Fedora 15): -# automake-1.11.1-5.fc14.noarch -# autoconf-2.63-5.1.f15.noarch (backport from EL6) -# libtool-2.2.6-15.5.f15.x86_64 (backport from EL6) -# m4-1.4.13-5.f15.x86_64 (backport from EL6) Name: tqtinterface -Version: 3.5.12 -Release: 7%{?dist}%{?_variant} +Version: %{version} +Release: %{release}%{?dist}%{?_variant} License: GPL Summary: Trinity QT Interface Vendor: Trinity Project Packager: Francois Andriot Prefix: %{_prefix} -Source0: http://mirror3.tokra.lv/releases/3.5.12/dependencies/tqtinterface-3.5.12.tar.gz +Source0: %{name}-%{version}.tar.gz + -BuildRequires: autoconf automake libtool m4 -BuildRequires: qt3-devel >= 3.3.8b BuildRequires: gcc-c++ BuildRequires: libXi-devel BuildRequires: pth-devel -Requires: qt3 >= 3.3.8b %description Trinity QT Interface @@ -83,6 +81,7 @@ CFLAGS=$( pkg-config --libs qt-mt ) %{_libdir}/*.so %{_libdir}/*.la + %changelog * Sun Sep 04 2011 Francois Andriot - 3.5.12-7 - Import to GIT diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec index a0a07dbae..3a35c6866 100755 --- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec +++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec @@ -2,6 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %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" @@ -12,9 +13,15 @@ # 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: 0%{?dist}%{?_variant} +Release: %{release}%{?dist}%{?_variant} License: GPL Summary: Trinity QT Interface Vendor: Trinity Project @@ -23,13 +30,11 @@ Packager: Francois Andriot Prefix: %{_prefix} Source0: %{name}-%{version}.tar.gz -BuildRequires: cmake >= 2.8 -BuildRequires: qt3-devel >= 3.3.8d + BuildRequires: gcc-c++ BuildRequires: libXi-devel BuildRequires: pth-devel -Requires: qt3 >= 3.3.8d %description Trinity QT Interface @@ -41,14 +46,6 @@ Summary: %{name} - Development files %description devel Development files for %{name} -%package -n tde-cmake-macros -Requires: %{name}-devel -Summary: Cmake macros for building TDE - -%description -n tde-cmake-macros -%{summary} - - %prep %setup -q -n dependencies/%{name} @@ -97,12 +94,10 @@ done %{_libdir}/*.so %{_libdir}/*.la %{_libdir}/pkgconfig/*.pc - -%files -n tde-cmake-macros %{_usr}/share/cmake/Modules/*.cmake %changelog -* Sun Aug 28 2011 Francois Andriot - 3.5.13pre.svn20110828-0.el6 +* Sun Aug 28 2011 Francois Andriot - 3.5.13-0 - Import to GIT - Built with future TDE version (3.5.13 + cmake + QT3.3.8d) -- cgit v1.2.1