[audacious-plugins] Untested commit, because I'm in a hurry and snow is falling atm:

[Michael Schwendt]

commit 56537fcd6ffa856138cdca5959aeeb8884cc5d9c
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Fri Jan 11 16:59:06 2013 +0100

    Untested commit, because I'm in a hurry and snow is falling atm:
    
    Drop added .desktop files in favour of advertizing all MimeTypes in
    Audacious' own .desktop file. This is supposed to fix the assignment of
    Default Applications (GNOME bz #690119).

 audacious-amidi.desktop |   10 ---------
 audacious-plugins.spec  |   48 +++++++++++-----------------------------------
 audacious-sid.desktop   |   10 ---------
 3 files changed, 12 insertions(+), 56 deletions(-)
---
diff --git a/audacious-plugins.spec b/audacious-plugins.spec
index 887967d..f1f5bcc 100644
--- a/audacious-plugins.spec
+++ b/audacious-plugins.spec
@@ -11,7 +11,7 @@
 
 Name: audacious-plugins
 Version: 3.3.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Plugins for the Audacious audio player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -20,8 +20,6 @@ URL: http://audacious-media-player.org/
 License: GPLv2+ and LGPLv2+ and GPLv3 and MIT and BSD
 
 Source0: http://distfiles.audacious-media-player.org/audacious-plugins-%{tar_ver}.tar.bz2
-Source1: audacious-sid.desktop
-Source2: audacious-amidi.desktop
 Source3: README.licenses
 
 # Fedora customization
@@ -34,10 +32,11 @@ Patch2: audacious-plugins-3.1-beta1-ladspa.patch
 Patch3: audacious-plugins-3.3.3-m3u-empty-lines.patch
 # merged from post-3.3.x
 Patch4: audacious-plugins-3.3.3-wavpack.patch
+# merged from post-3.3.x for libcdio API changes
+Patch5: audacious-plugins-3.3.3-libcdio.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}
 BuildRequires: gettext-devel
-BuildRequires: desktop-file-utils
 BuildRequires: jack-audio-connection-kit-devel
 BuildRequires: libsamplerate-devel
 BuildRequires: alsa-lib-devel
@@ -53,6 +52,9 @@ BuildRequires: flac-devel
 BuildRequires: fluidsynth-devel
 BuildRequires: libbinio-devel
 BuildRequires: libcdio-devel
+%if 0%{?fedora} > 18
+BuildRequires: libcdio-paranoia-devel
+%endif
 BuildRequires: libcue-devel
 BuildRequires: SDL-devel
 BuildRequires: lirc-devel
@@ -110,8 +112,6 @@ Summary: Audacious input plugin for MIDI
 Group: Applications/Multimedia
 %{?aud_plugin_dep}
 Requires: audacious-plugins%{?_isa} >= %{aud_ver}
-Requires(post): desktop-file-utils
-Requires(postun): desktop-file-utils
 
 %description amidi
 This package provides AMIDI-Plug, a modular MIDI music player, as an
@@ -124,8 +124,6 @@ Summary: Audacious input plugin for SID music files
 Group: Applications/Multimedia
 %{?aud_plugin_dep}
 Requires: audacious-plugins%{?_isa} >= %{aud_ver}
-Requires(post): desktop-file-utils
-Requires(postun): desktop-file-utils
 
 %description sid
 This package provides an Audacious input plugin for SID music files.
@@ -141,6 +139,7 @@ providers may build it with libsidplay 2 instead.
 %patch2 -p1 -b .ladspa
 %patch3 -p1 -b .m3u-empty-lines
 %patch4 -p1 -b .wavpack
+%patch5 -p1 -b .libcdio-new
 
 for i in src/ladspa/plugin.c
 do
@@ -170,16 +169,6 @@ 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 \
-    %{SOURCE2}
 
 
 %check
@@ -191,22 +180,6 @@ 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
-update-desktop-database &> /dev/null || :
-
-%postun amidi
-update-desktop-database &> /dev/null || :
-
-
 %files -f %{name}.lang
 %doc AUTHORS COPYING
 %dir %{_libdir}/audacious
@@ -243,16 +216,19 @@ update-desktop-database &> /dev/null || :
 %files amidi
 %{_libdir}/audacious/Input/amidi-plug.so
 %{_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
+* Fri Jan 11 2013 Michael Schwendt <mschwendt at fedoraproject.org> - 3.3.3-3
+- Drop added .desktop files in favour of advertizing all MimeTypes in
+  Audacious' own .desktop file. This is supposed to fix the assignment
+  of Default Applications (GNOME bz #690119).
+
 * Thu Jan  3 2013 Michael Schwendt <mschwendt at fedoraproject.org> - 3.3.3-2
 - Merge fix for wavpack input to not complain about .wvc files.
 - Fix m3u parser to handle (=skip) empty lines.