- updated to 1.1.3

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

diff --git a/alsa-utils.spec b/alsa-utils.spec
index fe121df60f28894ae16511e1fe554f1f1bfbfd8b..5dea47e334c2c595bd416a6b4b679840e95b1f86 100644 (file)
--- a/alsa-utils.spec
+++ b/alsa-utils.spec
@@ -5,40 +5,45 @@ 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.25
+Version:       1.1.3
 Release:       1
 # 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: f81f9dcb9a014fd32cb3a70066a5b9a9
+# Source0-md5: 2bf94d3e3410dcc74bb0dae10d46a979
 Source1:       alsasound.init
 # does anything use this (probably outdated) file? not alsasound.init
 Source2:       alsa-oss-pcm
 Source3:       alsactl.conf
 Patch0:                %{name}-fast_sampling.patch
 Patch1:                %{name}-modprobe.patch
-Patch2:                %{name}-link.patch
+Patch2:                %{name}-missing.patch
 URL:           http://www.alsa-project.org/
-BuildRequires: alsa-lib-devel >= 1.0.24
+BuildRequires: alsa-lib-devel >= 1.0.27
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake
-BuildRequires: gettext-devel >= 0.15
+# rst2man
+BuildRequires: docutils
+BuildRequires: fftw3-devel >= 3
+BuildRequires: gettext-tools >= 0.15
 BuildRequires: libsamplerate-devel >= 0.1.3
 BuildRequires: libtool
-BuildRequires: ncurses-devel
-BuildRequires: ncurses-ext-devel
+BuildRequires: ncurses-devel >= 5
+BuildRequires: ncurses-ext-devel >= 5
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: xmlto
-Requires:      alsa-lib >= 1.0.20-2
+Requires:      alsa-lib >= 1.0.27
 Requires:      awk
 Requires:      dialog
 Requires:      diffutils
+Requires:      systemd-units >= 0.38
 Requires:      which
 Suggests:      gpm
 Obsoletes:     alsa-udev
 Obsoletes:     alsaconf
+Obsoletes:     udev-alsa
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -83,19 +88,6 @@ 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
@@ -103,6 +95,7 @@ Group:               Applications/Sound
 Requires(post,preun):  /sbin/chkconfig
 Requires:      %{name} = %{version}-%{release}
 Requires:      rc-scripts
+Requires:      systemd-units
 Obsoletes:     alsa-udev
 
 %description init
@@ -127,7 +120,9 @@ CFLAGS="%{rpmcflags} -I/usr/include/ncurses"
 CXXFLAGS="%{rpmcxxflags} -fno-rtti -fno-exceptions"
 # we need alsactl for udev as early as possible
 %configure \
-       --sbindir=/sbin
+       --sbindir=/sbin \
+       --with-systemdsystemunitdir=%{systemdunitdir}
+
 %{__make}
 
 %install
@@ -157,7 +152,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %pretrans
 # this needs to be a dir
-if [ -d %{_datadir}/alsa/init ]; then
+if [ -d %{_datadir}/alsa/init -a ! -h %{_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.
@@ -183,11 +178,15 @@ fi
 %files -f alsa-utils.lang
 %defattr(644,root,root,755)
 %doc ChangeLog README TODO
+%attr(755,root,root) /sbin/alsa-info.sh
+%attr(755,root,root) /sbin/alsabat-test.sh
 %attr(755,root,root) /sbin/alsaconf
 %attr(755,root,root) /sbin/alsactl
 %attr(755,root,root) %{_bindir}/aconnect
+%attr(755,root,root) %{_bindir}/alsabat
 %attr(755,root,root) %{_bindir}/alsaloop
 %attr(755,root,root) %{_bindir}/alsamixer
+%attr(755,root,root) %{_bindir}/alsatplg
 %attr(755,root,root) %{_bindir}/alsaucm
 %attr(755,root,root) %{_bindir}/amidi
 %attr(755,root,root) %{_bindir}/amixer
@@ -202,6 +201,9 @@ fi
 # symlink
 %attr(755,root,root) %{_sbindir}/alsactl
 %{_sysconfdir}/alsa/alsactl.conf
+/lib/udev/rules.d/90-alsa-restore.rules
+%{systemdunitdir}/alsa-restore.service
+%{systemdunitdir}/basic.target.wants/alsa-restore.service
 %dir /var/lib/alsa
 %dir /lib/alsa
 /lib/alsa/init
@@ -209,28 +211,29 @@ fi
 %{_datadir}/alsa/speaker-test
 %{_datadir}/sounds/alsa
 %{_mandir}/man1/aconnect.1*
+%{_mandir}/man1/alsa-info.sh.1*
+%{_mandir}/man1/alsabat.1*
 %{_mandir}/man1/alsactl.1*
 %{_mandir}/man1/alsaloop.1*
 %{_mandir}/man1/alsamixer.1*
+%{_mandir}/man1/alsaucm.1*
 %{_mandir}/man1/amidi.1*
 %{_mandir}/man1/amixer.1*
 %{_mandir}/man1/aplay.1*
 %{_mandir}/man1/aplaymidi.1*
 %{_mandir}/man1/arecord.1*
 %{_mandir}/man1/arecordmidi.1*
-%{_mandir}/man1/aseqnet.1*
 %{_mandir}/man1/aseqdump.1*
+%{_mandir}/man1/aseqnet.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 -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
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/alsa-oss-pcm
+%{systemdunitdir}/alsa-state.service
+%{systemdunitdir}/basic.target.wants/alsa-state.service