- BR: xmlto

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

diff --git a/alsa-utils.spec b/alsa-utils.spec
index 1d6a277c9eb89b9e5828ab071cc075c8fe4cbef1..6793fff33183537dddfdf2ed30573f75c9f0925b 100644 (file)
--- a/alsa-utils.spec
+++ b/alsa-utils.spec
@@ -5,16 +5,21 @@ 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
-Release:       3
-License:       GPL
+Version:       1.0.20
+Release:       5
+# 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
+Source3:       alsa-udev.rules
+Source4:       alsactl.conf
 URL:           http://www.alsa-project.org/
 Patch0:                %{name}-fast_sampling.patch
+Patch1:                %{name}-modprobe.patch
+Patch2:                %{name}-syntax.patch
 BuildRequires: alsa-lib-devel >= 1.0.14
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake
@@ -23,13 +28,15 @@ BuildRequires:      gettext-devel >= 0.14
 BuildRequires: libtool
 BuildRequires: ncurses-devel
 BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: xmlto
 Requires:      alsa-lib >= 1.0.14
 Requires:      awk
 Requires:      dialog
 Requires:      diffutils
 Requires:      which
-Suggest:       gpm
+Suggests:      gpm
 Obsoletes:     alsaconf
+Obsoletes:     alsa-udev
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -92,6 +99,8 @@ Skrypt init dla Advanced Linux Sound Architecture.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 %{__gettextize}
@@ -101,7 +110,9 @@ Skrypt init dla Advanced Linux Sound Architecture.
 %{__automake}
 CFLAGS="%{rpmcflags} -I/usr/include/ncurses"
 CXXFLAGS="%{rpmcxxflags} -fno-rtti -fno-exceptions"
-%configure
+# we need alsactl for udev as early as possible
+%configure \
+       --sbindir=/sbin
 %{__make}
 
 %install
@@ -112,17 +123,33 @@ rm -rf $RPM_BUILD_ROOT
 
 install -D %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/alsasound
 install -D %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/alsa-oss-pcm
+install -D %{SOURCE3} $RPM_BUILD_ROOT/etc/udev/rules.d/90-alsa.rules
+install -D %{SOURCE4} $RPM_BUILD_ROOT/etc/alsa/alsactl.conf
+
+install -d $RPM_BUILD_ROOT/lib/alsa
+mv $RPM_BUILD_ROOT%{_datadir}/alsa/init $RPM_BUILD_ROOT/lib/alsa
+
+ln -s /lib/alsa/init $RPM_BUILD_ROOT%{_datadir}/alsa/init
+install -d $RPM_BUILD_ROOT%{_sbindir}
+ln -s /sbin/alsactl $RPM_BUILD_ROOT%{_sbindir}/alsactl
 
 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
 rm -rf $RPM_BUILD_ROOT
 
+%pretrans
+# this needs to be a dir
+if [ -d %{_datadir}/alsa/init ]; then
+       mv -b %{_datadir}/alsa/init{,.dir}
+%banner -e %{name} <<EOF
+Check %{_datadir}/alsa/init.dir for your own files and remove it when done.
+EOF
+fi
+
 %post init
 /sbin/chkconfig --add alsasound
 %service alsasound restart "ALSA %{version} services"
@@ -136,9 +163,14 @@ 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) /sbin/*
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_sbindir}/*
+%{_sysconfdir}/alsa/alsactl.conf
+%{_sysconfdir}/udev/rules.d/90-alsa.rules
+%dir /lib/alsa
+/lib/alsa/init
+%{_datadir}/alsa/init
 %{_datadir}/alsa/speaker-test
 %{_datadir}/sounds/alsa
 %{_mandir}/man1/aconnect.1*
@@ -154,10 +186,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