From e137deed62469939ccfd7908c8b242ba19eb9b33 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Oct 03 2005 12:40:40 +0000 Subject: fixes in config files, new ainit (for #166086) --- diff --git a/.cvsignore b/.cvsignore index 790fbc0..9f2e9db 100644 --- a/.cvsignore +++ b/.cvsignore @@ -3,3 +3,4 @@ alsacard.c alsa-lib-1.0.9.tar.bz2 ainit-0.5.tar.gz alsa-lib-1.0.10rc1.tar.bz2 +ainit-0.6.tar.gz diff --git a/alsa-lib.spec b/alsa-lib.spec index d7cb8bb..2557e52 100644 --- a/alsa-lib.spec +++ b/alsa-lib.spec @@ -1,20 +1,20 @@ %define version_main 1.0.10rc1 %define version_app -%define version_ainit 0.5 +%define version_ainit 0.6 Summary: The Advanced Linux Sound Architecture (ALSA) library. -Name: alsa-lib +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 +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.patch -URL: http://www.alsa-project.org/ +Patch0: alsa-lib-1.0.10-ainit.patch +URL: http://www.alsa-project.org/ BuildRoot: %{_tmppath}/%{name}-%{version_main}-root BuildRequires: doxygen -Prereq: /sbin/ldconfig, coreutils +Prereq: /sbin/ldconfig, coreutils %description The Advanced Linux Sound Architecture (ALSA) provides audio and MIDI @@ -65,6 +65,9 @@ ln -snf ../../%{_lib}/libasound.so.2 %{buildroot}%{_libdir}/libasound.so mv %{buildroot}/etc/aclocal %{buildroot}%{_datadir} +rm %{buildroot}%{_sysconfdir}/alsa/pcm/dmix.conf +rm %{buildroot}%{_sysconfdir}/alsa/pcm/dsnoop.conf + # install ainit binaries install -m 755 ainit/ainit %{buildroot}%{_bindir} @@ -115,8 +118,8 @@ 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(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 @@ -134,6 +137,9 @@ ln -snf ../../etc/alsa %{_datadir}/alsa %{_datadir}/aclocal/alsa.m4 %changelog +* Tue Sep 27 2005 Martin Stransky 1.0.10rc1-2 +- fixes in config files, new ainit (for #166086) + * Tue Sep 27 2005 Martin Stransky 1.0.10rc1-1 - new upstream version diff --git a/sources b/sources index 83f0f1f..e78a421 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -51451c0e06e5334bb08d3126f3444e0c ainit-0.5.tar.gz 803c9684af07da50f6de1cc9fb57373c alsa-lib-1.0.10rc1.tar.bz2 +16bbe521dfc466200399d59f274b4001 ainit-0.6.tar.gz