updated to 1.2.6

remove the old patch
updated to 1.2.5.1
2021-12-06 19:01:17 +01:00 · 2021-06-14 14:21:47 +02:00 · 2021-06-14 14:16:37 +02:00 · 2021-06-03 13:44:10 +02:00 · 2021-05-31 12:53:55 +02:00 · 2021-05-31 12:50:48 +02:00
3 changed files with 27 additions and 117 deletions
--- a/alsa-utils.spec
+++ b/alsa-utils.spec
@ -1,27 +1,23 @@
-%define   baseversion     1.2.15
-%define   fixversion      .2
+%define   baseversion     1.2.6
+#define   fixversion      .2
 %global   _hardened_build 1

-%global   utils_patch     0
-
 Summary: Advanced Linux Sound Architecture (ALSA) utilities
 Name:    alsa-utils
 Version: %{baseversion}%{?fixversion}
-Release: 2%{?dist}
-License: GPL-2.0-or-later
+Release: 1%{?dist}
+License: GPLv2+
 URL:     http://www.alsa-project.org/
 Source:  ftp://ftp.alsa-project.org/pub/utils/alsa-utils-%{version}.tar.bz2
+Patch1:  alsa-utils-git.patch
 Source4: alsaunmute
 Source5: alsaunmute.1
+Source10: alsa.rules
 Source11: alsactl.conf
 Source20: alsa-restore.service
 Source22: alsa-state.service
-%if %{utils_patch}
-Patch1:  alsa-git.patch
-%endif

-BuildRequires: gcc
-BuildRequires: autoconf automake libtool
+BuildRequires:  gcc
 BuildRequires: alsa-lib-devel >= %{baseversion}
 BuildRequires: libsamplerate-devel
 BuildRequires: ncurses-devel
@ -66,17 +62,12 @@ Architecture (ALSA) framework and Fast Fourier Transform library.

 %prep
 %setup -q -n %{name}-%{version}
-%if %{utils_patch}
-%patch -P1 -p1 -b .alsa-git
-%endif
+%patch1 -p1 -b .alsa-git

 %build
-autoreconf -vif
 %configure CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" --disable-alsaconf \
   --with-udev-rules-dir=%{_prefix}/lib/udev/rules.d \
-   --with-systemdsystemunitdir=%{_unitdir} \
-   --with-alsactl-udev-args="-E ALSA_CONFIG_PATH=/etc/alsa/alsactl.conf --initfile=/lib/alsa/init/00main" \
-   --with-alsactl-udev-extra-test=""
+   --with-systemdsystemunitdir=%{_unitdir}
 make %{?_smp_mflags}
 cp %{SOURCE4} .

@ -86,8 +77,9 @@ cp %{SOURCE4} .
 make install DESTDIR=%{buildroot}
 %find_lang %{name}

-# Install ALSA udev rules and services
+# 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
 mkdir -p %{buildroot}/%{_unitdir}
 install -p -m 644 %{SOURCE20} %{buildroot}/%{_unitdir}/alsa-restore.service
 install -p -m 644 %{SOURCE22} %{buildroot}/%{_unitdir}/alsa-state.service
@ -112,36 +104,30 @@ install -p -m 644 %{SOURCE11} %{buildroot}/etc/alsa
 # Create /var/lib/alsa tree
 mkdir -p -m 755 %{buildroot}%{_sharedstatedir}/alsa

-find %{buildroot} -name "*.la" -exec rm {} \;
-
 %files -f %{name}.lang
