From 92f135587846eb03efc19432be054fe6c3ce6f95 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@fedoraproject.org>
Date: Wed, 17 Oct 2007 23:02:44 +0000
Subject: [PATCH] plit pulse.conf into two, so that we can load one part from
 form     /etc/alsa/alsa.conf. (#251943)

---
 alsa-plugins.spec  | 10 +++++++++-
 pulse-default.conf |  9 +++++++++
 pulseaudio.conf    |  7 -------
 3 files changed, 18 insertions(+), 8 deletions(-)
 create mode 100644 pulse-default.conf

diff --git a/alsa-plugins.spec b/alsa-plugins.spec
index f1bf245..4617d33 100644
--- a/alsa-plugins.spec
+++ b/alsa-plugins.spec
@@ -1,6 +1,6 @@
 Name:           alsa-plugins
 Version:        1.0.14
-Release:        4%{?dist}
+Release:        5%{?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+
@@ -13,6 +13,7 @@ Source3:        pulseaudio.conf
 Source4:        samplerate.conf
 Source5:        upmix.conf
 Source6:        vdownmix.conf
+Source7:	pulse-default.conf
 Patch0:		1.0.14-buffer-attr.patch
 Patch1:		1.0.14-state-xrun.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -111,6 +112,8 @@ install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa/pcm
 install -m 644 %SOURCE1 %SOURCE2 %SOURCE3 \
                %SOURCE4 %SOURCE5 %SOURCE6 \
                    ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa/pcm
+install -m 644 %SOURCE7 \
+                   ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa
 
 find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \;
 
@@ -138,6 +141,7 @@ rm -rf $RPM_BUILD_ROOT
 %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
 
@@ -164,6 +168,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/alsa-lib/libasound_module_pcm_vdownmix.so
 
 %changelog
+* 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)
+
 * Mon Oct 1 2007 Lennart Poettering <lpoetter@redhat.com> - 1.0.14-4
 - In the pulse plugin: reflect the XRUN state back to the application.
   Makes XMMS work on top of the alsa plugin. (#307341)
diff --git a/pulse-default.conf b/pulse-default.conf
new file mode 100644
index 0000000..032f87e
--- /dev/null
+++ b/pulse-default.conf
@@ -0,0 +1,9 @@
+# pulseaudio plugin configuration
+
+pcm.!default {
+    type pulse
+}
+
+ctl.!default {
+    type pulse
+}
diff --git a/pulseaudio.conf b/pulseaudio.conf
index 16652e2..f9ccc1f 100644
--- a/pulseaudio.conf
+++ b/pulseaudio.conf
@@ -8,10 +8,3 @@ ctl.pulse {
     type pulse
 }
 
-pcm.!default {
-    type pulse
-}
-
-ctl.!default {
-    type pulse
-}