X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=alsa-utils.spec;h=e5e5d8b68d836cca29f6453281ffe57e83db5930;hb=HEAD;hp=8b7262208b4d3b97ab84f2914cbc57c3cde9456b;hpb=34343f9053ec2dc04730de12e0f83e5595e5d38c;p=packages%2Falsa-utils.git

diff --git a/alsa-utils.spec b/alsa-utils.spec
index 8b72622..e5e5d8b 100644
--- a/alsa-utils.spec
+++ b/alsa-utils.spec
@@ -5,40 +5,46 @@ 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.24.2
-Release:	3
+Version:	1.2.11
+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:	8238cd57cb301d1c36bcf0ecb59ce6b2
+# Source0-md5:	36676025301315789306e99e39154732
 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
-URL:		http://www.alsa-project.org/
-BuildRequires:	alsa-lib-devel >= 1.0.16
+URL:		https://www.alsa-project.org/
+BuildRequires:	alsa-lib-devel >= 1.2.10
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
-BuildRequires:	flex
-BuildRequires:	gettext-devel >= 0.15
-BuildRequires:	libsamplerate-devel
+# rst2man
+BuildRequires:	docutils
+BuildRequires:	fftw3-devel >= 3
+BuildRequires:	gettext-tools >= 0.19.8
+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:	systemd-devel >= 18
+BuildRequires:	systemd-units >= 18
 BuildRequires:	xmlto
-Requires:	alsa-lib >= 1.0.20-2
+Requires:	alsa-lib >= 1.2.10
 Requires:	awk
 Requires:	dialog
 Requires:	diffutils
+Requires:	systemd-units >= 18
 Requires:	which
 Suggests:	gpm
-Obsoletes:	alsa-udev
-Obsoletes:	alsaconf
+Obsoletes:	alsa-udev < 1
+Obsoletes:	alsaconf < 0.5
+Obsoletes:	udev-alsa < 1.0.25-2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -83,19 +89,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,7 +96,7 @@ Group:		Applications/Sound
 Requires(post,preun):	/sbin/chkconfig
 Requires:	%{name} = %{version}-%{release}
 Requires:	rc-scripts
-Obsoletes:	alsa-udev
+Requires:	systemd-units
 
 %description init
 Init script for Advanced Linux Sound Architecture.
@@ -115,10 +108,10 @@ Skrypt init dla Advanced Linux Sound Architecture.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__gettextize}
+%{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__autoheader}
@@ -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
@@ -141,7 +136,7 @@ install -D %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/alsa-oss-pcm
 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
+%{__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}
@@ -150,6 +145,8 @@ ln -s /sbin/alsactl $RPM_BUILD_ROOT%{_sbindir}/alsactl
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/arecord.1
 echo ".so aplay.1" > $RPM_BUILD_ROOT%{_mandir}/man1/arecord.1
 
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/alsa-topology/*.la
+
 %find_lang alsa-utils --all-name
 
 %clean
@@ -157,7 +154,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.
@@ -182,12 +179,16 @@ fi
 
 %files -f alsa-utils.lang
 %defattr(644,root,root,755)
-%doc ChangeLog README TODO
+%doc ChangeLog README.md 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
@@ -197,40 +198,52 @@ fi
 %attr(755,root,root) %{_bindir}/arecordmidi
 %attr(755,root,root) %{_bindir}/aseqdump
 %attr(755,root,root) %{_bindir}/aseqnet
+%attr(755,root,root) %{_bindir}/axfer
 %attr(755,root,root) %{_bindir}/iecset
+%attr(755,root,root) %{_bindir}/nhlt-dmic-info
 %attr(755,root,root) %{_bindir}/speaker-test
 # symlink
 %attr(755,root,root) %{_sbindir}/alsactl
+%dir %{_libdir}/alsa-topology
+%attr(755,root,root) %{_libdir}/alsa-topology/libalsatplg_module_nhlt.so
 %{_sysconfdir}/alsa/alsactl.conf
+/lib/udev/rules.d/90-alsa-restore.rules
+%{systemdunitdir}/alsa-restore.service
+%{systemdunitdir}/sound.target.wants/alsa-restore.service
 %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/alsa-info.sh.1*
+%{_mandir}/man1/alsabat.1*
 %{_mandir}/man1/alsactl.1*
 %{_mandir}/man1/alsaloop.1*
 %{_mandir}/man1/alsamixer.1*
+%{_mandir}/man1/alsatplg.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/axfer.1.*
+%{_mandir}/man1/axfer-list.1.*
+%{_mandir}/man1/axfer-transfer.1.*
 %{_mandir}/man1/iecset.1*
+%{_mandir}/man1/nhlt-dmic-info.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}/sound.target.wants/alsa-state.service