From 2951cb06ee7d3849c2f37ba6dc44656df24329ec Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Jun 20 2005 11:58:14 +0000 Subject: fix for #159411 --- diff --git a/.cvsignore b/.cvsignore index e143174..add70de 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,4 @@ alsa-lib-1.0.9rc4.tar.bz2 alsacard.c alsa-lib-1.0.9.tar.bz2 +ainit-0.5.tar.gz diff --git a/alsa-lib.spec b/alsa-lib.spec index 3f9b0d0..dd1340f 100644 --- a/alsa-lib.spec +++ b/alsa-lib.spec @@ -1,14 +1,15 @@ -%define version_main 1.0.9 -%define version_app rf +%define version_main 1.0.9 +%define version_app rf +%define version_ainit 0.5 Summary: The Advanced Linux Sound Architecture (ALSA) library. Name: alsa-lib Version: %{version_main}%{?version_app} -Release: 1 +Release: 2 License: LGPL Group: System Environment/Libraries Source: ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version_main}%{?prever}.tar.bz2 -Source1: ainit-0.4.tar.gz +Source1: ainit-%{version_ainit}.tar.gz Patch0: alsa-lib-ainit-2.patch URL: http://www.alsa-project.org/ BuildRoot: %{_tmppath}/%{name}-%{version_main}-root @@ -69,9 +70,13 @@ install -m 755 ainit/ainit %{buildroot}%{_bindir} # install ainit config files install -m 644 ainit/config/ainit.conf %{buildroot}%{_sysconfdir}/alsa/ainit.conf + install -m 644 ainit/config/dmix.template %{buildroot}%{_sysconfdir}/alsa/pcm/dmix.template install -m 644 ainit/config/dsnoop.template %{buildroot}%{_sysconfdir}/alsa/pcm/dsnoop.template +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 + # install ainit man pages mkdir -p %{buildroot}%{_mandir}/man8 install -m 644 ainit/doc/ainit.8 %{buildroot}%{_mandir}/man8/ainit.8 @@ -83,10 +88,15 @@ install -m 644 ainit/doc/ainit.template.5 %{buildroot}%{_mandir}/man5/ainit.temp %clean rm -rf %{buildroot} -%post -p /sbin/ldconfig +%post +/sbin/ldconfig +/usr/bin/ainit `cat /var/run/console/console.lock` start %postun -p /sbin/ldconfig +%preun +/usr/bin/ainit `cat /var/run/console/console.lock` stop + %triggerpostun -- alsa-lib < 1.0.6-2 ln -snf ../../etc/alsa %{_datadir}/alsa @@ -100,6 +110,12 @@ ln -snf ../../etc/alsa %{_datadir}/alsa %config %{_sysconfdir}/alsa/alsa.conf %{_bindir}/ainit %{_mandir}/man?/* +%config(noreplace) %{_sysconfdir}/alsa/pcm/dmix.conf +%config(noreplace) %{_sysconfdir}/alsa/pcm/dsnoop.conf +%config %{_sysconfdir}/alsa/pcm/dmix.template +%config %{_sysconfdir}/alsa/pcm/dsnoop.template +%ghost %{_sysconfdir}/alsa/pcm/dmix.conf.lock +%ghost %{_sysconfdir}/alsa/pcm/dsnoop.conf.lock %files devel %defattr(-, root, root) @@ -113,6 +129,9 @@ ln -snf ../../etc/alsa %{_datadir}/alsa %{_datadir}/aclocal/alsa.m4 %changelog +* Thu Jun 16 2005 Martin Stransky 1.0.9rf-2 +- fix for #159411 + * Mon May 30 2005 Martin Stransky 1.0.9rf-1 - New upstream version - moved alsacard utility to alsa-utils diff --git a/sources b/sources index cc2f410..b00a41f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -509cdf0740cd41297c7b568182974a46 ainit-0.4.tar.gz 114af3304619920ffe2b147b760700b9 alsa-lib-1.0.9.tar.bz2 +51451c0e06e5334bb08d3126f3444e0c ainit-0.5.tar.gz