- use __rm macro for arecord.1

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

diff --git a/alsa-utils.spec b/alsa-utils.spec
index 6adc2124ed5174a93049461f3f51f6e3113e25ac..fca3cb1ecbdf4dad37fb0cf19c47098bfec44ab8 100644 (file)
--- a/alsa-utils.spec
+++ b/alsa-utils.spec
@@ -5,37 +5,40 @@ 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.21
-Release:       1
+Version:       1.0.24.2
+Release:       2
 # 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: 3672287c2608040d111ce45495ba7602
+# Source0-md5: 8238cd57cb301d1c36bcf0ecb59ce6b2
 Source1:       alsasound.init
+# does anything use this (probably outdated) file? not alsasound.init
 Source2:       alsa-oss-pcm
-Source3:       alsa-udev.rules
-Source4:       alsactl.conf
-URL:           http://www.alsa-project.org/
+Source3:       alsactl.conf
 Patch0:                %{name}-fast_sampling.patch
 Patch1:                %{name}-modprobe.patch
-BuildRequires: alsa-lib-devel >= 1.0.14
+Patch2:                %{name}-link.patch
+URL:           http://www.alsa-project.org/
+BuildRequires: alsa-lib-devel >= 1.0.16
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake
 BuildRequires: flex
-BuildRequires: gettext-devel >= 0.14
+BuildRequires: gettext-devel >= 0.15
+BuildRequires: libsamplerate-devel
 BuildRequires: libtool
 BuildRequires: ncurses-devel
+BuildRequires: ncurses-ext-devel
 BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: xmlto
-Requires:      alsa-lib >= 1.0.14
+Requires:      alsa-lib >= 1.0.20-2
 Requires:      awk
 Requires:      dialog
 Requires:      diffutils
 Requires:      which
 Suggests:      gpm
-Obsoletes:     alsaconf
 Obsoletes:     alsa-udev
+Obsoletes:     alsaconf
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -80,6 +83,19 @@ Utilitários para o ALSA, a arquitetura de som avançada para o Linux.
 - amixer - мікшер, який керується з командного рядка
 - alsamixer - мікшер з інтерфейсом ncurses
 
+%package -n udev-alsa
+Summary:       udev rules for Advanced Linux Sound Architecture
+Summary(pl.UTF-8):     Reguły udeva dla Advanced Linux Sound Architecture
+Group:         Applications/Sound
+Requires:      %{name} = %{version}-%{release}
+Requires:      udev-core
+
+%description -n udev-alsa
+udev rules for Advanced Linux Sound Architecture.
+
+%description -n udev-alsa -l pl.UTF-8
+Reguły udeva dla Advanced Linux Sound Architecture.
+
 %package init
 Summary:       Init script for Advanced Linux Sound Architecture
 Summary(pl.UTF-8):     Skrypt init dla Advanced Linux Sound Architecture
@@ -99,6 +115,7 @@ Skrypt init dla Advanced Linux Sound Architecture.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__gettextize}
@@ -121,8 +138,7 @@ 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 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/alsa/alsactl.conf
 
 install -d $RPM_BUILD_ROOT/lib/alsa
 mv $RPM_BUILD_ROOT%{_datadir}/alsa/init $RPM_BUILD_ROOT/lib/alsa
@@ -131,7 +147,7 @@ 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
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/arecord.1
 echo ".so aplay.1" > $RPM_BUILD_ROOT%{_mandir}/man1/arecord.1
 
 %find_lang alsa-utils --all-name
@@ -158,14 +174,33 @@ if [ "$1" = "0" ]; then
        /sbin/chkconfig --del alsasound
 fi
 
+%triggerpostun -- %{name} < 1.0.24.2-2
+install -d /var/lib/alsa
+mv -f /etc/asound.state /var/lib/alsa/asound.state
+
 %files -f alsa-utils.lang
 %defattr(644,root,root,755)
-%doc README ChangeLog
-%attr(755,root,root) /sbin/*
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_sbindir}/*
+%doc ChangeLog README TODO
+%attr(755,root,root) /sbin/alsaconf
+%attr(755,root,root) /sbin/alsactl
+%attr(755,root,root) %{_bindir}/aconnect
+%attr(755,root,root) %{_bindir}/alsaloop
+%attr(755,root,root) %{_bindir}/alsamixer
+%attr(755,root,root) %{_bindir}/alsaucm
+%attr(755,root,root) %{_bindir}/amidi
+%attr(755,root,root) %{_bindir}/amixer
+%attr(755,root,root) %{_bindir}/aplay
+%attr(755,root,root) %{_bindir}/aplaymidi
+%attr(755,root,root) %{_bindir}/arecord
+%attr(755,root,root) %{_bindir}/arecordmidi
+%attr(755,root,root) %{_bindir}/aseqdump
+%attr(755,root,root) %{_bindir}/aseqnet
+%attr(755,root,root) %{_bindir}/iecset
+%attr(755,root,root) %{_bindir}/speaker-test
+# symlink
+%attr(755,root,root) %{_sbindir}/alsactl
 %{_sysconfdir}/alsa/alsactl.conf
-%{_sysconfdir}/udev/rules.d/90-alsa.rules
+%dir /var/lib/alsa
 %dir /lib/alsa
 /lib/alsa/init
 %{_datadir}/alsa/init
@@ -173,6 +208,7 @@ fi
 %{_datadir}/sounds/alsa
 %{_mandir}/man1/aconnect.1*
 %{_mandir}/man1/alsactl.1*
+%{_mandir}/man1/alsaloop.1*
 %{_mandir}/man1/alsamixer.1*
 %{_mandir}/man1/amidi.1*
 %{_mandir}/man1/amixer.1*
@@ -188,6 +224,10 @@ fi
 %{_mandir}/man8/alsaconf.8*
 %lang(fr) %{_mandir}/fr/man8/alsaconf.8*
 
+%files -n udev-alsa
+%defattr(644,root,root,755)
+/lib/udev/rules.d/90-alsa-restore.rules
+
 %files init
 %defattr(644,root,root,755)
 %attr(754,root,root) /etc/rc.d/init.d/alsasound