[audacious-plugins] Move the following exotic decoders into the audacious-plugins-exotic subpackage: adplug.so, console.

[Michael Schwendt]

commit ac7da3df1b33dce100f9b35d1ea7c19110910a2f
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Thu Feb 17 20:09:46 2011 +0100

    Move the following exotic decoders into the audacious-plugins-exotic
    subpackage: adplug.so, console.so, psf2.so, vtx.so, xsf.so
    In spec file, update list of licenses used by various plugins.
    Update stripped tarball to also remove the .usf plugin source.

 audacious-plugins.spec |   54 ++++++++++++++++++++++++++++++++----------------
 sources                |    2 +-
 2 files changed, 37 insertions(+), 19 deletions(-)
---
diff --git a/audacious-plugins.spec b/audacious-plugins.spec
index 4c7e7fb..bff4f9f 100644
--- a/audacious-plugins.spec
+++ b/audacious-plugins.spec
@@ -10,14 +10,14 @@ Requires: audacious >= %{aud_ver}
 
 Name: audacious-plugins
 Version: 2.4.3
-Release: 9%{?dist}
+Release: 10%{?dist}
 Summary: Plugins for the Audacious audio player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
 
-# LGPLv2+: adplug, bio2jack, rocklight
-# MIT: crystalizer, dockalbumart
-# BSD: scrobbler/lastfm, psf
+# LGPLv2+: adplug, bio2jack, console, rocklight
+# MIT: crystalizer, dockalbumart, lyricwiki, voice_removal
+# 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
@@ -110,19 +110,27 @@ This package provides an Audacious output plugin that uses the
 Jack Audio Connection Kit (JACK) sound service.
 
 
-%if 0%{?fedora} > 14
-%package adplug
-Summary: Audacious input plugin for AdLib/OPL based file formats
+%package exotic
+Summary: Optional niche market plugins for Audacious 
 Group: Applications/Multimedia
 %{?aud_plugin_dep}
 Requires: audacious >= %{aud_ver}, audacious-plugins >= %{aud_ver}
-
-%description adplug
-This package provides an AdLib emulator based on the AdPlug library.
-It is only needed for playing exotic audio files, such as those from
-AdLib/OPL2/3 based sound trackers.
+# temporarily only:
+%if 0%{?fedora} > 14
+# subpkg was available during F-15 development
+Obsoletes: audacious-plugins-adplug < %{version}-%{release}
+Provides: audacious-plugins-adplug = %{version}-%{release}
 %endif
 
+%description exotic
+This package provides optional plugins for Audacious, which do not aim
+at a wide demographic audience. Most users of Audacious do not need this.
+
+For example, included are input plugins for exotic audio file formats,
+AdLib/OPL2 emulation, console game music files, the Portable Sound Format
+PSF1/PSF2, Vortex AM/YM emulation, Game Boy Advance Sound Format GSF,
+Nintendo DS Sound Format 2SF.
+
 
 %package amidi
 Summary: Audacious input plugin for MIDI
@@ -230,24 +238,28 @@ update-desktop-database &> /dev/null || :
 %{_libdir}/audacious/General/
 %{_libdir}/audacious/Visualization/
 %{_libdir}/audacious/Transport/
-%if 0%{?fedora} > 14
+%{_datadir}/audacious/
 %exclude %{_libdir}/audacious/Input/adplug.so
-%endif
+%exclude %{_libdir}/audacious/Input/console.so
+%exclude %{_libdir}/audacious/Input/psf2.so
+%exclude %{_libdir}/audacious/Input/vtx.so
+%exclude %{_libdir}/audacious/Input/xsf.so
 %exclude %{_libdir}/audacious/Input/amidi-plug.so
 %exclude %{_libdir}/audacious/Input/amidi-plug/
 %exclude %{_libdir}/audacious/Input/sid.so
 %exclude %{_libdir}/audacious/Output/jackout.so
-%{_datadir}/audacious/
 
 %files jack
 %defattr(-,root,root,-)
 %{_libdir}/audacious/Output/jackout.so
 
-%if 0%{?fedora} > 14
-%files adplug
+%files exotic
 %defattr(-,root,root,-)
 %{_libdir}/audacious/Input/adplug.so
-%endif
+%{_libdir}/audacious/Input/console.so
+%{_libdir}/audacious/Input/psf2.so
+%{_libdir}/audacious/Input/vtx.so
+%{_libdir}/audacious/Input/xsf.so
 
 %files amidi
 %defattr(-,root,root,-)
@@ -261,6 +273,12 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Thu Feb 17 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.4.3-10
+- Move the following exotic decoders into the audacious-plugins-exotic
+  subpackage: adplug.so, console.so, psf2.so, vtx.so, xsf.so
+- In spec file, update list of licenses used by various plugins.
+- Update stripped tarball to also remove the .usf plugin source.
+
 * Wed Feb 16 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.4.3-9
 - Fix C++ static member init mess in adplug plugin (#669889).
 
diff --git a/sources b/sources
index 05b5aa8..9234488 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-10d288d02036231c61ce284abae27477  audacious-plugins-fedora-2.4.3.tar.bz2
+3d5b1ff42cbfc1d6c4a3dfcc994aaa25  audacious-plugins-fedora-2.4.3.tar.bz2