From d306e7147813d8bd9c0b5659149677fb1817482d Mon Sep 17 00:00:00 2001 From: Nikola Pajkovsky Date: Thu, 19 Jan 2012 12:40:41 +0100 Subject: [PATCH 1/5] rhbz#761244 - please disable JACK for RHEL Signed-off-by: Nikola Pajkovsky (cherry picked from commit b7ad7e8cfe432726832662ac5dcb968b3c3bfa12) Conflicts: alsa-plugins.spec --- alsa-plugins.spec | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 2fec3f2..8a10476 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -1,6 +1,12 @@ +%if 0%{?rhel} +%define with_jack 0 +%else +%define with_jack 1 +%endif + Name: alsa-plugins Version: 1.0.24 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ # pph plugin is BSD-like licensed @@ -8,7 +14,9 @@ License: GPLv2+ and LGPLv2+ and BSD Group: System Environment/Libraries URL: http://www.alsa-project.org/ Source0: ftp://ftp.alsa-project.org/pub/plugins/%{name}-%{version}.tar.bz2 +%if 0%{?with_jack} Source1: jack.conf +%endif Source2: pcm-oss.conf Source3: speex.conf Source4: samplerate.conf @@ -27,6 +35,7 @@ functionality to the Linux operating system. This package includes plugins for ALSA. +%if 0%{?with_jack} %package jack Requires: alsa-utils Requires: jack-audio-connection-kit @@ -39,6 +48,7 @@ This plugin converts the ALSA API over JACK (Jack Audio Connection Kit, http://jackit.sf.net) API. ALSA native applications can work transparently together with jackd for both playback and capture. This plugin provides the PCM type "jack" +%endif %package oss Requires: alsa-utils @@ -150,8 +160,10 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa/pcm -install -m 644 %SOURCE1 \ - %SOURCE2 \ +%if 0%{?with_jack} +install -m 644 %SOURCE1 ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa/pcm +%endif +install -m 644 %SOURCE2 \ %SOURCE3 \ %SOURCE4 \ %SOURCE5 \ @@ -172,12 +184,14 @@ rm -rf $RPM_BUILD_ROOT %postun -p /sbin/ldconfig +%if 0%{?with_jack} %files jack %defattr(-,root,root,-) %doc COPYING COPYING.GPL doc/README-jack %dir %{_sysconfdir}/alsa/pcm %config(noreplace) %{_sysconfdir}/alsa/pcm/jack.conf %{_libdir}/alsa-lib/libasound_module_pcm_jack.so +%endif %files oss %defattr(-,root,root,-) @@ -249,6 +263,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jan 19 2012 Nikola Pajkovsky - 1.0.24-3 +- 761244 - please disable JACK for RHEL + * Mon Feb 07 2011 Fedora Release Engineering - 1.0.24-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From c66d980edfb32e46314fc846d9878c3b65838a9f Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Wed, 1 Feb 2012 10:52:18 +0100 Subject: [PATCH 2/5] updated to 1.0.25 --- .gitignore | 1 + alsa-plugins.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f26aef1..6c6b066 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ alsa-plugins-1.0.21.tar.bz2 alsa-plugins-1.0.22.tar.bz2 /alsa-tools-1.0.24.tar.bz2 /alsa-plugins-1.0.24.tar.bz2 +/alsa-plugins-1.0.25.tar.bz2 diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 8a10476..fbbd0c0 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -5,8 +5,8 @@ %endif Name: alsa-plugins -Version: 1.0.24 -Release: 3%{?dist} +Version: 1.0.25 +Release: 1%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ # pph plugin is BSD-like licensed @@ -263,6 +263,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Feb 1 2012 Jaroslav Kysela - 1.0.25-1 +- Updated to 1.0.25 + * Thu Jan 19 2012 Nikola Pajkovsky - 1.0.24-3 - 761244 - please disable JACK for RHEL diff --git a/sources b/sources index 3ede6b6..dee95e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e4d4c90e11ab9d1a117afbbc1edd2b16 alsa-plugins-1.0.24.tar.bz2 +038c023eaa51171f018fbf7141255185 alsa-plugins-1.0.25.tar.bz2 From 8ebc0f22049ff03093ed65e5607dc084fd16971d Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Wed, 1 Feb 2012 11:03:28 +0100 Subject: [PATCH 3/5] remove extra files --- alsa-plugins.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index fbbd0c0..df91f48 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -6,7 +6,7 @@ Name: alsa-plugins Version: 1.0.25 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ # pph plugin is BSD-like licensed @@ -175,6 +175,9 @@ install -m 644 %SOURCE2 \ install -m 644 %SOURCE7 \ ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa +rm ${RPM_BUILD_ROOT}%{_datadir)/alsa/alsa.conf.d/50-pulseaudio.conf +rm ${RPM_BUILD_ROOT}%{_datadir)/alsa/alsa.conf.d/99-pulseaudio-default.conf.example + find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \; %clean @@ -263,7 +266,7 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Wed Feb 1 2012 Jaroslav Kysela - 1.0.25-1 +* Wed Feb 1 2012 Jaroslav Kysela - 1.0.25-2 - Updated to 1.0.25 * Thu Jan 19 2012 Nikola Pajkovsky - 1.0.24-3 From f60b414113f0efb1267cbdb2d6eded3f1994ca4b Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Wed, 1 Feb 2012 11:05:01 +0100 Subject: [PATCH 4/5] remove extra files --- alsa-plugins.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index df91f48..38fe2e5 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -6,7 +6,7 @@ Name: alsa-plugins Version: 1.0.25 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ # pph plugin is BSD-like licensed @@ -175,8 +175,8 @@ install -m 644 %SOURCE2 \ install -m 644 %SOURCE7 \ ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa -rm ${RPM_BUILD_ROOT}%{_datadir)/alsa/alsa.conf.d/50-pulseaudio.conf -rm ${RPM_BUILD_ROOT}%{_datadir)/alsa/alsa.conf.d/99-pulseaudio-default.conf.example +rm ${RPM_BUILD_ROOT}%{_datadir}/alsa/alsa.conf.d/50-pulseaudio.conf +rm ${RPM_BUILD_ROOT}%{_datadir}/alsa/alsa.conf.d/99-pulseaudio-default.conf.example find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \; @@ -266,7 +266,7 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Wed Feb 1 2012 Jaroslav Kysela - 1.0.25-2 +* Wed Feb 1 2012 Jaroslav Kysela - 1.0.25-3 - Updated to 1.0.25 * Thu Jan 19 2012 Nikola Pajkovsky - 1.0.24-3 From 0e3bdbbad5ad117701143c3663bcc03d5d537fe9 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Thu, 6 Sep 2012 16:20:02 +0200 Subject: [PATCH 5/5] Updated to 1.0.26 --- .gitignore | 1 + alsa-plugins.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6c6b066..28fa539 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ alsa-plugins-1.0.22.tar.bz2 /alsa-tools-1.0.24.tar.bz2 /alsa-plugins-1.0.24.tar.bz2 /alsa-plugins-1.0.25.tar.bz2 +/alsa-plugins-1.0.26.tar.bz2 diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 38fe2e5..471465c 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -5,8 +5,8 @@ %endif Name: alsa-plugins -Version: 1.0.25 -Release: 3%{?dist} +Version: 1.0.26 +Release: 1%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ # pph plugin is BSD-like licensed @@ -266,6 +266,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Sep 6 2012 Jaroslav Kysela - 1.0.26-1 +- Updated to 1.0.26 + * Wed Feb 1 2012 Jaroslav Kysela - 1.0.25-3 - Updated to 1.0.25 diff --git a/sources b/sources index dee95e9..54aec69 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -038c023eaa51171f018fbf7141255185 alsa-plugins-1.0.25.tar.bz2 +4facd408326ef5567a7d4ceb6589e6b0 alsa-plugins-1.0.26.tar.bz2