rpms/alsa-lib/devel alsa-lib-1.0.11-group.patch, NONE, 1.1 .cvsignore, 1.19, 1.20 alsa-lib.spec, 1.39, 1.40 sources, 1.21, 1.22 ainit-0.6-rights.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: stransky

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

Modified Files:
	.cvsignore alsa-lib.spec sources 
Added Files:
	alsa-lib-1.0.11-group.patch 
Removed Files:
	ainit-0.6-rights.patch 
Log Message:
fix for #169729 - Kernel update makes snd-atiixp-modem & slmodemd fail

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/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	12 Jan 2006 14:05:21 -0000	1.19
+++ .cvsignore	13 Jan 2006 15:52:56 -0000	1.20
@@ -6,3 +6,4 @@
 ainit-0.6.tar.gz
 alsa-lib-1.0.10.tar.bz2
 alsa-lib-1.0.11rc2.tar.bz2
+ainit-0.7.tar.gz


Index: alsa-lib.spec
===================================================================
RCS file: /cvs/dist/rpms/alsa-lib/devel/alsa-lib.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- alsa-lib.spec	12 Jan 2006 14:05:22 -0000	1.39
+++ alsa-lib.spec	13 Jan 2006 15:52:56 -0000	1.40
@@ -1,17 +1,17 @@
 %define prever         rc2
 %define version_main   1.0.11
-%define version_ainit  0.6
+%define version_ainit  0.7
 
 Summary: The Advanced Linux Sound Architecture (ALSA) library.
 Name:    alsa-lib
 Version: %{version_main}
-Release: 1.rc2
+Release: 2.rc2
 License: LGPL
 Group:   System Environment/Libraries
 Source:  ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version_main}%{?prever}.tar.bz2
 Source1: ainit-%{version_ainit}.tar.gz
 Patch0:  alsa-lib-1.0.10-ainit-2.patch
-Patch1:  ainit-0.6-rights.patch
+Patch1:  alsa-lib-1.0.11-group.patch
 URL:     http://www.alsa-project.org/
 BuildRoot: %{_tmppath}/%{name}-%{version_main}-root
 BuildRequires: doxygen
@@ -40,7 +40,7 @@
 %prep
 %setup -q -n %{name}-%{version_main}%{?prever} -a 1
 %patch0 -p1 -b .ainit
-%patch1 -p1 -b .rights
+%patch1 -p1 -b .group
 
 %build
 %configure \
@@ -79,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
@@ -128,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)
@@ -143,6 +147,10 @@
 %{_datadir}/aclocal/alsa.m4
 
 %changelog
+* Fri Jan 13 2006 Martin Stransky <stransky at redhat.com> 1.0.11-2.rc2
+- fix for #169729 - Kernel update makes snd-atiixp-modem & slmodemd fail
+- new ainit (0.7) should fix some problems with root users
+
 * Tue Jan 12 2006 Martin Stransky <stransky at redhat.com> 1.0.11-1.rc2
 - new upstream version
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/alsa-lib/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	12 Jan 2006 14:05:22 -0000	1.21
+++ sources	13 Jan 2006 15:52:56 -0000	1.22
@@ -1,2 +1,2 @@
-16bbe521dfc466200399d59f274b4001  ainit-0.6.tar.gz
 4e73229d7f88a6610993470011d39ee6  alsa-lib-1.0.11rc2.tar.bz2
+062cf16b02de99ddea47a76884d7fe3d  ainit-0.7.tar.gz


--- ainit-0.6-rights.patch DELETED ---