rpms/alsa-plugins/devel pulse-default.conf, NONE, 1.1 alsa-plugins.spec, 1.4, 1.5 pulseaudio.conf, 1.2, 1.3

[Lennart Poettering (lennart)]

Author: lennart

Update of /cvs/pkgs/rpms/alsa-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16975

Modified Files:
	alsa-plugins.spec pulseaudio.conf 
Added Files:
	pulse-default.conf 
Log Message:

plit pulse.conf into two, so that we can load one part from
  form /etc/alsa/alsa.conf. (#251943)




--- NEW FILE pulse-default.conf ---
# pulseaudio plugin configuration

pcm.!default {
    type pulse
}

ctl.!default {
    type pulse
}


Index: alsa-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-plugins/devel/alsa-plugins.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- alsa-plugins.spec	1 Oct 2007 19:44:48 -0000	1.4
+++ alsa-plugins.spec	17 Oct 2007 23:02:44 -0000	1.5
@@ -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 @@
 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 -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 @@
 %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 @@
 %{_libdir}/alsa-lib/libasound_module_pcm_vdownmix.so
 
 %changelog
+* Wed Oct 17 2007 Lennart Poettering <lpoetter at 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 at 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)


Index: pulseaudio.conf
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-plugins/devel/pulseaudio.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pulseaudio.conf	15 Aug 2007 04:36:18 -0000	1.2
+++ pulseaudio.conf	17 Oct 2007 23:02:44 -0000	1.3
@@ -8,10 +8,3 @@
     type pulse
 }
 
-pcm.!default {
-    type pulse
-}
-
-ctl.!default {
-    type pulse
-}