commit bcc2fdf0b05d41357161ac8d476e6550a88f49b7 Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Sun Jun 11 13:44:42 2023 +0100 Update aqualung to 1.2 .gitignore | 1 + aqualung-1.1-ifp.patch | 41 ---------------------------------------- aqualung-1.1-var-collision.patch | 31 ------------------------------ aqualung.spec | 32 ++++++++++++------------------- sources | 2 +- 5 files changed, 14 insertions(+), 93 deletions(-) --- diff --git a/.gitignore b/.gitignore index 8af5d54..6820b4e 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ aqualung-export-r1309.tar.bz2 /aqualung-05dfcb7.tar.gz /aqualung-72c1ab1.tar.gz /aqualung-1.1.tar.gz +/aqualung-1.2.tar.gz diff --git a/aqualung.spec b/aqualung.spec index df6c002..6e12f6a 100644 --- a/aqualung.spec +++ b/aqualung.spec @@ -18,17 +18,15 @@ %endif Name: aqualung -Version: 1.1 -Release: 5%{?dist} +Version: 1.2 +Release: 1%{?dist} Summary: Music Player for GNU/Linux License: GPLv2+ URL: http://aqualung.jeremyevans.net/ Source0: https://github.com/jeremyevans/aqualung/archive/%{version}/%{name}-%{vers... Source1: %{name}.desktop -Patch1: %name-%version-ifp.patch -Patch2: %name-%version-var-collision.patch -Patch3: aqualung-ALT-new_mac.patch -Patch4: aqualung-ALT-C11.patch +Patch0: aqualung-ALT-new_mac.patch +Patch1: aqualung-ALT-C11.patch # autogen.sh BuildRequires: autoconf automake pkgconfig gettext-devel @@ -53,11 +51,7 @@ BuildRequires: pkgconfig(speex) BuildRequires: pkgconfig(libmodplug) BuildRequires: libmpcdec-devel %{?with_mac:BuildRequires: pkgconfig(mac)} -%if 0%{?fedora} >= 36 -%{?with_lavc:BuildRequires: compat-ffmpeg4-devel} -%else %{?with_lavc:BuildRequires: ffmpeg-devel} -%endif %{?with_lame:BuildRequires: lame-devel} BuildRequires: pkgconfig(wavpack) BuildRequires: pkgconfig(lrdf) @@ -78,13 +72,9 @@ inserting no gaps between adjacent tracks. %prep %autosetup -p1 -n %{name}-%{version} +./autogen.sh %build -%if 0%{?fedora} >= 36 -export PKG_CONFIG_PATH=%{_libdir}/compat-ffmpeg4/pkgconfig -%endif - -./autogen.sh %configure \ --without-sndio \ --with-oss \ @@ -129,16 +119,18 @@ install -D -m 644 -p src/img/icon_48.png \ %files -f %{name}.lang %license COPYING -%doc AUTHORS ChangeLog README +%doc AUTHORS ChangeLog %{_bindir}/%{name} -%dir %{_datadir}/%{name}/ -%{_datadir}/%{name}/* -%{_datadir}/man/man1/%{name}.* +%{_datadir}/%{name}/ +%{_mandir}/man1/%{name}.* %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.png -%{_docdir}/%{name} +%{_docdir}/%{name}/* %changelog +* Sun Jun 11 2023 Leigh Scott <leigh123linux(a)gmail.com&gt; - 1.2-1 +- Update aqualung to 1.2 + * Sun Mar 26 2023 Leigh Scott <leigh123linux(a)gmail.com&gt; - 1.1-5 - rebuilt diff --git a/sources b/sources index ad54bfb..4df3780 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aqualung-1.1.tar.gz) = 6e635e4e2b8ce3aed5446ef03e54c71b415d472fde37bf7572ee7aba72eed67684770497495916cd4bf34c4de4aa63701c2d9cadb2ab0654666a4f9ffa75ba8d +SHA512 (aqualung-1.2.tar.gz) = b56be91b19486b80526d015de07da5a3b9a44a55a0c9b7f9fe5cff0434d42110226fc4c799351e1247cc4f8361da6fb2b44e81edca8036952435ea3423fc5cf0