- move asound.conf to alsa-lib

[packages/alsa-utils.git] / alsa-utils.spec

diff --git a/alsa-utils.spec b/alsa-utils.spec
index 219f8e88e5272a719123b761af0f77f15b3aee4f..450a3c951fa412357687ecb25c9414a03d54e290 100644 (file)
--- a/alsa-utils.spec
+++ b/alsa-utils.spec
@@ -5,15 +5,18 @@ Summary(pt_BR.UTF-8): Utilitários para o ALSA (Advanced Linux Sound Architectur
 Summary(ru.UTF-8):     Утилиты командной строки для ALSA project
 Summary(uk.UTF-8):     Утиліти командного рядка для ALSA project
 Name:          alsa-utils
-Version:       1.0.15
+Version:       1.0.20
 Release:       2
-License:       GPL
+# some apps GPL v2, some GPL v2+
+License:       GPL v2
 Group:         Applications/Sound
 Source0:       ftp://ftp.alsa-project.org/pub/utils/%{name}-%{version}.tar.bz2
-# Source0-md5: 287f46f891581c15018de4f8c0731575
+# Source0-md5: 6837e673ef19da96d8bd2f9e18cd9574
 Source1:       alsasound.init
 Source2:       alsa-oss-pcm
 URL:           http://www.alsa-project.org/
+Patch0:                %{name}-fast_sampling.patch
+Patch1:                %{name}-modprobe.patch
 BuildRequires: alsa-lib-devel >= 1.0.14
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake
@@ -27,6 +30,7 @@ Requires:     awk
 Requires:      dialog
 Requires:      diffutils
 Requires:      which
+Suggests:      gpm
 Obsoletes:     alsaconf
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -89,6 +93,8 @@ Skrypt init dla Advanced Linux Sound Architecture.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 %{__gettextize}
@@ -113,8 +119,6 @@ install -D %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/alsa-oss-pcm
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/arecord.1
 echo ".so aplay.1" > $RPM_BUILD_ROOT%{_mandir}/man1/arecord.1
 
-touch $RPM_BUILD_ROOT%{_sysconfdir}/asound.conf
-
 %find_lang alsa-utils --all-name
 
 %clean
@@ -133,9 +137,9 @@ fi
 %files -f alsa-utils.lang
 %defattr(644,root,root,755)
 %doc README ChangeLog
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asound.conf
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_sbindir}/*
+%{_datadir}/alsa/init
 %{_datadir}/alsa/speaker-test
 %{_datadir}/sounds/alsa
 %{_mandir}/man1/aconnect.1*
@@ -151,10 +155,11 @@ fi
 %{_mandir}/man1/aseqdump.1*
 %{_mandir}/man1/iecset.1*
 %{_mandir}/man1/speaker-test.1*
+%{_mandir}/man7/alsactl_init.7*
 %{_mandir}/man8/alsaconf.8*
 %lang(fr) %{_mandir}/fr/man8/alsaconf.8*
 
 %files init
 %defattr(644,root,root,755)
-%attr(754,root,root) /etc/rc.d/init.d/*
-%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/*
+%attr(754,root,root) /etc/rc.d/init.d/alsasound
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/alsa-oss-pcm