diff --git a/alsa-git.patch b/alsa-git.patch deleted file mode 100644 index 8b13789..0000000 --- a/alsa-git.patch +++ /dev/null @@ -1 +0,0 @@ - diff --git a/alsa-utils-git.patch b/alsa-utils-git.patch new file mode 100644 index 0000000..e69de29 diff --git a/alsa-utils.spec b/alsa-utils.spec index 086461d..1f29379 100644 --- a/alsa-utils.spec +++ b/alsa-utils.spec @@ -1,15 +1,15 @@ -%define baseversion 1.2.1 +%define baseversion 1.2.3 #define fixversion .2 %global _hardened_build 1 Summary: Advanced Linux Sound Architecture (ALSA) utilities Name: alsa-utils Version: %{baseversion}%{?fixversion} -Release: 5%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: http://www.alsa-project.org/ Source: ftp://ftp.alsa-project.org/pub/utils/alsa-utils-%{version}.tar.bz2 -Patch1: alsa-git.patch +Patch1: alsa-utils-git.patch Source4: alsaunmute Source5: alsaunmute.1 Source10: alsa.rules @@ -61,7 +61,7 @@ Architecture (ALSA) framework and Fast Fourier Transform library. %prep %setup -q -n %{name}-%{version} -#%patch1 -p1 +%patch1 -p1 -b .alsa-git %build %configure CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" --disable-alsaconf \ @@ -79,8 +79,6 @@ make install DESTDIR=%{buildroot} # Install ALSA udev rules mkdir -p %{buildroot}/%{_prefix}/lib/udev/rules.d install -p -m 644 %{SOURCE10} %{buildroot}/%{_prefix}/lib/udev/rules.d/90-alsa-restore.rules -sed -e 's,@bindir@,%{_bindir},g' alsaucm/89-alsa-ucm.rules.in > alsaucm/89-alsa-ucm.rules -install -p -m 644 alsaucm/89-alsa-ucm.rules %{buildroot}/%{_prefix}/lib/udev/rules.d/89-alsa-ucm.rules mkdir -p %{buildroot}/%{_unitdir} install -p -m 644 %{SOURCE20} %{buildroot}/%{_unitdir}/alsa-restore.service install -p -m 644 %{SOURCE22} %{buildroot}/%{_unitdir}/alsa-state.service @@ -109,7 +107,6 @@ mkdir -p -m 755 %{buildroot}%{_sharedstatedir}/alsa %doc COPYING ChangeLog README.md TODO %config /etc/alsa/* %{_prefix}/lib/udev/rules.d/* -%exclude %{_prefix}/lib/udev/rules.d/*alsa-ucm* %{_unitdir}/* %{_unitdir}/sound.target.wants/* %{alsacfgdir}/init/* @@ -159,7 +156,6 @@ mkdir -p -m 755 %{buildroot}%{_sharedstatedir}/alsa %dir %{_sharedstatedir}/alsa/ %files -n alsa-ucm-utils -%{_prefix}/lib/udev/rules.d/*alsa-ucm* %{_bindir}/alsaucm %{_mandir}/man1/alsaucm.1.gz @@ -195,6 +191,15 @@ fi %systemd_postun_with_restart alsa-state.service %changelog +* Fri Jul 3 2020 Jaroslav Kysela - 1.2.3-4 +* Fix the .spec (changelog0) + +* Sun Jun 7 2020 Jaroslav Kysela - 1.2.3-3 +* Updated to 1.2.3 + +* Wed Feb 19 2020 Jaroslav Kysela - 1.2.2-1 +* Updated to 1.2.2 + * Tue Jan 28 2020 Fedora Release Engineering - 1.2.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 784dcc0..a402a74 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (alsa-utils-1.2.1.tar.bz2) = b7729659cd9809197dc30042f522f5103ff41ddc047f13f9c733c93f7e91a26f90cd864c70e654d12ef7a552b1d9ebe2727a24ec9fad03560cb7cdea906662ec +SHA512 (alsa-utils-1.2.3.tar.bz2) = 5aeba2e5b7279c62d4df85b61a26b3f41e5465bac5a0b94c7bbe1299f7aa38e8cf2a1f749f618289a63b61f76609fe54169fcbe70792b45adc8957811b672012 diff --git a/tests/run_tests.sh b/tests/run_tests.sh new file mode 100755 index 0000000..eb91753 --- /dev/null +++ b/tests/run_tests.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +set -ex + +# is alsactl present and working? +alsactl --version + +# is amixer present and working? +amixer --help + +# is alsamixer present and working? +alsamixer --version + +# is amidi present and working? +amidi --version + +# is speaker-test preset and working? +speaker-test -h + +# aplay test (like for alsa-lib) +str=$(aplay -L | grep -E "^null$") +if [ "$str" != "null" ]; then + echo "The 'null' pcm plugin was not found!" + exit 99 +fi + +# alsa-info.sh present and working? +alsa-info.sh --help diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..e56da89 --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,9 @@ +- hosts: localhost + roles: + - role: standard-test-basic + tags: + - classic + tests: + - simple: + dir: . + run: ./run_tests.sh