-%doc COPYING ChangeLog README.md TODO alsamixer/alsamixer.rc.example
+%doc COPYING ChangeLog README.md TODO
 %config /etc/alsa/*
 %{_prefix}/lib/udev/rules.d/*
 %{_unitdir}/*
-#{_unitdir}/sound.target.wants/*
+%{_unitdir}/sound.target.wants/*
 %{alsacfgdir}/init/*
 %{_bindir}/aconnect
-%{_sbindir}/alsactl
 %{_bindir}/alsaloop
 %{_bindir}/alsamixer
 %{_bindir}/alsaunmute
-%{_sbindir}/alsa-info.sh
 %{_bindir}/amidi
 %{_bindir}/amixer
 %{_bindir}/aplay
 %{_bindir}/aplaymidi
-%{_bindir}/aplaymidi2
 %{_bindir}/arecord
 %{_bindir}/arecordmidi
-%{_bindir}/arecordmidi2
 %{_bindir}/aseqdump
 %{_bindir}/aseqnet
-%{_bindir}/aseqsend
 %{_bindir}/axfer
 %{_bindir}/iecset
-%{_bindir}/nhlt-dmic-info
 %{_bindir}/speaker-test
+%{_sbindir}/*
+%exclude %{_sbindir}/alsabat-test.sh
 %{_datadir}/alsa/
 %{_datadir}/sounds/*
 %{_mandir}/man7/*
@ -153,21 +139,17 @@ find %{buildroot} -name "*.la" -exec rm {} \;
 %{_mandir}/man1/amixer.1.gz
 %{_mandir}/man1/aplay.1.gz
 %{_mandir}/man1/aplaymidi.1.gz
-%{_mandir}/man1/aplaymidi2.1.gz
 %{_mandir}/man1/arecord.1.gz
 %{_mandir}/man1/arecordmidi.1.gz
-%{_mandir}/man1/arecordmidi2.1.gz
 %{_mandir}/man1/aseqdump.1.gz
 %{_mandir}/man1/aseqnet.1.gz
-%{_mandir}/man1/aseqsend.1.gz
 %{_mandir}/man1/axfer.1.gz
 %{_mandir}/man1/axfer-list.1.gz
 %{_mandir}/man1/axfer-transfer.1.gz
 %{_mandir}/man1/iecset.1.gz
 %{_mandir}/man1/speaker-test.1.gz
 %{_mandir}/man1/aconnect.1.gz
-%{_mandir}/man8/alsa-info.sh.8.gz
-%{_mandir}/man1/nhlt-dmic-info.1.gz
+%{_mandir}/man1/alsa-info.sh.1.gz

 %dir /etc/alsa/
 %dir %{alsacfgdir}/
@ -181,7 +163,6 @@ find %{buildroot} -name "*.la" -exec rm {} \;
 %files -n alsa-topology-utils
 %{_bindir}/alsatplg
 %{_mandir}/man1/alsatplg.1.gz
-%{_libdir}/alsa-topology/libalsatplg_module_*

 %files alsabat
 %{_bindir}/alsabat
@ -211,97 +192,18 @@ fi
 %systemd_postun_with_restart alsa-state.service

 %changelog
-* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.15.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Thu Jan  8 2026 Jaroslav Kysela <perex@perex.cz> - 1.2.15.2-1
-* Updated to 1.2.15.2
-
-* Thu Jan  1 2026 Jaroslav Kysela <perex@perex.cz> - 1.2.15.1-3
-* Apply fix to alsactl (card detection issue)
-
-* Fri Dec 19 2025 Jaroslav Kysela <perex@perex.cz> - 1.2.15.1-1
-* Updated to 1.2.15.1
-
-* Mon Dec  8 2025 Jaroslav Kysela <perex@perex.cz> - 1.2.15-2
-* Updated to 1.2.15
-
-* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.14-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Mon Apr 14 2025 Jaroslav Kysela <perex@perex.cz> - 1.2.14-1
-* Updated to 1.2.14
-
-* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.13-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Thu Nov 14 2024 Jaroslav Kysela <perex@perex.cz> - 1.2.13-2
-* Updated to 1.2.13
-
-* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.12-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Tue Jun 11 2024 Jaroslav Kysela <perex@perex.cz> - 1.2.12-1
-* Updated to 1.2.12
-
-* Mon Jan 29 2024 Jaroslav Kysela <perex@perex.cz> - 1.2.11-1
-* Updated to 1.2.11
-
-* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.10-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.10-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Sep  1 2023 Jaroslav Kysela <perex@perex.cz> - 1.2.10-1
-* Updated to 1.2.10
-
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.9-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Tue Jun  6 2023 Jaroslav Kysela <perex@perex.cz> - 1.2.9-3
-* SPDX license
-
-* Tue May 16 2023 Jaroslav Kysela <perex@perex.cz> - 1.2.9-2
-* Add nhlt-dmic-info utility
-
-* Thu May  4 2023 Jaroslav Kysela <perex@perex.cz> - 1.2.9-1
-* Updated to 1.2.9
-
-* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Mon Oct 24 2022 Jaroslav Kysela <perex@perex.cz> - 1.2.8-1
-* Updated to 1.2.8
-
-* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Tue May 31 2022 Jaroslav Kysela <perex@perex.cz> - 1.2.7-1
-* Updated to 1.2.7
-
-* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
 * Mon Dec  6 2021 Jaroslav Kysela <perex@perex.cz> - 1.2.6-1
 * Updated to 1.2.6

-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.5.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
 * Mon Jun 14 2021 Jaroslav Kysela <perex@perex.cz> - 1.2.5.1-1
 * Updated to 1.2.5.1

-* Thu Jun  3 2021 Jaroslav Kysela <perex@perex.cz> - 1.2.5-3
+* Thu Jun  3 2021 Jaroslav Kysela <perex@perex.cz> - 1.2.5-2
 * Fixes for 1.2.5 (alsactl)

-* Mon May 31 2021 Jaroslav Kysela <perex@perex.cz> - 1.2.5-2
+* Mon May 31 2021 Jaroslav Kysela <perex@perex.cz> - 1.2.5-1
 * Updated to 1.2.5

-* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.2.4-3
- Rebuilt for updated systemd-rpm-macros
-  See https://pagure.io/fesco/issue/2583.
-
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

--- a/alsa.rules
+++ b/alsa.rules
@ -0,0 +1,8 @@
+ACTION=="add", SUBSYSTEM=="sound", KERNEL=="controlC*", KERNELS!="card*", GOTO="alsa_restore_go"
+GOTO="alsa_restore_end"
+
+LABEL="alsa_restore_go"
+TEST!="/etc/alsa/state-daemon.conf", RUN+="/sbin/alsactl -E ALSA_CONFIG_PATH=/etc/alsa/alsactl.conf --initfile=/lib/alsa/init/00main restore /dev/$name"
+TEST=="/etc/alsa/state-daemon.conf", RUN+="/sbin/alsactl -E ALSA_CONFIG_PATH=/etc/alsa/alsactl.conf --initfile=/lib/alsa/init/00main nrestore /dev/$name"
+
+LABEL="alsa_restore_end"
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (alsa-utils-1.2.15.2.tar.bz2) = 13ca15a63bcbf81a4643ef03e391200d7523335bc300e290756089c4cfeccb9773cf6b77f9fcf4b80e6aa2e8c5e33a2c86c9173f1feb480aedf5ecda0f7c47cd
+SHA512 (alsa-utils-1.2.6.tar.bz2) = 6842f0f4c2f7cc5ac3ba94736ee259d9988b5d3e0d2b522f858d712e16938d2845fa9ef64f4aa60222b8ef6738e053f9113a5ea24a197f2c0d6c4dbd70030f5e
Author	SHA1	Message	Date
Jaroslav Kysela	49137146f3	updated to 1.2.6	2021-12-06 19:01:17 +01:00
Jaroslav Kysela	6d43765cdf	remove the old patch	2021-06-14 14:21:47 +02:00
Jaroslav Kysela	9b7e9c3e2e	updated to 1.2.5.1	2021-06-14 14:16:37 +02:00
Jaroslav Kysela	f047e3ccf3	fixes for 1.2.5	2021-06-03 13:44:10 +02:00
Jaroslav Kysela	ec07a2e945	updated to 1.2.5	2021-05-31 12:53:55 +02:00
Jaroslav Kysela	9436c98a66	Drop StandardOutput=syslog from alsa-restore.service Link: https://bugzilla.redhat.com/show_bug.cgi?id=1937450	2021-05-31 12:50:48 +02:00