From 194a0a85612ea524cfe2cdd8d087f9ca0447dc9f Mon Sep 17 00:00:00 2001
From: Michael Schwendt <mschwendt@fedoraproject.org>
Date: Feb 03 2021 19:14:46 +0000
Subject: Update to 4.1 release.


---

diff --git a/.gitignore b/.gitignore
index a2deebb..f0da064 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,4 @@
 /audacious-plugins-4.0.3.tar.bz2
 /audacious-plugins-4.0.4.tar.bz2
 /audacious-plugins-4.0.5.tar.bz2
+/audacious-plugins-4.1.tar.bz2
diff --git a/audacious-plugins.spec b/audacious-plugins.spec
index f03041e..01cf829 100644
--- a/audacious-plugins.spec
+++ b/audacious-plugins.spec
@@ -8,22 +8,22 @@
 %{?aud_plugin_dep}
 
 Name: audacious-plugins
-Version: 4.0.5
-Release: 4%{?dist}
+Version: 4.1
+Release: 1%{?dist}
 
 %global tar_ver %{version}
 
 # Minimum audacious/audacious-plugins version in inter-package dependencies.
-%global aud_ver 4.0
+%global aud_ver 4.1
 Requires: audacious%{?_isa} >= %{aud_ver}
 
 Summary: Plugins for the Audacious audio player
-URL: https://audacious-media-player.org/
+URL: http://audacious-media-player.org/
 
 # list of license per plugin in README.licences
 License: GPLv2+ and LGPLv2+ and GPLv3 and MIT and BSD
 
-Source0: https://distfiles.audacious-media-player.org/%{name}-%{tar_ver}.tar.bz2
+Source0: http://distfiles.audacious-media-player.org/%{name}-%{tar_ver}.tar.bz2
 Source3: README.licenses
 # for optional packages
 Source100: audacious-plugins-amidi.metainfo.xml
@@ -36,7 +36,6 @@ Patch0: audacious-plugins-3.7-alpha1-xmms-skindir.patch
 Patch2: audacious-plugins-3.6-ladspa.patch
 
 BuildRequires: gcc-c++
-BuildRequires: make
 BuildRequires: audacious-devel >= %{aud_ver}
 BuildRequires: gettext-devel
 BuildRequires: neon-devel
@@ -74,13 +73,10 @@ BuildRequires: pkgconfig(Qt5Core)
 BuildRequires: pkgconfig(Qt5Gui)
 BuildRequires: pkgconfig(Qt5Widgets)
 BuildRequires: pkgconfig(Qt5Multimedia)
+BuildRequires: pkgconfig(Qt5X11Extras)
 # plugin is Qt based
 BuildRequires: pkgconfig(ampache_browser_1)
 
-%if 0%{?rhel} && 0%{?rhel} < 8
-BuildRequires: devtoolset-8-toolchain
-%endif
-
 
 # plugin .so files
 %if 0%{?fedora} > 29
@@ -148,16 +144,13 @@ done
 grep -q -s __RPM_LIB * -R && exit 1
 
 sed -i '\,^.SILENT:,d' buildsys.mk.in
+sed -i 's!MAKE} -s!MAKE} !' buildsys.mk.in
 
 
 %build
 # Enforce availability of the audacious(plugin-api) dependency.
 %{!?aud_plugin_dep:echo 'No audacious(plugin-api) dependency!' && exit -1}
 
-%if 0%{?rhel} && 0%{?rhel} < 8
-. /opt/rh/devtoolset-8/enable
-%endif
-
 # temporarily was required to make Qt's MOC accessible
 #rm -rf _bin
 #mkdir _bin
@@ -174,6 +167,7 @@ sed -i '\,^.SILENT:,d' buildsys.mk.in
     --enable-filewriter-mp3 \
     --enable-openmpt \
     --enable-streamtuner \
+    --enable-qthotkey \
     --disable-sndio \
     --disable-aac  \
     --disable-mms  \
@@ -181,7 +175,7 @@ sed -i '\,^.SILENT:,d' buildsys.mk.in
     %{?with_gtk:--enable-gtk} \
     %{!?with_gtk:--disable-gtk} \
     --disable-rpath
-%make_build
+make %{?_smp_mflags}
 
 
 %install
@@ -236,6 +230,7 @@ install -p -m0644 %{SOURCE102} ${RPM_BUILD_ROOT}%{_datadir}/appdata
 %{_libdir}/audacious/General/scrobbler.so
 %{_libdir}/audacious/General/song_change.so
 %{_libdir}/audacious/General/streamtuner.so
+%{_libdir}/audacious/General/qthotkey.so
 %dir %{_libdir}/audacious/Input/
 %{_libdir}/audacious/Input/cdaudio-ng.so
 %{_libdir}/audacious/Input/flacng.so
@@ -268,7 +263,6 @@ install -p -m0644 %{SOURCE102} ${RPM_BUILD_ROOT}%{_datadir}/appdata
 %{_libdir}/audacious/General/aosd.so
 %{_libdir}/audacious/General/gtkui.so
 %{_libdir}/audacious/General/hotkey.so
-%{_libdir}/audacious/General/lyricwiki.so
 %{_libdir}/audacious/General/playlist-manager.so
 %{_libdir}/audacious/General/search-tool.so
 %{_libdir}/audacious/General/skins.so
@@ -304,14 +298,12 @@ install -p -m0644 %{SOURCE102} ${RPM_BUILD_ROOT}%{_datadir}/appdata
 
 
 %changelog
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.5-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jan 05 2021 Robert Scheck <robert@fedoraproject.org> - 4.0.5-3
-- Rebuilt for adplug 2.3.3
+* Tue Feb  2 2021 Michael Schwendt <mschwendt@fedoraproject.org> - 4.1-1
+- Update to 4.1 release.
 
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+* Thu Dec 31 2020 Michael Schwendt <mschwendt@fedoraproject.org> - 4.1-0.1.beta1
+- Upgrade to 4.1-beta1.
+  https://audacious-media-player.org/news/51-audacious-4-1-beta1-released
 
 * Tue Jul 21 2020 Michael Schwendt <mschwendt@fedoraproject.org> - 4.0.5-1
 - Update to 4.0.5 for important bug fixes.
diff --git a/sources b/sources
index eebd461..f438571 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (audacious-plugins-4.0.5.tar.bz2) = 90ab2edbfc797fa835aae9937b5f478a0ca575f31c443d9e8ba7394e1615f605beb417372872874c94d4f804dba7bea9fbae2078e162178386683d8a3e36c108
+SHA512 (audacious-plugins-4.1.tar.bz2) = 4adad3b4e9c264d52c6523fe84db56b9a87476a4ad5a86f85456a7e0276758d61675022e9e3da07e061dac45f604e54f83f9db85a37f0aaf0b75b3356a63932f