diff options
| author | François Andriot <albator78@libertysurf.fr> | 2013-09-08 19:18:46 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2013-09-08 19:18:46 +0200 |
| commit | c56eddf6d066544f75355c5a999e1436f4aead78 (patch) | |
| tree | 95f2202df7ddae113882b0cfab28701b4f15633e /redhat/dependencies | |
| parent | 712bf363997de9da621b9f2b39a3775493dc0ef3 (diff) | |
| download | tde-packaging-c56eddf6d066544f75355c5a999e1436f4aead78.tar.gz tde-packaging-c56eddf6d066544f75355c5a999e1436f4aead78.zip | |
RPM Packaging: updates for 3.5.13.2
Diffstat (limited to 'redhat/dependencies')
| -rw-r--r-- | redhat/dependencies/arts/arts-3.5.13.2-pkgconfig_requires.patch | 48 | ||||
| -rw-r--r-- | redhat/dependencies/arts/arts-3.5.13.2.spec | 3 |
2 files changed, 51 insertions, 0 deletions
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 new file mode 100644 index 000000000..c8dc7931e --- /dev/null +++ b/redhat/dependencies/arts/arts-3.5.13.2-pkgconfig_requires.patch @@ -0,0 +1,48 @@ +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 d955876cc..72ec2f8a6 100644 --- a/redhat/dependencies/arts/arts-3.5.13.2.spec +++ b/redhat/dependencies/arts/arts-3.5.13.2.spec @@ -32,6 +32,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Source1: kcmartsrc-pulseaudio +Patch0: arts-3.5.13.2-pkgconfig_requires.patch + BuildRequires: cmake >= 2.8 BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: audiofile-devel @@ -194,6 +196,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} +%patch0 -p1 -b .pkgconfig %build |