diff --git a/.gitignore b/.gitignore index aeff268..98275dd 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ /alsa-lib-1.2.7.2.tar.bz2 /alsa-ucm-conf-1.2.7.2.tar.bz2 /alsa-ucm-git.patch +/alsa-lib-1.2.8.tar.bz2 +/alsa-ucm-conf-1.2.8.tar.bz2 diff --git a/alsa-lib.spec b/alsa-lib.spec index 76adc68..0ec3fac 100644 --- a/alsa-lib.spec +++ b/alsa-lib.spec @@ -2,10 +2,14 @@ #define prever_dot .rc3 #define postver a -%define version_alsa_lib 1.2.7.2 -%define version_alsa_ucm 1.2.7.2 +%define version_alsa_lib 1.2.8 +%define version_alsa_ucm 1.2.8 %define version_alsa_tplg 1.2.5 +%if 0%{?rhel} +%global _without_topology 1 +%endif + Summary: The Advanced Linux Sound Architecture (ALSA) library Name: alsa-lib Version: %{version_alsa_lib} @@ -16,7 +20,9 @@ URL: http://www.alsa-project.org/ Source: ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}%{?postver}.tar.bz2 Source1: ftp://ftp.alsa-project.org/pub/lib/alsa-ucm-conf-%{version_alsa_ucm}.tar.bz2 +%if 0%{!?_without_topology:1} Source2: ftp://ftp.alsa-project.org/pub/lib/alsa-topology-conf-%{version_alsa_tplg}.tar.bz2 +%endif Source10: asound.conf Source11: modprobe-dist-alsa.conf Source12: modprobe-dist-oss.conf @@ -61,16 +67,20 @@ Requires: %{name} >= %{version_alsa_lib} The Advanced Linux Sound Architecture (ALSA) Universal Configuration Manager allows configuration of Audio input/output names and routing +%if 0%{!?_without_topology:1} %package -n alsa-topology Summary: ALSA Topology configuration Group: System Environment/Libraries BuildArch: noarch License: BSD Requires: %{name} >= %{version_alsa_lib} +%endif +%if 0%{!?_without_topology:1} %description -n alsa-topology The Advanced Linux Sound Architecture (ALSA) topology configuration contains alsa-lib configuration of SoC topology +%endif %prep %setup -q -n %{name}-%{version}%{?prever}%{?postver} @@ -116,7 +126,9 @@ patch -d %{buildroot}/%{_datadir}/alsa -p1 < %{SOURCE20} mkdir -p %{buildroot}/%{_datadir}/alsa/topology # Unpack topologies +%if 0%{!?_without_topology:1} tar xvjf %{SOURCE2} -C %{buildroot}/%{_datadir}/alsa --strip-components=1 "*/topology" +%endif # Remove libtool archives. find %{buildroot} -name '*.la' -delete @@ -158,11 +170,17 @@ rm %{buildroot}/%{_includedir}/asoundlib.h %{_datadir}/alsa/ucm %{_datadir}/alsa/ucm2 +%if 0%{!?_without_topology:1} %files -n alsa-topology # BSD %{_datadir}/alsa/topology +%endif %changelog +* Mon Oct 24 2022 Jaroslav Kysela - 1.2.8-1 +- update to alsa-lib 1.2.8 and alsa-ucm-conf 1.2.8 +- remove alsa-topology package for rhel + * Fri Jul 8 2022 Jaroslav Kysela - 1.2.7.2-1 - Updated to 1.2.7.2 diff --git a/sources b/sources index 035ff3c..b24b5fa 100644 --- a/sources +++ b/sources @@ -1,5 +1,4 @@ SHA512 (alsa-git.patch) = cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e -SHA512 (alsa-lib-1.2.7.2.tar.bz2) = 79e5920384e570a1acd8ecd1eb8812879333c3cedb1d15780080afc40125b97df893c33f4163d9dd863871b628bc6026265f8ace2c8634fc1af5b52b62ac9cfe -SHA512 (alsa-topology-conf-1.2.5.tar.bz2) = 2eb4d8baf2dcbf0b631dd11dbf15bffc51694d9cc6931619e51787f3ba58d1a091d266e6721a3b737c040ec74a28270b93f39fb97f30a3227cf340dd646e5d51 -SHA512 (alsa-ucm-conf-1.2.7.2.tar.bz2) = b6866f1ca6a3f4d69d7923bc1107a64b49944a3a8756f129f39034e5390e08db1c295669e54dfe1437ca934cc11abf407f60fc8319f5cba3f021966e8654c2db +SHA512 (alsa-lib-1.2.8.tar.bz2) = 865ff05a8f589996f8d63d43a91c961f1b64144f3e1d17c7074b7ac16f25b3fd1c371d46ed63a8cc20fa01e63c76b75f1a9802b56889ae1073854dd050d27688 +SHA512 (alsa-ucm-conf-1.2.8.tar.bz2) = a15a9ca52c108ee95a421b91f3fad4329f1e9fb1c004a40d5ff1a57d6701bad19a31d5a296426d26439be9b87d2d543ce51588a98402d24c17f0f92aaf1096ca SHA512 (alsa-ucm-git.patch) = cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e