From 5b5f7a7963750900378d05cd458d3640cec47619 Mon Sep 17 00:00:00 2001 From: anolis-bot Date: Mon, 22 May 2023 16:23:27 +0800 Subject: [PATCH 1/2] update to alsa-utils-1.2.8-1.el8 Signed-off-by: anolis-bot --- alsa-utils.spec | 75 ++++++++++++++++++++++++++----------------------- dist | 1 + download | 2 +- 3 files changed, 42 insertions(+), 36 deletions(-) create mode 100644 dist diff --git a/alsa-utils.spec b/alsa-utils.spec index 83bd01e..52bb83e 100644 --- a/alsa-utils.spec +++ b/alsa-utils.spec @@ -1,13 +1,16 @@ -%define anolis_release .0.1 - -%define baseversion 1.2.6 +%define baseversion 1.2.8 #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} +Release: 1%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.alsa-project.org/ @@ -34,44 +37,35 @@ Requires(postun): systemd # use latest alsa-lib - the executables in this package requires latest API Requires: alsa-lib%{?_isa} >= %{baseversion} -Requires: glibc -Provides: /usr/bin/aconnect -Provides: /usr/bin/alsaloop -Provides: /usr/bin/alsamixer -Provides: /usr/bin/alsaunmute -Provides: /usr/bin/amidi -Provides: /usr/bin/amixer -Provides: /usr/bin/aplay -Provides: /usr/bin/aplaymidi -Provides: /usr/bin/arecord -Provides: /usr/bin/arecordmidi -Provides: /usr/bin/aseqdump -Provides: /usr/bin/aseqnet -Provides: /usr/bin/axfer -Provides: /usr/bin/iecset -Provides: /usr/bin/speaker-test - %description 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 @@ -82,14 +76,6 @@ BuildRequires: fftw-devel This package contains tool for basic audio testing using Advanced Linux Sound Architecture (ALSA) framework and Fast Fourier Transform library. -%package doc -Summary: Documents for %{name} -BuildArch: noarch -Requires: %{name} = %{version}-%{release} - -%description doc -Doc pages for %{name}. - %prep %setup -q -n %{name}-%{version} %patch1 -p1 -b .alsa-git @@ -132,7 +118,20 @@ install -p -m 644 %{SOURCE11} %{buildroot}/etc/alsa # Create /var/lib/alsa tree mkdir -p -m 755 %{buildroot}/var/lib/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 +%doc COPYING ChangeLog README.md TODO alsamixer/alsamixer.rc.example %config /etc/alsa/* %{_prefix}/lib/udev/rules.d/* %{_unitdir}/* @@ -182,22 +181,24 @@ mkdir -p -m 755 %{buildroot}/var/lib/alsa %dir %{_prefix}/lib/alsa/init/ %dir /var/lib/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 %{_sbindir}/alsabat-test.sh %{_mandir}/man1/alsabat.1.gz -%files doc -%doc COPYING ChangeLog README.md TODO - %pre if [ ! -r %{_unitdir}/alsa-state.service ]; then [ -d /etc/alsa ] || mkdir -m 0755 /etc/alsa @@ -221,11 +222,15 @@ fi %systemd_postun_with_restart alsa-state.service %changelog -* Sat Jul 16 2022 Zhao Hang - 1.2.6-1.0.1 -- Add doc sub package +* 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 + +* Fri Jul 8 2022 Jaroslav Kysela - 1.2.7-1 +- 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 diff --git a/dist b/dist new file mode 100644 index 0000000..9c0e36e --- /dev/null +++ b/dist @@ -0,0 +1 @@ +an8 diff --git a/download b/download index 7b329a7..8a9b0fb 100644 --- a/download +++ b/download @@ -1 +1 @@ -fc109b2fa4517caeae1697d936ca78ff alsa-utils-1.2.6.tar.bz2 +51175f5cd413daf7009a80684c65113d alsa-utils-1.2.8.tar.bz2 -- Gitee From 9a194d8eca610ea53944921d8fcd019eb888c43b Mon Sep 17 00:00:00 2001 From: Zhao Hang Date: Sat, 16 Jul 2022 13:50:34 +0800 Subject: [PATCH 2/2] spec: add doc sub package Signed-off-by: Zhao Hang --- alsa-utils.spec | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/alsa-utils.spec b/alsa-utils.spec index 52bb83e..1f8a771 100644 --- a/alsa-utils.spec +++ b/alsa-utils.spec @@ -1,3 +1,4 @@ +%define anolis_release .0.1 %define baseversion 1.2.8 #define fixversion .2 %global _hardened_build 1 @@ -10,7 +11,7 @@ Summary: Advanced Linux Sound Architecture (ALSA) utilities Name: alsa-utils Version: %{baseversion}%{?fixversion} -Release: 1%{?dist} +Release: 1%{anolis_release}%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.alsa-project.org/ @@ -37,6 +38,23 @@ Requires(postun): systemd # use latest alsa-lib - the executables in this package requires latest API Requires: alsa-lib%{?_isa} >= %{baseversion} +Requires: glibc +Provides: /usr/bin/aconnect +Provides: /usr/bin/alsaloop +Provides: /usr/bin/alsamixer +Provides: /usr/bin/alsaunmute +Provides: /usr/bin/amidi +Provides: /usr/bin/amixer +Provides: /usr/bin/aplay +Provides: /usr/bin/aplaymidi +Provides: /usr/bin/arecord +Provides: /usr/bin/arecordmidi +Provides: /usr/bin/aseqdump +Provides: /usr/bin/aseqnet +Provides: /usr/bin/axfer +Provides: /usr/bin/iecset +Provides: /usr/bin/speaker-test + %description This package contains command line utilities for the Advanced Linux Sound Architecture (ALSA). @@ -76,6 +94,14 @@ BuildRequires: fftw-devel This package contains tool for basic audio testing using Advanced Linux Sound Architecture (ALSA) framework and Fast Fourier Transform library. +%package doc +Summary: Documents for %{name} +BuildArch: noarch +Requires: %{name} = %{version}-%{release} + +%description doc +Doc pages for %{name}. + %prep %setup -q -n %{name}-%{version} %patch1 -p1 -b .alsa-git @@ -131,7 +157,6 @@ rm %{buildroot}%{_libdir}/alsa-topology/libalsatplg_module_* %endif %files -f %{name}.lang -%doc COPYING ChangeLog README.md TODO alsamixer/alsamixer.rc.example %config /etc/alsa/* %{_prefix}/lib/udev/rules.d/* %{_unitdir}/* @@ -199,6 +224,9 @@ rm %{buildroot}%{_libdir}/alsa-topology/libalsatplg_module_* %{_sbindir}/alsabat-test.sh %{_mandir}/man1/alsabat.1.gz +%files doc +%doc COPYING ChangeLog README.md TODO alsamixer/alsamixer.rc.example + %pre if [ ! -r %{_unitdir}/alsa-state.service ]; then [ -d /etc/alsa ] || mkdir -m 0755 /etc/alsa @@ -222,6 +250,9 @@ fi %systemd_postun_with_restart alsa-state.service %changelog +* Mon May 22 2023 Zhao Hang - 1.2.8-1.0.1 +- Add doc sub package + * 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 -- Gitee