From fa814aeacb589fdd40166e799e93fed42e43c9c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sat, 11 Oct 2014 12:15:57 +0200 Subject: RPM packaging: cleanup arts --- redhat/dependencies/arts/arts-14.0.0.spec | 17 +-- .../arts/arts-3.5.13.2-pkgconfig_requires.patch | 48 -------- redhat/dependencies/arts/arts-3.5.13.2.spec | 134 +++++++++++++++------ 3 files changed, 107 insertions(+), 92 deletions(-) delete mode 100644 redhat/dependencies/arts/arts-3.5.13.2-pkgconfig_requires.patch diff --git a/redhat/dependencies/arts/arts-14.0.0.spec b/redhat/dependencies/arts/arts-14.0.0.spec index cee5c0bae..96513bfed 100644 --- a/redhat/dependencies/arts/arts-14.0.0.spec +++ b/redhat/dependencies/arts/arts-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package arts +# spec file for package arts (version R14.0.0) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -20,8 +20,9 @@ # Having KDE libraries may cause FTBFS here ! # TDE variables +%define tde_epoch 2 %define tde_version 14.0.0 -%define tde_pkg tdeaddons +%define tde_pkg arts %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -39,10 +40,10 @@ %endif -Name: trinity-arts -Epoch: 2 +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} Version: 1.5.10 -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} Summary: ARTS (analog realtime synthesizer) - the TDE sound system Group: System Environment/Daemons URL: http://www.trinitydesktop.org/ @@ -61,7 +62,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: libtqt4-devel >= 2:4.2.0 +BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0 BuildRequires: trinity-filesystem >= %{tde_version} Requires: trinity-filesystem >= %{tde_version} @@ -80,7 +81,7 @@ BuildRequires: libvorbis-devel BuildRequires: esound-devel # JACK support -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} [[ 0%{?with_jack} %define with_jack 1 %if 0%{?mgaversion} || 0%{?mdkversion} %define jack_devel %{_lib}jack-devel @@ -128,7 +129,7 @@ BuildRequires: %{mad_devel} %define with_pulseaudio 1 %endif -Requires: libtqt4 >= 2:4.2.0 +Requires: libtqt4 >= %{tde_epoch}:4.2.0 Requires: audiofile %if "%{?tde_prefix}" == "/usr" diff --git a/redhat/dependencies/arts/arts-3.5.13.2-pkgconfig_requires.patch b/redhat/dependencies/arts/arts-3.5.13.2-pkgconfig_requires.patch deleted file mode 100644 index c8dc7931e..000000000 --- a/redhat/dependencies/arts/arts-3.5.13.2-pkgconfig_requires.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c122548..ad4f028 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -226,6 +226,34 @@ configure_file( config.h.cmake config.h @ONLY ) - - ##### write pkgconfig file ###################### - -+set( PC_LIB_REQUIRE "" ) -+if( WITH_ALSA ) -+ list( APPEND PC_LIB_REQUIRE "alsa" ) -+endif( WITH_ALSA ) -+if( WITH_AUDIOFILE ) -+ list( APPEND PC_LIB_REQUIRE "audiofile" ) -+endif( WITH_AUDIOFILE ) -+if( WITH_VORBIS ) -+ list( APPEND PC_LIB_REQUIRE "vorbis" ) -+ list( APPEND PC_LIB_REQUIRE "vorbisfile" ) -+endif( WITH_VORBIS ) -+if( WITH_MAD ) -+ list( APPEND PC_LIB_REQUIRE "mad" ) -+endif( WITH_MAD ) -+if( WITH_ESOUND ) -+ list( APPEND PC_LIB_REQUIRE "esound" ) -+endif( WITH_ESOUND ) -+if( WITH_JACK ) -+ list( APPEND PC_LIB_REQUIRE "jack" ) -+endif( WITH_JACK ) -+ -+list( LENGTH PC_LIB_REQUIRE PC_LIB_REQUIRES_FOUND ) -+if( PC_LIB_REQUIRES_FOUND GREATER 0 ) -+ string( REPLACE ";" " " PC_LIB_REQUIRES "Requires: ${PC_LIB_REQUIRE}" ) -+else( ) -+ set( PC_LIB_REQUIRES "" ) -+endif( ) -+ - string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" PC_EXEC_PREFIX ${EXEC_INSTALL_PREFIX} ) - string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" PC_INCLUDE_DIR ${INCLUDE_INSTALL_DIR} ) - string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" PC_LIB_DIR ${LIB_INSTALL_DIR} ) -diff --git a/arts.pc.cmake b/arts.pc.cmake -index 2c26a41..77332d2 100644 ---- a/arts.pc.cmake -+++ b/arts.pc.cmake -@@ -8,3 +8,4 @@ Description: Soundserver for the Trinity Desktop Environment (TDE) - Version: @ARTS_VERSION@ - Libs: -L${libdir} - Cflags: -I${includedir} -+@PC_LIB_REQUIRES@ diff --git a/redhat/dependencies/arts/arts-3.5.13.2.spec b/redhat/dependencies/arts/arts-3.5.13.2.spec index 5a1d676e0..ed8f0480f 100644 --- a/redhat/dependencies/arts/arts-3.5.13.2.spec +++ b/redhat/dependencies/arts/arts-3.5.13.2.spec @@ -1,41 +1,75 @@ -# 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 - +# +# spec file for package arts (version 3.5.13-SRU) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# 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/ +# + +# BUILD WARNING: +# Remove qt-devel and qt3-devel and any kde*-devel on your system ! +# Having KDE libraries may cause FTBFS here ! + +# TDE variables +%define tde_epoch 1 %define tde_version 3.5.13.2 - +%define tde_pkg arts +%define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} -%define tde_datadir %{tde_prefix}/share - +%define tde_tdeappdir %{tde_datadir}/applications/tde +%define tde_tdedocdir %{tde_docdir}/tde %define tde_tdeincludedir %{tde_includedir}/tde +%define tde_tdelibdir %{tde_libdir}/trinity + +# 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 -%define _docdir %{tde_datadir}/doc -Name: trinity-arts -Epoch: 1 +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} Version: 1.5.10 Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} -License: GPL -Summary: aRts (analog realtime synthesizer) - the TDE sound system +Summary: ARTS (analog realtime synthesizer) - the TDE sound system Group: System Environment/Daemons - -Vendor: Trinity Project URL: http://www.trinitydesktop.org/ -Packager: Francois Andriot + +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + +#Vendor: Trinity Project +#Packager: Francois Andriot Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Source1: kcmartsrc-pulseaudio -Patch1: arts-3.5.13.2-pkgconfig_requires.patch +BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0 +BuildRequires: trinity-filesystem >= %{tde_version} +Requires: trinity-filesystem >= %{tde_version} BuildRequires: cmake >= 2.8 -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} +BuildRequires: gcc-c++ +BuildRequires: pkgconfig + BuildRequires: audiofile-devel BuildRequires: alsa-lib-devel BuildRequires: glib2-devel @@ -47,18 +81,18 @@ BuildRequires: libvorbis-devel BuildRequires: esound-devel # JACK support -# Not on RHEL4 ! -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} [[ 0%{?with_jack} %define with_jack 1 %if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}jack-devel +%define jack_devel %{_lib}jack-devel %endif %if 0%{?rhel} >= 5 || 0%{?fedora} -BuildRequires: jack-audio-connection-kit-devel +%define jack_devel jack-audio-connection-kit-devel %endif %if 0%{?suse_version} -BuildRequires: libjack-devel +%define jack_devel libjack-devel %endif +BuildRequires: %{jack_devel} %endif # LIBTOOL @@ -77,13 +111,16 @@ BuildRequires: libtool %endif # MAD support +%ifarch %{ix86} x86_64 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} %define with_libmad 1 %if 0%{?mdkversion} || 0%{?mgaversion} -BuildRequires: %{_lib}mad-devel +%define mad_devel %{_lib}mad-devel %endif %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} -BuildRequires: libmad-devel +%define mad_devel libmad-devel +%endif +BuildRequires: %{mad_devel} %endif %endif @@ -92,7 +129,7 @@ BuildRequires: libmad-devel %define with_pulseaudio 1 %endif -Requires: trinity-tqtinterface >= %{tde_version} +Requires: libtqt4 >= %{tde_epoch}:4.2.0 Requires: audiofile %if "%{?tde_prefix}" == "/usr" @@ -127,7 +164,7 @@ playing a wave file with some effects. %{tde_bindir}/artsrec %{tde_bindir}/artsshell %{tde_bindir}/artswrapper -# The '.la' files are runtime, not devel ! +# The '.la' files are needed for runtime, not devel ! %{tde_libdir}/lib*.la %post @@ -140,14 +177,30 @@ playing a wave file with some effects. %package devel Group: Development/Libraries -Summary: %{name} - Development files +Summary: ARTS (analog realtime synthesizer) - the TDE sound system (Development files) Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %if "%{?tde_prefix}" == "/usr" Obsoletes: arts-devel %endif +Requires: alsa-lib-devel +Requires: audiofile-devel +Requires: libvorbis-devel +Requires: esound-devel +%{?with_libmad:Requires: %{mad_devel}} +%{?with_jack:Requires: %{jack_devel}} + %description devel -Development files for %{name} +arts (analog real-time synthesizer) is the sound system of TDE. + +The principle of arts is to create/process sound using small modules which do +certain tasks. These may be create a waveform (oscillators), play samples, +filter data, add signals, perform effects like delay/flanger/chorus, or +output the data to the soundcard. + +By connecting all those small modules together, you can perform complex +tasks like simulating a mixer, generating an instrument or things like +playing a wave file with some effects. %files devel %defattr(-,root,root,-) @@ -173,11 +226,12 @@ Development files for %{name} %package config-pulseaudio Group: System Environment/Daemons -Summary: %{name} - Default configuration file for Pulseaudio +Summary: ARTS - Default configuration file for Pulseaudio Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description config-pulseaudio -%{summary} +This package contains a default ARTS configuration file, that is +intended for systems running the Pulseaudio server. %files config-pulseaudio %defattr(-,root,root,-) @@ -187,16 +241,14 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} ########## -%if 0%{?suse_version} || 0%{?pclinuxos} +%if 0%{?pclinuxos} %debug_package %endif ########## - %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch1 -p1 -b .mad %build @@ -216,6 +268,7 @@ fi -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ -DCMAKE_SKIP_RPATH=OFF \ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_NO_BUILTIN_CHRPATH=ON \ -DCMAKE_VERBOSE_MAKEFILE=ON \ \ -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ @@ -239,9 +292,18 @@ fi %__rm -rf %{?buildroot} %__make install -C build DESTDIR=%{?buildroot} +%__install -d -m 755 %{?buildroot}%{tde_datadir}/config +%__install -d -m 755 %{?buildroot}%{tde_datadir}/doc + # Installs the Pulseaudio configuration file %if 0%{?with_pulseaudio} -%__install -D -m 644 %{SOURCE1} %{?buildroot}%{tde_datadir}/config/kcmartsrc +cat <"%{?buildroot}%{tde_datadir}/config/kcmartsrc" +[Arts] +Arguments=\s-F 10 -S 4096 -a esd -n -s 1 -m artsmessage -c drkonqi -l 3 -f +NetworkTransparent=true +SuspendTime=1 +EOF +chmod 644 "%{?buildroot}%{tde_datadir}/config/kcmartsrc" %endif -- cgit v1.2.3