diff --git a/.cvsignore b/.cvsignore index d366639..15f54ae 100644 --- a/.cvsignore +++ b/.cvsignore @@ -6,3 +6,4 @@ alsa-lib-1.0.10rc1.tar.bz2 ainit-0.6.tar.gz alsa-lib-1.0.10.tar.bz2 alsa-lib-1.0.11rc2.tar.bz2 +ainit-0.7.tar.gz diff --git a/alsa-lib.spec b/alsa-lib.spec index 605397e..87c562e 100644 --- a/alsa-lib.spec +++ b/alsa-lib.spec @@ -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 @@ against the ALSA libraries and interfaces. %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/dsnoop.template %{buildroot}%{_sysconfdir}/alsa/pcm/ 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 @@ ln -snf ../../etc/alsa %{_datadir}/alsa %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 @@ ln -snf ../../etc/alsa %{_datadir}/alsa %{_datadir}/aclocal/alsa.m4 %changelog +* Fri Jan 13 2006 Martin Stransky 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 1.0.11-1.rc2 - new upstream version diff --git a/sources b/sources index f1ffa25..8b5d294 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -16bbe521dfc466200399d59f274b4001 ainit-0.6.tar.gz 4e73229d7f88a6610993470011d39ee6 alsa-lib-1.0.11rc2.tar.bz2 +062cf16b02de99ddea47a76884d7fe3d ainit-0.7.tar.gz