X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=alsa-utils.spec;h=666fae0e7eded07b352795620ef895673e897925;hb=74ee69e49ce851f294dd5e9261b59ea1745525a4;hp=033f6bb70d0ff694b3f8323842a01fae7f3d6a08;hpb=b8121b514788f921f75600c86e94813c51be03e5;p=packages%2Falsa-utils.git

diff --git a/alsa-utils.spec b/alsa-utils.spec
index 033f6bb..666fae0 100644
--- 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.14
+Version:	1.0.20
 Release:	1
-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:	6d3009c157ac6fc803696d6590a48366
+# 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)
 
@@ -79,6 +83,7 @@ Group:		Applications/Sound
 Requires(post,preun):	/sbin/chkconfig
 Requires:	%{name} = %{version}-%{release}
 Requires:	rc-scripts
+Obsoletes:	alsa-udev
 
 %description init
 Init script for Advanced Linux Sound Architecture.
@@ -88,6 +93,8 @@ Skrypt init dla Advanced Linux Sound Architecture.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 %{__gettextize}
@@ -135,6 +142,7 @@ fi
 %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*
@@ -150,10 +158,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