From 6f28546c70bde973f99ec16876bd4103dd02953e Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Jun 06 2011 13:45:18 +0000
Subject: drop old flac_mimetype patch, no longer needed


---

diff --git a/phonon-4.4.3-flac_mimetype.patch b/phonon-4.4.3-flac_mimetype.patch
deleted file mode 100644
index eef6a9f..0000000
--- a/phonon-4.4.3-flac_mimetype.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up phonon-4.4.3/gstreamer/backend.cpp.flac_mimetype phonon-4.4.3/gstreamer/backend.cpp
---- phonon-4.4.3/gstreamer/backend.cpp.flac_mimetype	2010-11-24 12:26:19.000000000 -0600
-+++ phonon-4.4.3/gstreamer/backend.cpp	2010-11-30 07:29:31.005424613 -0600
-@@ -265,6 +265,11 @@ QStringList Backend::availableMimeTypes(
-         if (!availableMimeTypes.contains("audio/ogg")) /* *.oga */
-             availableMimeTypes.append("audio/ogg");
-     }
-+    if (availableMimeTypes.contains("audio/x-flac")) {
-+        if (!availableMimeTypes.contains("audio/flac")) {
-+            availableMimeTypes.append("audio/flac");
-+        }
-+    }
-     availableMimeTypes.sort();
-     return availableMimeTypes;
- }
diff --git a/phonon-backend-gstreamer.spec b/phonon-backend-gstreamer.spec
index ddf14a3..46cbf94 100644
--- a/phonon-backend-gstreamer.spec
+++ b/phonon-backend-gstreamer.spec
@@ -3,7 +3,7 @@ Summary: Gstreamer phonon backend
 Name:    phonon-backend-gstreamer
 Epoch:   2
 Version: 4.5.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://phonon.kde.org/
@@ -16,15 +16,6 @@ Source0: ftp://ftp.kde.org/pub/kde/stable/phonon/phonon-backend-gstreamer/%{vers
 %endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-## Mandriva/upstreamable patches
-
-## Ubuntu/upstreamable patches
-# older shared-mime-info may still need this, where audio/x-flac was primary mimetype (newer versions use audio/flac with audio/x-flac alias)
-# ie, needed in < f14+/shared-mime-info-0.80+ , though keeping this patch is mostly harmless
-Patch60: phonon-4.4.3-flac_mimetype.patch
-
-## Upstream patches
-
 BuildRequires: automoc4
 BuildRequires: cmake
 BuildRequires: gstreamer-devel
@@ -55,8 +46,6 @@ Requires: qt4%{?_isa} >= %{_qt4_version}
 %prep
 %setup -q -n phonon-backend-gstreamer-%{version}
 
-%patch60 -p1 -b .flac_mimetype
-
 
 %build
 mkdir -p %{_target_platform}
@@ -102,6 +91,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null ||:
 
 
 %changelog
+* Mon Jun 06 2011 Rex Dieter <rdieter@fedoraproject.org> 2:4.5.1-2
+- drop old flac_mimetype patch, no longer needed
+
 * Fri May 06 2011 Rex Dieter <rdieter@fedoraproject.org> 2:4.5.1-1
 - 4.5.1