diff --git a/alsa-utils.spec b/alsa-utils.spec index 2f2b923..9699a63 100644 --- a/alsa-utils.spec +++ b/alsa-utils.spec @@ -1,7 +1,9 @@ -%define baseversion 1.2.12 -#define fixversion .2 +%define baseversion 1.2.15 +%define fixversion .2 %global _hardened_build 1 +%global utils_patch 0 + Summary: Advanced Linux Sound Architecture (ALSA) utilities Name: alsa-utils Version: %{baseversion}%{?fixversion} @@ -9,13 +11,14 @@ Release: 2%{?dist} License: GPL-2.0-or-later 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 @@ -63,13 +66,17 @@ Architecture (ALSA) framework and Fast Fourier Transform library. %prep %setup -q -n %{name}-%{version} -#patch -P 1 -p1 -b .alsa-git +%if %{utils_patch} +%patch -P1 -p1 -b .alsa-git +%endif %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-systemdsystemunitdir=%{_unitdir} \ + --with-alsactl-udev-args="-E ALSA_CONFIG_PATH=/etc/alsa/alsactl.conf --initfile=/lib/alsa/init/00main" \ + --with-alsactl-udev-extra-test="" make %{?_smp_mflags} cp %{SOURCE4} . @@ -79,9 +86,8 @@ cp %{SOURCE4} . make install DESTDIR=%{buildroot} %find_lang %{name} -# Install ALSA udev rules +# Install ALSA udev rules and services 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 @@ -113,27 +119,29 @@ find %{buildroot} -name "*.la" -exec rm {} \; %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}/speaker-test %{_bindir}/nhlt-dmic-info -%{_sbindir}/* -%exclude %{_sbindir}/alsabat-test.sh +%{_bindir}/speaker-test %{_datadir}/alsa/ %{_datadir}/sounds/* %{_mandir}/man7/* @@ -145,8 +153,10 @@ 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 @@ -156,7 +166,7 @@ find %{buildroot} -name "*.la" -exec rm {} \; %{_mandir}/man1/iecset.1.gz %{_mandir}/man1/speaker-test.1.gz %{_mandir}/man1/aconnect.1.gz -%{_mandir}/man1/alsa-info.sh.1.gz +%{_mandir}/man8/alsa-info.sh.8.gz %{_mandir}/man1/nhlt-dmic-info.1.gz %dir /etc/alsa/ @@ -201,6 +211,33 @@ fi %systemd_postun_with_restart alsa-state.service %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 1.2.15.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Thu Jan 8 2026 Jaroslav Kysela - 1.2.15.2-1 +* Updated to 1.2.15.2 + +* Thu Jan 1 2026 Jaroslav Kysela - 1.2.15.1-3 +* Apply fix to alsactl (card detection issue) + +* Fri Dec 19 2025 Jaroslav Kysela - 1.2.15.1-1 +* Updated to 1.2.15.1 + +* Mon Dec 8 2025 Jaroslav Kysela - 1.2.15-2 +* Updated to 1.2.15 + +* Wed Jul 23 2025 Fedora Release Engineering - 1.2.14-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Mon Apr 14 2025 Jaroslav Kysela - 1.2.14-1 +* Updated to 1.2.14 + +* Thu Jan 16 2025 Fedora Release Engineering - 1.2.13-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Thu Nov 14 2024 Jaroslav Kysela - 1.2.13-2 +* Updated to 1.2.13 + * Wed Jul 17 2024 Fedora Release Engineering - 1.2.12-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/alsa.rules b/alsa.rules deleted file mode 100644 index 6a4a0c3..0000000 --- a/alsa.rules +++ /dev/null @@ -1,8 +0,0 @@ -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" diff --git a/sources b/sources index 7b77ab3..ad5e1c4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (alsa-utils-1.2.12.tar.bz2) = 6631f9f8e32fbb1f7b06af086cdfb8349c2d70188c4509ab46fa105024fbde9985985d9cc738c7b5a743cacaaeae7a7006f8ef92f66a50762f7df5d714bf548b +SHA512 (alsa-utils-1.2.15.2.tar.bz2) = 13ca15a63bcbf81a4643ef03e391200d7523335bc300e290756089c4cfeccb9773cf6b77f9fcf4b80e6aa2e8c5e33a2c86c9173f1feb480aedf5ecda0f7c47cd