From 59dd7e0d865b93f15ef802dd31a4f66d61f3f08d Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Wed, 19 Feb 2020 12:25:57 +0100 Subject: [PATCH 1/7] updated to 1.2.2 --- alsa-utils.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/alsa-utils.spec b/alsa-utils.spec index 086461d..9edc755 100644 --- a/alsa-utils.spec +++ b/alsa-utils.spec @@ -1,11 +1,11 @@ -%define baseversion 1.2.1 +%define baseversion 1.2.2 #define fixversion .2 %global _hardened_build 1 Summary: Advanced Linux Sound Architecture (ALSA) utilities Name: alsa-utils Version: %{baseversion}%{?fixversion} -Release: 5%{?dist} +Release: 1%{?dist} License: GPLv2+ URL: http://www.alsa-project.org/ Source: ftp://ftp.alsa-project.org/pub/utils/alsa-utils-%{version}.tar.bz2 @@ -195,6 +195,9 @@ fi %systemd_postun_with_restart alsa-state.service %changelog +* 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..4d01295 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (alsa-utils-1.2.1.tar.bz2) = b7729659cd9809197dc30042f522f5103ff41ddc047f13f9c733c93f7e91a26f90cd864c70e654d12ef7a552b1d9ebe2727a24ec9fad03560cb7cdea906662ec +SHA512 (alsa-utils-1.2.2.tar.bz2) = 30598c658f3f2ad71a5ce7911b09ae13add54b293bcf3bebb053371d84a91528bd64fd376f167456b2e27e2546a2279019678e099247513e5142b283af756fd9 From 73e62cbc36b1aaf5676d5ce98314d021311fece6 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 3 Mar 2020 10:17:05 +0100 Subject: [PATCH 2/7] add simple tests --- tests/run_tests.sh | 28 ++++++++++++++++++++++++++++ tests/tests.yml | 9 +++++++++ 2 files changed, 37 insertions(+) create mode 100755 tests/run_tests.sh create mode 100644 tests/tests.yml 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 From ddabdc1dd18b9c1972d0af4b5b943ff55fcb1954 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Sun, 7 Jun 2020 19:57:09 +0200 Subject: [PATCH 3/7] update to 1.2.3 --- alsa-utils.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/alsa-utils.spec b/alsa-utils.spec index 9edc755..de9619a 100644 --- a/alsa-utils.spec +++ b/alsa-utils.spec @@ -1,4 +1,4 @@ -%define baseversion 1.2.2 +%define baseversion 1.2.3 #define fixversion .2 %global _hardened_build 1 @@ -194,7 +194,10 @@ fi %postun %systemd_postun_with_restart alsa-state.service -%changelog +%changelog0 +* Sun Jun 7 2020 Jaroslav Kysela - 1.2.3-1 +* Updated to 1.2.3 + * Wed Feb 19 2020 Jaroslav Kysela - 1.2.2-1 * Updated to 1.2.2 diff --git a/sources b/sources index 4d01295..a402a74 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (alsa-utils-1.2.2.tar.bz2) = 30598c658f3f2ad71a5ce7911b09ae13add54b293bcf3bebb053371d84a91528bd64fd376f167456b2e27e2546a2279019678e099247513e5142b283af756fd9 +SHA512 (alsa-utils-1.2.3.tar.bz2) = 5aeba2e5b7279c62d4df85b61a26b3f41e5465bac5a0b94c7bbe1299f7aa38e8cf2a1f749f618289a63b61f76609fe54169fcbe70792b45adc8957811b672012 From 266ccc6efb3e4a7afe44ca8ad9c86048cc56c125 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Sun, 7 Jun 2020 20:50:47 +0200 Subject: [PATCH 4/7] cleanups for the alsa git patch --- alsa-git.patch | 1 - alsa-utils-git.patch | 0 alsa-utils.spec | 8 ++++---- 3 files changed, 4 insertions(+), 5 deletions(-) delete mode 100644 alsa-git.patch create mode 100644 alsa-utils-git.patch 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 de9619a..607217e 100644 --- a/alsa-utils.spec +++ b/alsa-utils.spec @@ -5,11 +5,11 @@ Summary: Advanced Linux Sound Architecture (ALSA) utilities Name: alsa-utils Version: %{baseversion}%{?fixversion} -Release: 1%{?dist} +Release: 2%{?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 \ @@ -195,7 +195,7 @@ fi %systemd_postun_with_restart alsa-state.service %changelog0 -* Sun Jun 7 2020 Jaroslav Kysela - 1.2.3-1 +* Sun Jun 7 2020 Jaroslav Kysela - 1.2.3-2 * Updated to 1.2.3 * Wed Feb 19 2020 Jaroslav Kysela - 1.2.2-1 From bc71433a63f718a9207e3359f43057abd513e518 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Sun, 7 Jun 2020 21:01:23 +0200 Subject: [PATCH 5/7] remove alsa-ucm.rules lines --- alsa-utils.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/alsa-utils.spec b/alsa-utils.spec index 607217e..cb062b5 100644 --- a/alsa-utils.spec +++ b/alsa-utils.spec @@ -5,7 +5,7 @@ Summary: Advanced Linux Sound Architecture (ALSA) utilities Name: alsa-utils Version: %{baseversion}%{?fixversion} -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: http://www.alsa-project.org/ Source: ftp://ftp.alsa-project.org/pub/utils/alsa-utils-%{version}.tar.bz2 @@ -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 @@ -195,7 +193,7 @@ fi %systemd_postun_with_restart alsa-state.service %changelog0 -* Sun Jun 7 2020 Jaroslav Kysela - 1.2.3-2 +* 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 From 782a61b3311184b9c7af4b1ca187ed3a64d1546b Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Sun, 7 Jun 2020 21:12:58 +0200 Subject: [PATCH 6/7] remove alsa-ucm.rules from files sections --- alsa-utils.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/alsa-utils.spec b/alsa-utils.spec index cb062b5..dfc48d0 100644 --- a/alsa-utils.spec +++ b/alsa-utils.spec @@ -107,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/* @@ -157,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 From 0fe1b5c7892d003a82ed22c78d8fff44a1ca4980 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Fri, 3 Jul 2020 19:36:21 +0200 Subject: [PATCH 7/7] fix the .spec (changelog0) --- alsa-utils.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/alsa-utils.spec b/alsa-utils.spec index dfc48d0..1f29379 100644 --- a/alsa-utils.spec +++ b/alsa-utils.spec @@ -5,7 +5,7 @@ Summary: Advanced Linux Sound Architecture (ALSA) utilities Name: alsa-utils Version: %{baseversion}%{?fixversion} -Release: 3%{?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 @@ -190,7 +190,10 @@ fi %postun %systemd_postun_with_restart alsa-state.service -%changelog0 +%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