Updated to 1.0.26

Signed-off-by: Nikola Pajkovsky <npajkovs@redhat.com>
(cherry picked from commit b7ad7e8cfe)

Conflicts:

	alsa-plugins.spec

.gitignore

@@ -2,3 +2,5 @@ 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
+/alsa-plugins-1.0.26.tar.bz2

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
+Version:        1.0.26
-Release:        2%{?dist}
+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
@@ -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 \
+%if 0%{?with_jack}
-               %SOURCE2 \
+install -m 644 %SOURCE1 ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa/pcm
+%endif
+install -m 644 %SOURCE2 \
                %SOURCE3 \
                %SOURCE4 \
                %SOURCE5 \
@@ -163,6 +175,9 @@ install -m 644 %SOURCE1 \
 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
@@ -172,12 +187,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 +266,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep  6 2012 Jaroslav Kysela <jkysela@redhat.com> - 1.0.26-1
+- Updated to 1.0.26
+
+* Wed Feb  1 2012 Jaroslav Kysela <jkysela@redhat.com> - 1.0.25-3
+- Updated to 1.0.25
+
+* Thu Jan 19 2012 Nikola Pajkovsky <npajkovs@redhat.com> - 1.0.24-3
+- 761244 - please disable JACK for RHEL
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.24-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 

sources

@@ -1 +1 @@
-e4d4c90e11ab9d1a117afbbc1edd2b16  alsa-plugins-1.0.24.tar.bz2
+4facd408326ef5567a7d4ceb6589e6b0  alsa-plugins-1.0.26.tar.bz2