From c9f36ce3a6fb171abf3301b1639b3be6bd407b3d Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@fedoraproject.org>
Date: Oct 18 2007 12:52:05 +0000
Subject: - Merge the whole /etc/alsa/pcm/pulseaudio.conf stuff into

    /etc/alsa/pulse-default.conf, because the former is practically always
    ignored, since it is not referenced for inclusion by any other
    configuration file fragment (#251943) The other fragments installed in
    /etc/alsa/pcm/ are useless, too. But since we are in a freeze and they
    are not that important, I am not fixing this now.

---

diff --git a/alsa-plugins.spec b/alsa-plugins.spec
index 4617d33..74ccc0b 100644
--- a/alsa-plugins.spec
+++ b/alsa-plugins.spec
@@ -1,6 +1,6 @@
 Name:           alsa-plugins
 Version:        1.0.14
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        The Advanced Linux Sound Architecture (ALSA) Plugins
 # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+
 License:        GPLv2+ and LGPLv2+
@@ -9,7 +9,6 @@ URL:            http://www.alsa-project.org/
 Source0:        ftp://ftp.alsa-project.org/pub/plugins/%{name}-%{version}.tar.bz2
 Source1:        jack.conf
 Source2:        pcm-oss.conf
-Source3:        pulseaudio.conf
 Source4:        samplerate.conf
 Source5:        upmix.conf
 Source6:        vdownmix.conf
@@ -109,7 +108,7 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa/pcm
-install -m 644 %SOURCE1 %SOURCE2 %SOURCE3 \
+install -m 644 %SOURCE1 %SOURCE2 \
                %SOURCE4 %SOURCE5 %SOURCE6 \
                    ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa/pcm
 install -m 644 %SOURCE7 \
@@ -140,7 +139,6 @@ rm -rf $RPM_BUILD_ROOT
 %files pulseaudio
 %defattr(-,root,root,-)
 %doc COPYING COPYING.GPL doc/README-pulse
-%config(noreplace) %{_sysconfdir}/alsa/pcm/pulseaudio.conf
 %config(noreplace) %{_sysconfdir}/alsa/pulse-default.conf
 %{_libdir}/alsa-lib/libasound_module_pcm_pulse.so
 %{_libdir}/alsa-lib/libasound_module_ctl_pulse.so
@@ -168,6 +166,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/alsa-lib/libasound_module_pcm_vdownmix.so
 
 %changelog
+* Thu Oct 18 2007 Lennart Poettering <lpoetter@redhat.com> - 1.0.14-6
+- Merge the whole /etc/alsa/pcm/pulseaudio.conf stuff into
+  /etc/alsa/pulse-default.conf, because the former is practically
+  always ignored, since it is not referenced for inclusion by any other
+  configuration file fragment (#251943)
+  The other fragments installed in /etc/alsa/pcm/ are useless, too. But
+  since we are in a freeze and they are not that important, I am not fixing
+  this now.
+
 * Wed Oct 17 2007 Lennart Poettering <lpoetter@redhat.com> - 1.0.14-5
 - Split pulse.conf into two, so that we can load one part from
   form /etc/alsa/alsa.conf. (#251943)
diff --git a/pulse-default.conf b/pulse-default.conf
index 032f87e..d18023a 100644
--- a/pulse-default.conf
+++ b/pulse-default.conf
@@ -1,4 +1,16 @@
-# pulseaudio plugin configuration
+# PulseAudio plugin configuration
+
+# Let's create a virtual device "pulse" for mixer and PCM
+
+pcm.pulse {
+    type pulse
+}
+
+ctl.pulse {
+    type pulse
+}
+
+# Let's make it the default!
 
 pcm.!default {
     type pulse
@@ -7,3 +19,4 @@ pcm.!default {
 ctl.!default {
     type pulse
 }
+
diff --git a/pulseaudio.conf b/pulseaudio.conf
deleted file mode 100644
index f9ccc1f..0000000
--- a/pulseaudio.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# pulseaudio plugin configuration
-
-pcm.pulse {
-    type pulse
-}
-
-ctl.pulse {
-    type pulse
-}
-