[audacious/f15/master] Add x-content/audio-cdda MIME type to desktop file. Remove audio/midi MIME type from desktop file, b

[Michael Schwendt]

commit 005e4c4a36496f9746e63668ec9278e32a6fd073
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Fri Mar 25 00:00:18 2011 +0100

    Add x-content/audio-cdda MIME type to desktop file.
    Remove audio/midi MIME type from desktop file, because it is only
    supported with the optional audacious-plugins-amidi package.
    Drop old MIME type removal cruft from spec file,
    and don't remove .pls type.

 audacious.spec |   35 ++++++++++++-----------------------
 1 files changed, 12 insertions(+), 23 deletions(-)
---
diff --git a/audacious.spec b/audacious.spec
index 48fadef..ba4c615 100644
--- a/audacious.spec
+++ b/audacious.spec
@@ -11,7 +11,7 @@ Provides: audacious(plugin-api) = %{aud_plugin_api}
 
 Name: audacious
 Version: 2.4.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv3
 Summary: Advanced audio player
@@ -93,27 +93,6 @@ api=$(grep '[ ]*#define[ ]*__AUDACIOUS_PLUGIN_API__' src/audacious/plugin.h | se
 
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 
-# From .desktop files remove MIME types the base build of the
-# Fedora audacious-plugins package does not understand.
-for t in \
-    audio/mp3 \
-    audio/mpeg \
-    audio/mpegurl \
-    audio/x-mp3 \
-    audio/x-mpeg \
-    audio/x-mpegurl \
-    audio/x-ms-wma \
-    audio/x-musepack \
-    audio/prs.sid \
-; do
-    for f in audacious2.desktop ; do
-        cp ${f} ${f}.old
-        sed -i "s!${t};!!g" $f
-        diff -u ${f}.old ${f} || :
-        rm -f ${f}.old
-    done
-done   
-
 
 %build
 %configure  \
@@ -141,7 +120,10 @@ desktop-file-install  \
     --remove-mime-type audio/x-mpeg  \
     --remove-mime-type audio/x-mpegurl  \
     --remove-mime-type audio/x-ms-wma  \
-    --remove-mime-type audio/x-scpls  \
+    --remove-mime-type audio/x-musepack  \
+    --remove-mime-type audio/prs.sid  \
+    --remove-mime-type audio/midi  \
+    --add-mime-type x-content/audio-cdda  \
     --remove-category Application  \
     --add-category AudioVideo  \
     $RPM_BUILD_ROOT%{_datadir}/applications/audacious2.desktop
@@ -203,6 +185,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Thu Mar 24 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.4.4-2
+- Add x-content/audio-cdda MIME type to desktop file.
+- Remove audio/midi MIME type from desktop file, because it is only
+  supported with the optional audacious-plugins-amidi package.
+- Drop old MIME type removal cruft from spec file,
+  and don't remove .pls type.
+
 * Wed Feb 23 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.4.4-1
 - Update to 2.4.4 (maintenance release in stable branch, 27k diff).