diff --git a/alsa-restore.service b/alsa-restore.service index 4a32e11891481e9d67092dd06fb90d1fe55edd32..c97411ffff16c79cf2df653eb6b8716b6d7158cf 100644 --- a/alsa-restore.service +++ b/alsa-restore.service @@ -12,4 +12,3 @@ Type=oneshot RemainAfterExit=true ExecStart=-/sbin/alsactl -E ALSA_CONFIG_PATH=/etc/alsa/alsactl.conf --initfile=/lib/alsa/init/00main restore ExecStop=/sbin/alsactl -E ALSA_CONFIG_PATH=/etc/alsa/alsactl.conf store -StandardOutput=syslog diff --git a/alsa-git.patch b/alsa-utils-git.patch similarity index 100% rename from alsa-git.patch rename to alsa-utils-git.patch diff --git a/alsa-utils.spec b/alsa-utils.spec index 1f8a7711c67ed0f84d1f33633afbb5e6446274f8..7c38efbc77d719b416beb97fc5bd582e098b27a1 100644 --- a/alsa-utils.spec +++ b/alsa-utils.spec @@ -1,30 +1,24 @@ %define anolis_release .0.1 -%define baseversion 1.2.8 +%define baseversion 1.2.9 #define fixversion .2 %global _hardened_build 1 -%if 0%{?rhel} -%global _without_ucm 1 -%global _without_topology 1 -%endif - Summary: Advanced Linux Sound Architecture (ALSA) utilities Name: alsa-utils Version: %{baseversion}%{?fixversion} Release: 1%{anolis_release}%{?dist} License: GPLv2+ -Group: Applications/Multimedia 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 -Patch1: alsa-git.patch -BuildRequires: gcc +BuildRequires: gcc BuildRequires: alsa-lib-devel >= %{baseversion} BuildRequires: libsamplerate-devel BuildRequires: ncurses-devel @@ -37,6 +31,9 @@ Requires(preun): systemd Requires(postun): systemd # use latest alsa-lib - the executables in this package requires latest API Requires: alsa-lib%{?_isa} >= %{baseversion} +%ifnarch s390x +Requires: alsa-ucm >= %{baseversion} +%endif Requires: glibc Provides: /usr/bin/aconnect @@ -59,36 +56,25 @@ Provides: /usr/bin/speaker-test This package contains command line utilities for the Advanced Linux Sound Architecture (ALSA). -%if 0%{!?_without_ucm:1} %package -n alsa-ucm-utils Summary: Advanced Linux Sound Architecture (ALSA) - Use Case Manager -Group: Applications/Multimedia -Requires: alsa-ucm >= %{baseversion} -%endif -%if 0%{!?_without_ucm:1} %description -n alsa-ucm-utils This package contains Use Case Manager tools for Advanced Linux Sound Architecture (ALSA) framework. -%endif -%if 0%{!?_without_topology:1} %package -n alsa-topology-utils Summary: Advanced Linux Sound Architecture (ALSA) - Topology -Group: Applications/Multimedia Requires: alsa-topology >= %{baseversion} -%endif -%if 0%{!?_without_topology:1} %description -n alsa-topology-utils This package contains topology tools for Advanced Linux Sound Architecture (ALSA) framework. -%endif %package alsabat Summary: Advanced Linux Sound Architecture (ALSA) - Basic Audio Tester -Group: Applications/Multimedia BuildRequires: fftw-devel +BuildRequires: make %description alsabat This package contains tool for basic audio testing using Advanced Linux Sound @@ -114,6 +100,8 @@ make %{?_smp_mflags} cp %{SOURCE4} . %install +%global alsacfgdir %{_prefix}/lib/alsa + make install DESTDIR=%{buildroot} %find_lang %{name} @@ -131,8 +119,8 @@ mkdir -p -m755 %{buildroot}/%{_mandir}/man1 install -p -m 644 %{SOURCE5} %{buildroot}/%{_mandir}/man1/alsaunmute.1 # Move /usr/share/alsa/init to /usr/lib/alsa/init -mkdir -p -m 755 %{buildroot}/%{_prefix}/lib/alsa -mv %{buildroot}%{_datadir}/alsa/init %{buildroot}/%{_prefix}/lib/alsa +mkdir -p -m 755 %{buildroot}%{alsacfgdir} +mv %{buildroot}%{_datadir}/alsa/init %{buildroot}%{alsacfgdir} # Link /usr/lib/alsa/init to /usr/share/alsa/init back ln -s ../../lib/alsa/init %{buildroot}%{_datadir}/alsa/init @@ -142,26 +130,16 @@ mkdir -p -m 755 %{buildroot}/etc/alsa install -p -m 644 %{SOURCE11} %{buildroot}/etc/alsa # Create /var/lib/alsa tree -mkdir -p -m 755 %{buildroot}/var/lib/alsa +mkdir -p -m 755 %{buildroot}%{_sharedstatedir}/alsa find %{buildroot} -name "*.la" -exec rm {} \; -%if 0%{?_without_ucm:1} -rm %{buildroot}%{_bindir}/alsaucm -rm %{buildroot}%{_mandir}/man1/alsaucm.1 -%endif -%if 0%{?_without_topology:1} -rm %{buildroot}%{_bindir}/alsatplg -rm %{buildroot}%{_mandir}/man1/alsatplg.1 -rm %{buildroot}%{_libdir}/alsa-topology/libalsatplg_module_* -%endif - %files -f %{name}.lang %config /etc/alsa/* %{_prefix}/lib/udev/rules.d/* %{_unitdir}/* %{_unitdir}/sound.target.wants/* -%{_prefix}/lib/alsa/init/* +%{alsacfgdir}/init/* %{_bindir}/aconnect %{_bindir}/alsaloop %{_bindir}/alsamixer @@ -178,6 +156,7 @@ rm %{buildroot}%{_libdir}/alsa-topology/libalsatplg_module_* %{_bindir}/iecset %{_bindir}/speaker-test %{_sbindir}/* +%exclude %{_sbindir}/alsabat-test.sh %{_datadir}/alsa/ %{_datadir}/sounds/* %{_mandir}/man7/* @@ -202,22 +181,18 @@ rm %{buildroot}%{_libdir}/alsa-topology/libalsatplg_module_* %{_mandir}/man1/alsa-info.sh.1.gz %dir /etc/alsa/ -%dir %{_prefix}/lib/alsa/ -%dir %{_prefix}/lib/alsa/init/ -%dir /var/lib/alsa/ +%dir %{alsacfgdir}/ +%dir %{alsacfgdir}/init/ +%dir %{_sharedstatedir}/alsa/ -%if 0%{!?_without_ucm:1} %files -n alsa-ucm-utils %{_bindir}/alsaucm %{_mandir}/man1/alsaucm.1.gz -%endif -%if 0%{!?_without_topology:1} %files -n alsa-topology-utils %{_bindir}/alsatplg %{_mandir}/man1/alsatplg.1.gz %{_libdir}/alsa-topology/libalsatplg_module_* -%endif %files alsabat %{_bindir}/alsabat @@ -238,8 +213,8 @@ fi if [ -s /etc/alsa/asound.state -a ! -s /etc/asound.state ] ; then mv /etc/alsa/asound.state /etc/asound.state fi -if [ -s /etc/asound.state -a ! -s /var/lib/alsa/asound.state ] ; then - mv /etc/asound.state /var/lib/alsa/asound.state +if [ -s /etc/asound.state -a ! -s %{_sharedstatedir}/alsa/asound.state ] ; then + mv /etc/asound.state %{_sharedstatedir}/alsa/asound.state fi %systemd_post alsa-state.service @@ -250,35 +225,88 @@ fi %systemd_postun_with_restart alsa-state.service %changelog -* Mon May 22 2023 Zhao Hang - 1.2.8-1.0.1 +* Wed Dec 06 2023 Zhao Hang - 1.2.9-1.0.1 - Add doc sub package +* Wed May 17 2023 Jaroslav Kysela - 1.2.9-1 +* Updated to 1.2.9 + * Tue Oct 25 2022 Jaroslav Kysela - 1.2.8-1 -- Updated to 1.2.8 -- Do not build alsa-ucm-utils and alsa-topology-utils subpackages for RHEL +* Updated to 1.2.8 * Fri Jul 8 2022 Jaroslav Kysela - 1.2.7-1 -- Updated to 1.2.7 +* Updated to 1.2.7 * Mon Dec 20 2021 Jaroslav Kysela - 1.2.6-1 -- Updated to 1.2.6 +* Updated to 1.2.6 -* Mon Jun 14 2021 Jaroslav Kysela - 1.2.5-3 -- Updated to 1.2.5 +* Tue Aug 10 2021 Jaroslav Kysela - 1.2.5.1-3 +* Fixes for 1.2.5.1 -* Mon Jun 8 2020 Jaroslav Kysela - 1.2.4-2 -- Updated to 1.2.4 -- Apply fixes from recent upstream +* Mon Aug 09 2021 Mohan Boddu - 1.2.5.1-2 +- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags + Related: rhbz#1991688 -* Mon Jun 8 2020 Jaroslav Kysela - 1.2.3-1 -- Updated to 1.2.3 +* Mon Aug 9 2021 Jaroslav Kysela - 1.2.5.1-1 +* Updated to 1.2.5.1 -* Fri Nov 15 2019 Jaroslav Kysela - 1.2.1-2 +* Thu Apr 15 2021 Mohan Boddu - 1.2.4-3 +- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 + +* Tue Jan 26 2021 Fedora Release Engineering - 1.2.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Oct 15 2020 Jaroslav Kysela - 1.2.4-1 +* Updated to 1.2.4 + +* Fri Jul 31 2020 Fedora Release Engineering - 1.2.3-6 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 1.2.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* 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 + +* Sun Feb 9 2020 Jaroslav Kysela - 1.2.1-6 +- UCM and topology fixes + +* Tue Jan 28 2020 Fedora Release Engineering - 1.2.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Nov 15 2019 Jaroslav Kysela - 1.2.1-4 - Updated to 1.2.1 -* Wed May 22 2019 Jaroslav Kysela - 1.1.9-1 +* Wed Jul 24 2019 Fedora Release Engineering - 1.1.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri May 10 2019 Jaroslav Kysela - 1.1.9-1 - Updated to 1.1.9 +* Thu Jan 31 2019 Fedora Release Engineering - 1.1.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Mon Jan 7 2019 Jaroslav Kysela - 1.1.8-2 +- Updated to 1.1.8 + +* Tue Oct 16 2018 Jaroslav Kysela - 1.1.7-2 +- Moved use case manager utility to alsa-ucm-utils +- Moved topology utility to alsa-topology-utils +- Updated to 1.1.7 + +* Fri Sep 07 2018 Jaroslav Kysela - 1.1.6-5 +- Added udev rules for PAZ00 + +* Thu Jul 12 2018 Fedora Release Engineering - 1.1.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Tue Apr 03 2018 Jaroslav Kysela - 1.1.6-1 - Updated to 1.1.6 diff --git a/dist b/dist index 9c0e36ec42a2d9bfefacb21ac6354c9ddd910533..89c1faffc18349bb12eee2371e9dc43bf419b95c 100644 --- a/dist +++ b/dist @@ -1 +1 @@ -an8 +an9 diff --git a/download b/download index 8a9b0fbba6c061a39cb7610ae7ca0eb274c37c97..812282fd9bd642784d660f88d9b6f7baa54660d4 100644 --- a/download +++ b/download @@ -1 +1 @@ -51175f5cd413daf7009a80684c65113d alsa-utils-1.2.8.tar.bz2 +095a31a5924695a7cc5b40f9574ba85e alsa-utils-1.2.9.tar.bz2