rpms/alsa-lib/devel alsa-lib-pulse-default.patch, NONE, 1.1 alsa-lib.spec, 1.62, 1.63

[Lennart Poettering (lennart)]

Author: lennart

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

Modified Files:
	alsa-lib.spec 
Added Files:
	alsa-lib-pulse-default.patch 
Log Message:
Add hook to /etc/alsa/alsa.conf so that /etc/alsa/default-pulse.conf
  is loaded when it exists. This allows us to enable the pulse plugin by
    default depending on whether it is installed or not.



alsa-lib-pulse-default.patch:

--- NEW FILE alsa-lib-pulse-default.patch ---
--- alsa-lib-1.0.15rc3.lennart/src/conf/alsa.conf	2007-10-17 18:28:03.000000000 -0400
+++ alsa-lib-1.0.15rc3/src/conf/alsa.conf	2007-10-17 18:33:10.000000000 -0400
@@ -8,6 +8,7 @@
 	{
 		func load
 		files [
+			"/etc/alsa/pulse-default.conf"
 			"/etc/asound.conf"
 			"~/.asoundrc"
 		]


Index: alsa-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/devel/alsa-lib.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- alsa-lib.spec	15 Oct 2007 12:46:28 -0000	1.62
+++ alsa-lib.spec	17 Oct 2007 23:00:08 -0000	1.63
@@ -4,12 +4,13 @@
 Summary: The Advanced Linux Sound Architecture (ALSA) library
 Name:    alsa-lib
 Version: 1.0.15
-Release: 0.3%{?prever_dot}%{?dist}
+Release: 0.4%{?prever_dot}%{?dist}
 License: LGPLv2+
 Group:   System Environment/Libraries
 Source:  ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}%{?postver}.tar.bz2
 Patch0:  alsa-lib-1.0.14rc1-config.patch
 Patch2:  alsa-lib-1.0.14-glibc-open.patch
+Patch3:	 alsa-lib-pulse-default.patch
 URL:     http://www.alsa-project.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: doxygen
@@ -40,6 +41,7 @@
 %setup -q -n %{name}-%{version}%{?prever}
 %patch0 -p1 -b .config
 %patch2 -p1 -b .glibc-open
+%patch3 -p1 -b .pulse-default
 
 %build
 %configure --with-configdir=%{_sysconfdir}/alsa
@@ -87,6 +89,11 @@
 %{_datadir}/aclocal/alsa.m4
 
 %changelog
+* Wed Oct 17 2007 Lennart Poettering <lpoetter at redhat.com> 1.0.15-0.3.rc3
+- Add hook to /etc/alsa/alsa.conf so that /etc/alsa/default-pulse.conf
+  is loaded when it exists. This allows us to enable the pulse plugin by
+  default depending on whether it is installed or not.
+
 * Mon Oct 15 2007 Martin Stransky <stransky at redhat.com> 1.0.15-0.3.rc3
 - updated to 1.0.15rc3