[audacious-plugins/f17] Update to 3.2.4 (bug-fixes).

[Michael Schwendt]

commit 5017258070d1ed93a2673974d3cf65249e4cb818
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Sat Jun 30 18:12:14 2012 +0200

    Update to 3.2.4 (bug-fixes).

 .gitignore             |    1 +
 README                 |   21 ---------------------
 audacious-plugins.spec |   30 +++++++++++++++++++++++++-----
 sources                |    2 +-
 4 files changed, 27 insertions(+), 27 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0ab2579..c8a3f31 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /audacious-plugins-3.2.1.tar.bz2
 /audacious-plugins-3.2.2.tar.bz2
 /audacious-plugins-3.2.3.tar.bz2
+/audacious-plugins-3.2.4.tar.bz2
diff --git a/audacious-plugins.spec b/audacious-plugins.spec
index 19e7f8d..c8cfa7b 100644
--- a/audacious-plugins.spec
+++ b/audacious-plugins.spec
@@ -10,7 +10,7 @@
 %global aud_ver 3.2
 
 Name: audacious-plugins
-Version: 3.2.3
+Version: 3.2.4
 Release: 1%{?dist}
 Summary: Plugins for the Audacious audio player
 Group: Applications/Multimedia
@@ -41,7 +41,9 @@ BuildRequires: alsa-lib-devel
 BuildRequires: pulseaudio-libs-devel
 BuildRequires: libsndfile-devel
 BuildRequires: wavpack-devel
+%if 0%{?fedora} <= 17
 BuildRequires: libsidplay-devel
+%endif
 BuildRequires: libmodplug-devel
 BuildRequires: libogg-devel libvorbis-devel
 BuildRequires: flac-devel
@@ -64,9 +66,10 @@ BuildRequires: curl-devel
 # experimental, disabled by default
 BuildRequires: neon-devel
 
-# last tagged dist-f14 and dist-f13-updates
-Obsoletes: audacious-plugins-esd < 2.4-0.6
-
+%if 0%{?fedora} > 17
+# TODO: Likely needs to be made non-versioned for future updates in F<=17.
+Obsoletes: audacious-plugins-sid < 3.2.3-2
+%endif
 
 %description
 This package provides essential plugins for the Audacious audio player.
@@ -112,6 +115,7 @@ This package provides AMIDI-Plug, a modular MIDI music player, as an
 input plugin for Audacious.
 
 
+%if 0%{?fedora} <= 17
 %package sid
 Summary: Audacious input plugin for SID music files
 Group: Applications/Multimedia
@@ -125,7 +129,7 @@ This package provides an Audacious input plugin for SID music files.
 
 This build of the plugin uses libsidplay 1. Third party package
 providers may build it with libsidplay 2 instead.
-
+%endif
 
 %prep
 %setup -q -n %{name}-%{tar_ver}
@@ -161,10 +165,12 @@ make %{?_smp_mflags}
 %install
 make install DESTDIR=${RPM_BUILD_ROOT} INSTALL="install -p"
 %find_lang %{name}
+%if 0%{?fedora} <= 17
 # audacious-sid.desktop
 desktop-file-install --vendor "" \
     --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
     %{SOURCE1}
+%endif
 # audacious-amidi.desktop
 desktop-file-install --vendor "" \
     --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
@@ -180,11 +186,13 @@ desktop-file-install --vendor "" \
 [ -f ${RPM_BUILD_ROOT}%{_libdir}/audacious/Output/pulse_audio.so ]
 
 
+%if 0%{?fedora} <= 17
 %post sid
 update-desktop-database &> /dev/null || :
 
 %postun sid
 update-desktop-database &> /dev/null || :
+%endif
 
 
 %post amidi
@@ -212,7 +220,9 @@ update-desktop-database &> /dev/null || :
 %exclude %{_libdir}/audacious/Input/xsf.so
 %exclude %{_libdir}/audacious/Input/amidi-plug.so
 %exclude %{_libdir}/audacious/Input/amidi-plug/
+%if 0%{?fedora} <= 17
 %exclude %{_libdir}/audacious/Input/sid.so
+%endif
 %exclude %{_libdir}/audacious/Output/jackout.so
 
 %files jack
@@ -230,12 +240,22 @@ update-desktop-database &> /dev/null || :
 %{_libdir}/audacious/Input/amidi-plug/
 %{_datadir}/applications/audacious-amidi.desktop
 
+%if 0%{?fedora} <= 17
 %files sid
 %{_libdir}/audacious/Input/sid.so
 %{_datadir}/applications/audacious-sid.desktop
+%endif
 
 
 %changelog
+* Sat Jun 30 2012 Michael Schwendt <mschwendt at fedoraproject.org> - 3.2.4-1
+- Update to 3.2.4 (bug-fixes).
+
+* Wed May 30 2012 Michael Schwendt <mschwendt at fedoraproject.org> - 3.2.3-2
+- Fedora 18 only:
+  Kill -sid subpackage, don't build libsidplay1 plugin anymore.
+- Drop old -esd Obsoletes.
+
 * Sat May 26 2012 Michael Schwendt <mschwendt at fedoraproject.org> - 3.2.3-1
 - Update to 3.2.3 (bug-fixes and translation updates).
 
diff --git a/sources b/sources
index 6f25a06..c0c5167 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9645637fb108f4d5cc47e72d194c5574  audacious-plugins-3.2.3.tar.bz2
+c54d998fc280d83286fb637294723717  audacious-plugins-3.2.4.tar.bz2