diff options
Diffstat (limited to 'redhat/dependencies')
4 files changed, 37 insertions, 13 deletions
diff --git a/redhat/dependencies/arts/trinity-arts-3.5.12.spec b/redhat/dependencies/arts/trinity-arts-3.5.12.spec index 16ccd741e..4b6fcfe1a 100755 --- a/redhat/dependencies/arts/trinity-arts-3.5.12.spec +++ b/redhat/dependencies/arts/trinity-arts-3.5.12.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.12 %endif -%define release 4 +%define release 5 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -18,7 +18,10 @@ Version: %{?version} Release: %{?release}%{?dist}%{?_variant} License: GPL Summary: aRts (analog realtime synthesizer) - the KDE sound system +Group: System Environment/Daemons + Vendor: Trinity Project +URL: http://www.trinitydesktop.org/ Packager: Francois Andriot <francois.andriot@free.fr> Source0: arts-%{version}.tar.gz @@ -29,6 +32,7 @@ BuildRequires: audiofile-devel BuildRequires: alsa-lib-devel BuildRequires: glib2-devel BuildRequires: libtool-ltdl-devel +BuildRequires: gsl-devel Requires: tqtinterface Requires: audiofile @@ -51,8 +55,9 @@ playing a wave file with some effects. %package devel -Requires: %{name} +Group: Development/Libraries Summary: %{name} - Development files +Requires: %{name} = %{version}-%{release} %if "%{?_prefix}" == "/usr" Obsoletes: arts-devel %endif @@ -65,7 +70,7 @@ Development files for %{name} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" -%__make -f admin/Makefile.common +%__make -f "admin/Makefile.common" %build export PATH="%{_bindir}:${PATH}" @@ -118,6 +123,9 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}" %changelog +* Mon Sep 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-5 +- Add "Group" field + * Sun Sep 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-4 - Import to GIT - Removes cmake stuff, build with autotools only diff --git a/redhat/dependencies/arts/trinity-arts-3.5.13.spec b/redhat/dependencies/arts/trinity-arts-3.5.13.spec index 2a2cd2fba..fd2d6104d 100755 --- a/redhat/dependencies/arts/trinity-arts-3.5.13.spec +++ b/redhat/dependencies/arts/trinity-arts-3.5.13.spec @@ -18,7 +18,9 @@ Version: %{?version} Release: %{?release}%{?dist}%{?_variant} License: GPL Summary: aRts (analog realtime synthesizer) - the KDE sound system + Vendor: Trinity Project +URL: http://www.trinitydesktop.org/ Packager: Francois Andriot <francois.andriot@free.fr> Source0: arts-%{version}.tar.gz @@ -29,6 +31,7 @@ BuildRequires: audiofile-devel BuildRequires: alsa-lib-devel BuildRequires: glib2-devel BuildRequires: libtool-ltdl-devel +BuildRequires: gsl-devel Requires: tqtinterface Requires: audiofile @@ -69,6 +72,7 @@ unset QTDIR || : ; . /etc/profile.d/qt.sh %__mkdir build cd build %cmake \ + -DINCLUDE_INSTALL_DIR=%{_includedir}/arts \ -DPKGCONFIG_INSTALL_DIR=%{_libdir}/pkgconfig \ -DWITH_MAD=OFF \ .. diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.12.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.12.spec index 10c5fd0d6..79102f528 100755 --- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.12.spec +++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.12.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.12 %endif -%define release 7 +%define release 8 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -14,9 +14,9 @@ %define _includedir %{_prefix}/include/tqt # TDE 3.5.12 specific building variables -BuildRequires: autoconf automake libtool m4 +BuildRequires: autoconf automake libtool m4 BuildRequires: qt3-devel >= 3.3.8b -Requires: qt3 >= 3.3.8b +Requires: qt3 >= 3.3.8b Name: tqtinterface @@ -24,7 +24,10 @@ Version: %{version} Release: %{release}%{?dist}%{?_variant} License: GPL Summary: Trinity QT Interface +Group: System Environment/Libraries + Vendor: Trinity Project +URL: http://www.trinitydesktop.org/ Packager: Francois Andriot <francois.andriot@free.fr> Prefix: %{_prefix} @@ -40,8 +43,9 @@ BuildRequires: pth-devel Trinity QT Interface %package devel -Requires: %{name} +Group: Development/Libraries Summary: %{name} - Development files +Requires: %{name} = %{version}-%{release} %description devel Development files for %{name} @@ -51,7 +55,7 @@ Development files for %{name} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" -%__make -f admin/Makefile.common +%__make -f "admin/Makefile.common" %build unset QTDIR || : ; . /etc/profile.d/qt.sh @@ -83,6 +87,9 @@ CFLAGS=$( pkg-config --libs qt-mt ) %changelog +* Mon Sep 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-8 +- Add "Group" + * Sun Sep 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-7 - Import to GIT - Removes cmake stuff, build with autotools only diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec index 3a35c6866..859afa0bd 100755 --- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec +++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec @@ -7,6 +7,9 @@ # 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 +%define cmake_modules_dir %{_datadir}/cmake +%else +%define cmake_modules_dir %{_datadir}/cmake/Modules %endif # TQT include files may conflict with QT4 includes, so we move them to a subdirectory. @@ -14,9 +17,9 @@ %define _includedir %{_prefix}/include/tqt # TDE 3.5.13 specific building variables -BuildRequires: cmake >= 2.8 +BuildRequires: cmake >= 2.8 BuildRequires: qt3-devel >= 3.3.8d -Requires: qt3 >= 3.3.8d +Requires: qt3 >= 3.3.8d Name: tqtinterface @@ -24,7 +27,9 @@ Version: %{version} Release: %{release}%{?dist}%{?_variant} License: GPL Summary: Trinity QT Interface + Vendor: Trinity Project +URL: http://www.trinitydesktop.org/ Packager: Francois Andriot <francois.andriot@free.fr> Prefix: %{_prefix} @@ -77,9 +82,9 @@ sed -i %{?buildroot}%{_libdir}/pkgconfig/tqt.pc \ -e '/^uic_executable=.*/ s,^\(uic_executable=\).*,\1%{_bindir}/uic-tqt,' # Install 'cmake' modules for a specific package (for later use) -%__mkdir_p %{?buildroot}%{_usr}/share/cmake/Modules +%__mkdir_p %{?buildroot}%{cmake_modules_dir} for i in cmake/modules/*.cmake; do - install -m 644 $i %{?buildroot}%{_usr}/share/cmake/Modules + install -m 644 $i %{?buildroot}%{cmake_modules_dir} done %clean @@ -94,7 +99,7 @@ done %{_libdir}/*.so %{_libdir}/*.la %{_libdir}/pkgconfig/*.pc -%{_usr}/share/cmake/Modules/*.cmake +%{cmake_modules_dir}/*.cmake %changelog |