[audacious-plugins] Kill -sid subpackage, don't build libsidplay1 plugin anymore.

Michael Schwendt mschwendt at fedoraproject.org
Wed May 30 19:15:49 UTC 2012


commit 1e488b27668369c0f4a9de1c7d78ae87f7bb9d07
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Wed May 30 21:15:45 2012 +0200

    Kill -sid subpackage, don't build libsidplay1 plugin anymore.
    
    - Drop old -esd Obsoletes.

 audacious-plugins.spec |   23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 deletions(-)
---
diff --git a/audacious-plugins.spec b/audacious-plugins.spec
index 19e7f8d..e91219d 100644
--- a/audacious-plugins.spec
+++ b/audacious-plugins.spec
@@ -11,7 +11,7 @@
 
 Name: audacious-plugins
 Version: 3.2.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Plugins for the Audacious audio player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -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,9 @@ 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
+Obsoletes: audacious-plugins-sid < 3.2.3-2
+%endif
 
 %description
 This package provides essential plugins for the Audacious audio player.
@@ -112,6 +114,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 +128,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 +164,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 \
@@ -212,7 +217,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 +237,18 @@ 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
+* Wed May 30 2012 Michael Schwendt <mschwendt at fedoraproject.org> - 3.2.3-2
+- 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).
 


More information about the scm-commits mailing list