From 2aacf5d0df68a1d4994cd82ceb7985f49f76e104 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Mon, 10 May 2021 06:27:10 +0000 Subject: [PATCH 1/3] Modernize the spec file - Use bconds for conditional build logic - Use autosetup macro for unpacking + patch application - Use standard macros for building and installing files - Minor formatting fixups - Stop installing license files as documentation - Remove unnecessary scriptlets --- alsa-plugins.spec | 60 +++++++++++++++++++++++++++++------------------ 1 file changed, 37 insertions(+), 23 deletions(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index f8cccde..20a610b 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -1,7 +1,7 @@ %if 0%{?rhel} -%define with_jack 0 +%bcond_with jack %else -%define with_jack 1 +%bcond_without jack %endif Name: alsa-plugins @@ -24,13 +24,14 @@ functionality to the Linux operating system. This package includes plugins for ALSA. -%if 0%{?with_jack} +%if %{with jack} %package jack Requires: alsa-utils Requires: jack-audio-connection-kit BuildRequires: jack-audio-connection-kit-devel Summary: Jack PCM output plugin for ALSA License: LGPLv2+ + %description jack This plugin converts the ALSA API over JACK (Jack Audio Connection Kit, http://jackit.sf.net) API. ALSA native applications can work @@ -42,7 +43,8 @@ This plugin provides the PCM type "jack" Requires: alsa-utils BuildRequires: alsa-lib-devel Summary: Oss PCM output plugin for ALSA -License: LGPLv2+ +License: LGPLv2+ + %description oss This plugin converts the ALSA API over OSS API. With this plugin, ALSA native apps can run on OSS drivers. @@ -55,6 +57,7 @@ Requires: pulseaudio-daemon BuildRequires: pulseaudio-libs-devel Summary: Alsa to PulseAudio backend License: LGPLv2+ + %description pulseaudio This plugin allows any program that uses the ALSA API to access a PulseAudio sound daemon. In other words, native ALSA applications can play and record @@ -66,6 +69,7 @@ Requires: alsa-utils BuildRequires: libsamplerate-devel Summary: External rate converter plugin for ALSA License: GPLv2+ + %description samplerate This plugin is an external rate converter using libsamplerate by Erik de Castro Lopo. @@ -75,6 +79,7 @@ Requires: alsa-utils BuildRequires: libsamplerate-devel Summary: Upmixer channel expander plugin for ALSA License: LGPLv2+ + %description upmix The upmix plugin is an easy-to-use plugin for upmixing to 4 or 6-channel stream. The number of channels to be expanded is determined @@ -85,6 +90,7 @@ Requires: alsa-utils BuildRequires: libsamplerate-devel Summary: Downmixer to stereo plugin for ALSA License: LGPLv2+ + %description vdownmix The vdownmix plugin is a downmixer from 4-6 channels to 2-channel stereo headphone output. This plugin processes the input signals with @@ -94,6 +100,7 @@ surround". %package usbstream Summary: USB stream plugin for ALSA License: LGPLv2+ + %description usbstream The usbstream plugin is for snd-usb-us122l driver. It converts PCM stream to USB specific stream. @@ -101,6 +108,7 @@ stream to USB specific stream. %package arcamav Summary: Arcam AV amplifier plugin for ALSA License: LGPLv2+ + %description arcamav This plugin exposes the controls for an Arcam AV amplifier (see: http://www.arcam.co.uk/) as an ALSA mixer device. @@ -110,6 +118,7 @@ Requires: speex speexdsp BuildRequires: speex-devel speexdsp-devel Summary: Rate Converter Plugin Using Speex Resampler License: LGPLv2+ + %description speex The rate plugin is an external rate converter using the Speex resampler (aka Public Parrot Hack) by Jean-Marc Valin. The pcm plugin provides @@ -120,13 +129,13 @@ BuildRequires: dbus-devel BuildRequires: make Summary: Maemo plugin for ALSA License: LGPLv2+ + %description maemo This plugin converts the ALSA API over PCM task nodes protocol. In this way, ALSA native applications can run over DSP Gateway and use DSP PCM task nodes. %prep -%setup -q -n %{name}-%{version}%{?prever} -%patch0 -p1 -b .alsa-git +%autosetup -n %{name}-%{version}%{?prever} -p1 %build autoreconf -vif @@ -134,10 +143,10 @@ autoreconf -vif --with-speex=lib \ --enable-maemo-plugin \ --enable-maemo-resource-manager -make %{?_smp_mflags} +%make_build %install -make install DESTDIR=%{buildroot} +%make_install mv %{buildroot}%{_sysconfdir}/alsa/conf.d/99-pulseaudio-default.conf.example \ %{buildroot}%{_sysconfdir}/alsa/conf.d/99-pulseaudio-default.conf @@ -145,13 +154,10 @@ mv %{buildroot}%{_sysconfdir}/alsa/conf.d/99-pulseaudio-default.conf.example \ find %{buildroot} -name "*.la" -exec rm {} \; -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - -%if 0%{?with_jack} +%if %{with jack} %files jack -%doc COPYING COPYING.GPL doc/README-jack +%license COPYING COPYING.GPL +%doc doc/README-jack %dir %{_sysconfdir}/alsa/conf.d %config(noreplace) %{_sysconfdir}/alsa/conf.d/50-jack.conf %dir %{_datadir}/alsa/alsa.conf.d @@ -161,7 +167,8 @@ find %{buildroot} -name "*.la" -exec rm {} \; %endif %files oss -%doc COPYING COPYING.GPL doc/README-pcm-oss +%license COPYING COPYING.GPL +%doc doc/README-pcm-oss %dir %{_sysconfdir}/alsa/conf.d %config(noreplace) %{_sysconfdir}/alsa/conf.d/50-oss.conf %dir %{_datadir}/alsa/alsa.conf.d @@ -171,7 +178,8 @@ find %{buildroot} -name "*.la" -exec rm {} \; %{_libdir}/alsa-lib/libasound_module_pcm_oss.so %files pulseaudio -%doc COPYING COPYING.GPL doc/README-pulse +%license COPYING COPYING.GPL +%doc doc/README-pulse %dir %{_libdir}/alsa-lib %{_libdir}/alsa-lib/libasound_module_pcm_pulse.so %{_libdir}/alsa-lib/libasound_module_ctl_pulse.so @@ -183,7 +191,8 @@ find %{buildroot} -name "*.la" -exec rm {} \; %{_datadir}/alsa/alsa.conf.d/50-pulseaudio.conf %files samplerate -%doc COPYING COPYING.GPL doc/samplerate.txt +%license COPYING COPYING.GPL +%doc doc/samplerate.txt %dir %{_sysconfdir}/alsa/conf.d %config(noreplace) %{_sysconfdir}/alsa/conf.d/10-samplerate.conf %dir %{_datadir}/alsa/alsa.conf.d @@ -196,7 +205,8 @@ find %{buildroot} -name "*.la" -exec rm {} \; %{_libdir}/alsa-lib/libasound_module_rate_samplerate_order.so %files upmix -%doc COPYING COPYING.GPL doc/upmix.txt +%license COPYING COPYING.GPL +%doc doc/upmix.txt %dir %{_sysconfdir}/alsa/conf.d %config(noreplace) %{_sysconfdir}/alsa/conf.d/60-upmix.conf %dir %{_datadir}/alsa/alsa.conf.d @@ -205,7 +215,8 @@ find %{buildroot} -name "*.la" -exec rm {} \; %{_libdir}/alsa-lib/libasound_module_pcm_upmix.so %files vdownmix -%doc COPYING COPYING.GPL doc/vdownmix.txt +%license COPYING COPYING.GPL +%doc doc/vdownmix.txt %dir %{_sysconfdir}/alsa/conf.d %config(noreplace) %{_sysconfdir}/alsa/conf.d/60-vdownmix.conf %dir %{_datadir}/alsa/alsa.conf.d @@ -214,7 +225,7 @@ find %{buildroot} -name "*.la" -exec rm {} \; %{_libdir}/alsa-lib/libasound_module_pcm_vdownmix.so %files usbstream -%doc COPYING COPYING.GPL +%license COPYING COPYING.GPL %dir %{_sysconfdir}/alsa/conf.d %config(noreplace) %{_sysconfdir}/alsa/conf.d/98-usb-stream.conf %dir %{_datadir}/alsa/alsa.conf.d @@ -223,7 +234,8 @@ find %{buildroot} -name "*.la" -exec rm {} \; %{_libdir}/alsa-lib/libasound_module_pcm_usb_stream.so %files arcamav -%doc COPYING COPYING.GPL doc/README-arcam-av +%license COPYING COPYING.GPL +%doc doc/README-arcam-av %dir %{_sysconfdir}/alsa/conf.d %config(noreplace) %{_sysconfdir}/alsa/conf.d/50-arcam-av-ctl.conf %dir %{_datadir}/alsa/alsa.conf.d @@ -232,7 +244,8 @@ find %{buildroot} -name "*.la" -exec rm {} \; %{_libdir}/alsa-lib/libasound_module_ctl_arcam_av.so %files speex -%doc COPYING COPYING.GPL doc/speexdsp.txt doc/speexrate.txt +%license COPYING COPYING.GPL +%doc doc/speexdsp.txt doc/speexrate.txt %dir %{_sysconfdir}/alsa/conf.d %config(noreplace) %{_sysconfdir}/alsa/conf.d/10-speexrate.conf %config(noreplace) %{_sysconfdir}/alsa/conf.d/60-speex.conf @@ -246,7 +259,8 @@ find %{buildroot} -name "*.la" -exec rm {} \; %{_libdir}/alsa-lib/libasound_module_rate_speexrate_medium.so %files maemo -%doc COPYING COPYING.GPL doc/README-maemo +%license COPYING COPYING.GPL +%doc doc/README-maemo %dir %{_sysconfdir}/alsa/conf.d %config(noreplace) %{_sysconfdir}/alsa/conf.d/98-maemo.conf %dir %{_datadir}/alsa/alsa.conf.d From e2c6d9c1736d27dd57b75195791ec511752856bd Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Sun, 30 May 2021 10:18:20 +0200 Subject: [PATCH 2/3] updated to 1.2.5 --- alsa-plugins.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 20a610b..b752485 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -5,8 +5,8 @@ %endif Name: alsa-plugins -Version: 1.2.2 -Release: 5%{?dist} +Version: 1.2.5 +Release: 1%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ # pph plugin is BSD-like licensed @@ -271,6 +271,10 @@ find %{buildroot} -name "*.la" -exec rm {} \; %changelog +* Sun May 30 2021 Jaroslav Kysela - 1.2.5-1 +- Updated to 1.2.5 +- Modernize the spec file (Neal Gompa) + * Tue Jan 26 2021 Fedora Release Engineering - 1.2.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index d350ed8..e980921 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (alsa-plugins-1.2.2.tar.bz2) = 25a7dfaa64be024447d889b5cde668f1308d197f54880548a82d50beb4ac0dbff33b415da1e26dc5229408c934247a9bd38acfb0f82ca388deac0d77ab3cdadb +SHA512 (alsa-plugins-1.2.5.tar.bz2) = 32aa475ec4af040861c2bfb01eac71042242d2109d3c5102d0111f3327e3f6c9031c32cbb50eb4b6568a6bd9408691a047a39972f09d6087e31ec11f19ddc9cf From b53f2f63eafcd3977033908cb536e5682a16a396 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 6 Dec 2021 13:37:45 +0100 Subject: [PATCH 3/3] updated to 1.2.6 --- alsa-plugins.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index b752485..11574cb 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -5,7 +5,7 @@ %endif Name: alsa-plugins -Version: 1.2.5 +Version: 1.2.6 Release: 1%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ @@ -271,6 +271,9 @@ find %{buildroot} -name "*.la" -exec rm {} \; %changelog +* Mon Dec 6 2021 Jaroslav Kysela - 1.2.6-1 +- Updated to 1.2.6 + * Sun May 30 2021 Jaroslav Kysela - 1.2.5-1 - Updated to 1.2.5 - Modernize the spec file (Neal Gompa) diff --git a/sources b/sources index e980921..d101b57 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (alsa-plugins-1.2.5.tar.bz2) = 32aa475ec4af040861c2bfb01eac71042242d2109d3c5102d0111f3327e3f6c9031c32cbb50eb4b6568a6bd9408691a047a39972f09d6087e31ec11f19ddc9cf +SHA512 (alsa-plugins-1.2.6.tar.bz2) = ac54a6f227f1ca5f6e01e08d869e7c06f4bcd68f148932e1902a6fcf3e5ccd3667ac4d8c1a00b77e4b5cb27e17c01cf7526ded4aaf35c4b26fc69e14e6e341f9