X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=alsa-utils.spec;h=fca3cb1ecbdf4dad37fb0cf19c47098bfec44ab8;hb=ffa7e64af6eb9f7d1377391738b5f2e5aeeb5696;hp=6da7d633e7d93f16b8a947a547b97b23bc06519e;hpb=0da42d94b502c6b3eb00bbb21c00485be4c6c275;p=packages%2Falsa-utils.git

diff --git a/alsa-utils.spec b/alsa-utils.spec
index 6da7d63..fca3cb1 100644
--- a/alsa-utils.spec
+++ b/alsa-utils.spec
@@ -5,29 +5,39 @@ 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.24.2
 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:	8238cd57cb301d1c36bcf0ecb59ce6b2
 Source1:	alsasound.init
+# does anything use this (probably outdated) file? not alsasound.init
 Source2:	alsa-oss-pcm
-URL:		http://www.alsa-project.org/
+Source3:	alsactl.conf
 Patch0:		%{name}-fast_sampling.patch
-BuildRequires:	alsa-lib-devel >= 1.0.14
+Patch1:		%{name}-modprobe.patch
+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
-Requires:	alsa-lib >= 1.0.14
+BuildRequires:	xmlto
+Requires:	alsa-lib >= 1.0.20-2
 Requires:	awk
 Requires:	dialog
 Requires:	diffutils
 Requires:	which
+Suggests:	gpm
+Obsoletes:	alsa-udev
 Obsoletes:	alsaconf
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -73,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
@@ -91,6 +114,8 @@ Skrypt init dla Advanced Linux Sound Architecture.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 %{__gettextize}
@@ -100,7 +125,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
@@ -111,17 +138,32 @@ 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%{_sysconfdir}/alsa/alsactl.conf
 
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/arecord.1
-echo ".so aplay.1" > $RPM_BUILD_ROOT%{_mandir}/man1/arecord.1
+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
 
-touch $RPM_BUILD_ROOT%{_sysconfdir}/asound.conf
+%{__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
 
 %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"
@@ -132,16 +174,41 @@ 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
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asound.conf
-%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
+%dir /var/lib/alsa
+%dir /lib/alsa
+/lib/alsa/init
+%{_datadir}/alsa/init
 %{_datadir}/alsa/speaker-test
 %{_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*
@@ -153,10 +220,15 @@ 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 -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/*
-%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