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

[Lennart Poettering (lennart)]

Author: lennart

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

Modified Files:
	alsa-plugins.spec pulse-default.conf 
Removed Files:
	pulseaudio.conf 
Log Message:
- 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.




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


Index: pulse-default.conf
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-plugins/devel/pulse-default.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pulse-default.conf	17 Oct 2007 23:02:44 -0000	1.1
+++ pulse-default.conf	18 Oct 2007 12:52:05 -0000	1.2
@@ -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 @@
 ctl.!default {
     type pulse
 }
+


--- pulseaudio.conf DELETED ---