From fee8649030171157976887bd8ecbc8bdbde8c1c8 Mon Sep 17 00:00:00 2001
From: Michael Schwendt <mschwendt@fedoraproject.org>
Date: Sep 19 2011 09:58:42 +0000
Subject: Update to 3.0.3 (some more translation updates).

Let the plugin pkgs depend on audacious(plugin-api)%{?_isa}.

---

diff --git a/.gitignore b/.gitignore
index bc4f078..4bf1b79 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /audacious-plugins-fedora-3.0.tar.bz2
 /audacious-plugins-fedora-3.0.1.tar.bz2
 /audacious-plugins-fedora-3.0.2.tar.bz2
+/audacious-plugins-fedora-3.0.3.tar.xz
diff --git a/audacious-plugins.spec b/audacious-plugins.spec
index d410db2..113cb40 100644
--- a/audacious-plugins.spec
+++ b/audacious-plugins.spec
@@ -1,16 +1,15 @@
 %global aud_plugin_api %(grep '[ ]*#define[ ]*_AUD_PLUGIN_VERSION[ ]\\+' %{_includedir}/audacious/plugin.h 2>/dev/null | sed 's!.*_AUD_PLUGIN_VERSION[ ]*\\([0-9]\\+\\).*!\\1!')
 %if 0%{aud_plugin_api} > 0
-%global aud_plugin_dep Requires: audacious(plugin-api) = %{aud_plugin_api}
+%global aud_plugin_dep Requires: audacious(plugin-api)%{?_isa} = %{aud_plugin_api}
 %endif
 %{?aud_plugin_dep}
 
 # Minimum audacious/audacious-plugins version in inter-package dependencies.
 %global aud_ver 3.0
-Requires: audacious%{?_isa} >= %{aud_ver}
 
 Name: audacious-plugins
-Version: 3.0.2
-Release: 3%{?dist}
+Version: 3.0.3
+Release: 1%{?dist}
 Summary: Plugins for the Audacious audio player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -20,19 +19,15 @@ URL: http://audacious-media-player.org/
 # BSD: alsa, compressor, crossfade, psf, resample, unix-io, xsf
 License: GPLv2 and GPLv2+ and LGPLv2+ and MIT and GPLv3
 
-Source0: audacious-plugins-fedora-%{version}.tar.bz2
+Source0: audacious-plugins-fedora-%{version}.tar.xz
 #Source0: http://distfiles.atheme.org/audacious-plugins-%{version}.tgz
 Source1: audacious-sid.desktop
 Source2: audacious-amidi.desktop
 
 # Fedora customization
 Patch0: audacious-plugins-3.0-alpha1-xmms-skindir.patch
-# Fedora customization: fix hardcoded libdir replacement
-#Patch1: audacious-plugins-2.4-libdir.patch
 # Fedora customization (RFE bz #632388)
-Patch2: audacious-plugins-3.0-alpha1-enable-gnomeshortcuts.patch
-# from post-3.0.2 git
-Patch3: audacious-plugins-3.0.2-pre3.0.3.patch
+Patch1: audacious-plugins-3.0-alpha1-enable-gnomeshortcuts.patch
 
 BuildRequires: autoconf
 BuildRequires: audacious-devel >= %{aud_ver}
@@ -85,7 +80,7 @@ itself forked from XMMS.
 Summary: Audacious output plugin for Jack Audio Connection Kit
 Group: Applications/Multimedia
 %{?aud_plugin_dep}
-Requires: audacious%{?_isa} >= %{aud_ver}, audacious-plugins%{?_isa} >= %{aud_ver}
+Requires: audacious-plugins%{?_isa} >= %{aud_ver}
 
 %description jack
 This package provides an Audacious output plugin that uses the
@@ -96,7 +91,7 @@ Jack Audio Connection Kit (JACK) sound service.
 Summary: Optional niche market plugins for Audacious 
 Group: Applications/Multimedia
 %{?aud_plugin_dep}
-Requires: audacious%{?_isa} >= %{aud_ver}, audacious-plugins%{?_isa} >= %{aud_ver}
+Requires: audacious-plugins%{?_isa} >= %{aud_ver}
 # temporarily only:
 %if 0%{?fedora} > 14
 # subpkg was available during F-15 development
@@ -118,7 +113,7 @@ Nintendo DS Sound Format 2SF.
 Summary: Audacious input plugin for MIDI
 Group: Applications/Multimedia
 %{?aud_plugin_dep}
-Requires: audacious%{?_isa} >= %{aud_ver}, audacious-plugins%{?_isa} >= %{aud_ver}
+Requires: audacious-plugins%{?_isa} >= %{aud_ver}
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -131,7 +126,7 @@ input plugin for Audacious.
 Summary: Audacious input plugin for SID music files
 Group: Applications/Multimedia
 %{?aud_plugin_dep}
-Requires: audacious%{?_isa} >= %{aud_ver}, audacious-plugins%{?_isa} >= %{aud_ver}
+Requires: audacious-plugins%{?_isa} >= %{aud_ver}
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -147,18 +142,9 @@ providers may build it with libsidplay 2 instead.
 %{!?aud_plugin_dep:echo 'No audacious(plugin-api) dependency!' && exit -1}
 %setup -q -n %{name}-fedora-%{version}
 %patch0 -p1 -b .xmms-skindir
-#patch1 -p1 -b .libdir
-%patch2 -p1 -b .enable-gnomeshortcuts
-%patch3 -p1 -b .pre-3.0.3
+%patch1 -p1 -b .enable-gnomeshortcuts
 autoreconf -I m4
 
-#for i in src/ladspa/ladspa.c
-#do
-#    sed -i -e 's!__RPM_LIBDIR__!%{_libdir}!g' $i
-#    sed -i -e 's!__RPM_LIB__!%{_lib}!g' $i
-#done
-#grep -q -s __RPM_LIB * -R && exit 1
-
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 
 %build
@@ -256,6 +242,10 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Mon Sep 19 2011 Michael Schwendt <mschwendt@fedoraproject.org> - 3.0.3-1
+- Update to 3.0.3 (some more translation updates).
+- Let the plugin pkgs depend on audacious(plugin-api)%%{?_isa}.
+
 * Fri Sep 16 2011 Michael Schwendt <mschwendt@fedoraproject.org> - 3.0.2-3
 - Use %%_isa in more dependencies.
 - Drop unneeded BuildRoot stuff.
diff --git a/sources b/sources
index b79b768..b96effa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fbebc07fc193602ef8bda8bf527d1921  audacious-plugins-fedora-3.0.2.tar.bz2
+414ab980da7bd764e679e5ef97832b56  audacious-plugins-fedora-3.0.3.tar.xz