rpms/alsa-lib/FC-4 alsa-lib-1.0.11-group.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 alsa-lib.spec, 1.32, 1.33 sources, 1.17, 1.18

[fedora-cvs-commits at redhat.com]

Author: stransky

Update of /cvs/dist/rpms/alsa-lib/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv18797

Modified Files:
	.cvsignore alsa-lib.spec sources 
Added Files:
	alsa-lib-1.0.11-group.patch 
Log Message:
new ainit (0.7), fix for SW modems and root users

alsa-lib-1.0.11-group.patch:
 dmix.conf   |    1 -
 dsnoop.conf |    1 -
 2 files changed, 2 deletions(-)

--- NEW FILE alsa-lib-1.0.11-group.patch ---
--- alsa-lib-1.0.11rc2/src/conf/pcm/dmix.conf.old	2005-09-19 14:38:14.000000000 +0200
+++ alsa-lib-1.0.11rc2/src/conf/pcm/dmix.conf	2006-01-13 14:56:10.000000000 +0100
@@ -26,7 +26,6 @@
 	}
 	type dmix
 	ipc_key 5678293
-	ipc_gid audio
 	ipc_perm 0660
 	slave {
 		pcm {
--- alsa-lib-1.0.11rc2/src/conf/pcm/dsnoop.conf.old	2005-09-08 08:36:00.000000000 +0200
+++ alsa-lib-1.0.11rc2/src/conf/pcm/dsnoop.conf	2006-01-13 14:56:17.000000000 +0100
@@ -26,7 +26,6 @@
 	}
 	type dsnoop
 	ipc_key 5778293
-	ipc_gid audio
 	ipc_perm 0660
 	slave {
 		pcm {


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/alsa-lib/FC-4/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	5 Dec 2005 06:58:46 -0000	1.15
+++ .cvsignore	16 Jan 2006 09:05:38 -0000	1.16
@@ -3,3 +3,4 @@
 alsa-lib-1.0.9.tar.bz2
 ainit-0.6.tar.gz
 alsa-lib-1.0.10.tar.bz2
+ainit-0.7.tar.gz


Index: alsa-lib.spec
===================================================================
RCS file: /cvs/dist/rpms/alsa-lib/FC-4/alsa-lib.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- alsa-lib.spec	6 Dec 2005 06:52:13 -0000	1.32
+++ alsa-lib.spec	16 Jan 2006 09:05:39 -0000	1.33
@@ -1,16 +1,17 @@
 %define  version_lib   1.0.10
-%define  version_ainit 0.6
+%define  version_ainit 0.7
 
 Summary: The Advanced Linux Sound Architecture (ALSA) library.
 Name:    alsa-lib
 Version: %{version_lib}%{?version_app}
-Release: 2.FC4
+Release: 3.FC4
 License: LGPL
 Group:   System Environment/Libraries
 Source:  ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version_lib}%{?prever}.tar.bz2
 Source1: ainit-%{version_ainit}.tar.gz
 Patch0:  alsa-lib-1.0.10-ainit.patch
 Patch1:  alsa-lib-1.0.10-channel.patch
+Patch2:  alsa-lib-1.0.11-group.patch
 URL:     http://www.alsa-project.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: doxygen
@@ -40,6 +41,7 @@
 %setup -q -n %{name}-%{version_lib}%{?prever} -a 1
 %patch0 -p1 -b .ainit
 %patch1 -p1 -b .chan
+%patch2 -p1 -b .grp
 
 %build
 %configure \
@@ -77,6 +79,9 @@
 install -m 644 ainit/config/dmix.conf.lock %{buildroot}%{_sysconfdir}/alsa/pcm/dmix.conf.lock
 install -m 644 ainit/config/dsnoop.conf.lock %{buildroot}%{_sysconfdir}/alsa/pcm/dsnoop.conf.lock
 
+cp %{buildroot}%{_sysconfdir}/alsa/pcm/dmix.conf %{buildroot}%{_sysconfdir}/alsa/pcm/dmix.conf.back
+cp %{buildroot}%{_sysconfdir}/alsa/pcm/dsnoop.conf %{buildroot}%{_sysconfdir}/alsa/pcm/dsnoop.conf.back
+
 # install ainit man pages
 mkdir -p %{buildroot}%{_mandir}/man8
 install -m 644 ainit/doc/ainit.8 %{buildroot}%{_mandir}/man8/ainit.8
@@ -126,8 +131,9 @@
 %config %{_sysconfdir}/alsa/pcm/dsnoop.template
 %ghost  %{_sysconfdir}/alsa/pcm/dmix.conf.lock
 %ghost  %{_sysconfdir}/alsa/pcm/dsnoop.conf.lock
-%ghost  %{_sysconfdir}/alsa/pcm/dmix.conf
-%ghost  %{_sysconfdir}/alsa/pcm/dsnoop.conf
+%config %{_sysconfdir}/alsa/pcm/dmix.conf
+%config %{_sysconfdir}/alsa/pcm/dsnoop.conf
+%config %{_sysconfdir}/alsa/ainit.conf
 
 %files devel
 %defattr(-, root, root)
@@ -141,6 +147,9 @@
 %{_datadir}/aclocal/alsa.m4
 
 %changelog
+* Mon Jan 16 2006 Martin Stransky <stransky at redhat.com> 1.0.10-3
+- new ainit (0.7), fix for SW modems and root users 
+
 * Tue Dec 06 2005 Martin Stransky <stransky at redhat.com> 1.0.10-2
 - export snd_pcm_channel_info() from library, 
   it's needed for compatibility with 1.0.9


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/alsa-lib/FC-4/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	5 Dec 2005 06:58:46 -0000	1.17
+++ sources	16 Jan 2006 09:05:39 -0000	1.18
@@ -1,2 +1,2 @@
-16bbe521dfc466200399d59f274b4001  ainit-0.6.tar.gz
 b1a4e15c9ff81798507de470a92fcc43  alsa-lib-1.0.10.tar.bz2
+062cf16b02de99ddea47a76884d7fe3d  ainit-0.7.tar.gz