[audacious-plugins] Use correct icon name in -amidi/-sid desktop files. Add audio/midi MIME type to audacious-plugins-am

[Michael Schwendt]

commit a634ac4e53101dd007e316da2e9d1b5745318867
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Sat Mar 26 13:03:37 2011 +0100

    Use correct icon name in -amidi/-sid desktop files.
    Add audio/midi MIME type to audacious-plugins-amidi package.

 audacious-amidi.desktop |   10 ++++++++++
 audacious-plugins.spec  |   21 ++++++++++++++++++++-
 audacious-sid.desktop   |    2 +-
 3 files changed, 31 insertions(+), 2 deletions(-)
---
diff --git a/audacious-amidi.desktop b/audacious-amidi.desktop
new file mode 100644
index 0000000..9f002af
--- /dev/null
+++ b/audacious-amidi.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Audacious
+Comment=Play MIDI music
+Exec=audacious
+Icon=audacious
+MimeType=audio/midi;
+Categories=GTK;AudioVideo;Player;
+Terminal=false
+Type=Application
+NoDisplay=true
diff --git a/audacious-plugins.spec b/audacious-plugins.spec
index 4b50549..56035a3 100644
--- a/audacious-plugins.spec
+++ b/audacious-plugins.spec
@@ -10,7 +10,7 @@ Requires: audacious >= %{aud_ver}
 
 Name: audacious-plugins
 Version: 2.5
-Release: 0.6.beta1%{?dist}
+Release: 0.7.beta1%{?dist}
 Summary: Plugins for the Audacious audio player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -23,6 +23,7 @@ License: GPLv2 and GPLv2+ and LGPLv2+ and MIT and GPLv3
 Source0: audacious-plugins-fedora-%{version}-beta1.tar.bz2
 #Source0: http://distfiles.atheme.org/audacious-plugins-%{version}-beta1.tgz
 Source1: audacious-sid.desktop
+Source2: audacious-amidi.desktop
 
 # Fedora customization
 Patch0: audacious-plugins-2.5-alpha1-xmms-skindir.patch
@@ -128,6 +129,8 @@ Summary: Audacious input plugin for MIDI
 Group: Applications/Multimedia
 %{?aud_plugin_dep}
 Requires: audacious >= %{aud_ver}, audacious-plugins >= %{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
@@ -192,6 +195,10 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 desktop-file-install --vendor "" \
     --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
     %{SOURCE1}
+# audacious-amidi.desktop
+desktop-file-install --vendor "" \
+    --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
+    %{SOURCE2}
 
 
 %check
@@ -210,6 +217,13 @@ update-desktop-database &> /dev/null || :
 update-desktop-database &> /dev/null || :
 
 
+%post amidi
+update-desktop-database &> /dev/null || :
+
+%postun amidi
+update-desktop-database &> /dev/null || :
+
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
@@ -248,6 +262,7 @@ update-desktop-database &> /dev/null || :
 %defattr(-,root,root,-)
 %{_libdir}/audacious/Input/amidi-plug.so
 %{_libdir}/audacious/Input/amidi-plug/
+%{_datadir}/applications/audacious-amidi.desktop
 
 %files sid
 %defattr(-,root,root,-)
@@ -256,6 +271,10 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Sat Mar 26 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5-0.7.beta1
+- Use correct icon name in -amidi/-sid desktop files.
+- Add audio/midi MIME type to audacious-plugins-amidi package.
+
 * Thu Mar 10 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5-0.6.beta1
 - Update to 2.5-beta1.
 - TODO: openal audio output plugin?
diff --git a/audacious-sid.desktop b/audacious-sid.desktop
index 0b8f7e3..867eaf4 100644
--- a/audacious-sid.desktop
+++ b/audacious-sid.desktop
@@ -2,7 +2,7 @@
 Name=Audacious
 Comment=Play SID music
 Exec=audacious
-Icon=audacious2
+Icon=audacious
 MimeType=audio/prs.sid;
 Categories=GTK;AudioVideo;Player;
 Terminal=false