From adcec97fae2a006787f9e5572b1456cfe7680420 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 1 Jul 2025 16:09:36 +0200 Subject: [PATCH] Update to 1.2.14 Resolves: RHEL-80638 Signed-off-by: Jaroslav Kysela --- alsa-utils.spec | 24 +++++++++++++++--------- gettext-version.patch | 13 +++++++++++++ sources | 2 +- 3 files changed, 29 insertions(+), 10 deletions(-) create mode 100644 gettext-version.patch diff --git a/alsa-utils.spec b/alsa-utils.spec index c4ea776..6a12af9 100644 --- a/alsa-utils.spec +++ b/alsa-utils.spec @@ -1,4 +1,5 @@ -%define baseversion 1.2.13 +%define baseversion 1.2.14 +%define libversion 1.2.13 #define fixversion .2 %global _hardened_build 1 @@ -14,10 +15,11 @@ Source5: alsaunmute.1 Source11: alsactl.conf Source20: alsa-restore.service Source22: alsa-state.service -Patch1: alsa-git.patch +Patch1: gettext-version.patch +#Patch2: alsa-git.patch -BuildRequires: gcc -BuildRequires: alsa-lib-devel >= %{baseversion} +BuildRequires: gcc +BuildRequires: alsa-lib-devel >= %{libversion} BuildRequires: libsamplerate-devel BuildRequires: ncurses-devel BuildRequires: gettext-devel @@ -29,9 +31,9 @@ Requires(post): systemd Requires(preun): systemd Requires(postun): systemd # use latest alsa-lib - the executables in this package requires latest API -Requires: alsa-lib%{?_isa} >= %{baseversion} +Requires: alsa-lib%{?_isa} >= %{libversion} %ifnarch s390x -Requires: alsa-ucm >= %{baseversion} +Requires: alsa-ucm >= %{libversion} %endif %description @@ -47,7 +49,7 @@ Architecture (ALSA) framework. %package -n alsa-topology-utils Summary: Advanced Linux Sound Architecture (ALSA) - Topology -Requires: alsa-topology >= %{baseversion} +Requires: alsa-topology >= %{libversion} %description -n alsa-topology-utils This package contains topology tools for Advanced Linux Sound @@ -64,7 +66,8 @@ Architecture (ALSA) framework and Fast Fourier Transform library. %prep %setup -q -n %{name}-%{version} -%patch -P1 -p1 -b .alsa-git +%patch -P1 -p1 -b .gettext +#patch -P2 -p1 -b .alsa-git %build autoreconf -vif @@ -162,7 +165,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/ @@ -207,6 +210,9 @@ fi %systemd_postun_with_restart alsa-state.service %changelog +* Tue Jul 1 2025 Jaroslav Kysela - 1.2.14-1 +* Updated to 1.2.14 + * Sun Dec 8 2024 Jaroslav Kysela - 1.2.13-1 * Updated to 1.2.13 diff --git a/gettext-version.patch b/gettext-version.patch new file mode 100644 index 0000000..ba175b9 --- /dev/null +++ b/gettext-version.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index 4532778..d272bce 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -8,7 +8,7 @@ AM_INIT_AUTOMAKE([subdir-objects]) + AM_MAINTAINER_MODE([enable]) + + AM_GNU_GETTEXT([external]) +-AM_GNU_GETTEXT_VERSION([0.22.5]) ++AM_GNU_GETTEXT_VERSION([0.19.8]) + + dnl Checks for programs. + diff --git a/sources b/sources index 96a6018..1182a6f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (alsa-utils-1.2.13.tar.bz2) = 0e2fb5b6e497b977badba2ebe2bddfc819654d24001622e0299e4034210caeeea2f3c2c2d1d260a48caefb6584e0b989fdb7036c6012108c8c38d89b3cb04c78 +SHA512 (alsa-utils-1.2.14.tar.bz2) = dd470a2f5210822cc4d3ded094b84721a07904df5c32dd329e0cb4c052d39e3e6d7ddb511cde2d23b3f6824c71fba9dbdca369355d5c03b234e989dbbb9b7a95