[shared-mime-info/f16] shared-mime-info: Incorporate upstream fix for mp3 files missidentified

[Jon Masters]

commit dd8395184f4878f1af9ca30d8215c63c9de01fe4
Author: Jon Masters <jcm at jonmasters.org>
Date:   Mon Nov 21 14:15:41 2011 -0500

    shared-mime-info: Incorporate upstream fix for mp3 files missidentified
    
    Upstream has a fix based on an observation/work done by me to determine
    that many MP3 files do not play in Fedora due to being incorrectly
    recognized as Designer files. This happens because those files contain
    a header provided by Amazon and others including the "<ui" string.
    
    NOTE: Intentionally not a "merge" from master. We only want one fix.
    
    Signed-off-by: Jon Masters <jcm at jonmasters.org>

 ...fix-applications-desktop-mime-recognition.patch |   24 ++++++++++++++++++++
 shared-mime-info.spec                              |    7 +++++-
 2 files changed, 30 insertions(+), 1 deletions(-)
---
diff --git a/shared-mime-info-fix-applications-desktop-mime-recognition.patch b/shared-mime-info-fix-applications-desktop-mime-recognition.patch
new file mode 100644
index 0000000..cbca9ea
--- /dev/null
+++ b/shared-mime-info-fix-applications-desktop-mime-recognition.patch
@@ -0,0 +1,24 @@
+From bb6a26ff9f45363e8290372e113044a2dd2b70dd Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at hadess.net>
+Date: Mon, 21 Nov 2011 18:18:54 +0000
+Subject: Fix MP3 being detected as Qt Designer
+
+https://bugzilla.gnome.org/show_bug.cgi?id=664457
+---
+diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in
+index 6af2c45..145dd5a 100644
+--- a/freedesktop.org.xml.in
++++ b/freedesktop.org.xml.in
+@@ -1584,8 +1584,8 @@ command to generate the output files.
+     <generic-icon name="x-office-document"/>
+     <sub-class-of type="application/xml"/>
+     <magic>
+-      <match type="string" value="&lt;ui" offset="0:256"/>
+-      <match type="string" value="&lt;UI" offset="0:256"/>
++      <match type="string" value="&lt;ui " offset="0:256"/>
++      <match type="string" value="&lt;UI " offset="0:256"/>
+     </magic>
+     <glob pattern="*.ui"/>
+   </mime-type>
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/shared-mime-info.spec b/shared-mime-info.spec
index 0e5ba2a..0f85922 100644
--- a/shared-mime-info.spec
+++ b/shared-mime-info.spec
@@ -1,7 +1,7 @@
 Summary: Shared MIME information database
 Name: shared-mime-info
 Version: 0.91
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://freedesktop.org/Software/shared-mime-info
@@ -19,6 +19,7 @@ Source4: shotwell-viewer-defaults.list
 
 # Work-around for https://bugs.freedesktop.org/show_bug.cgi?id=40354
 Patch0: 0001-Remove-sub-classing-from-OO.o-mime-types.patch
+Patch1: shared-mime-info-fix-applications-desktop-mime-recognition.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libxml2-devel
@@ -41,6 +42,7 @@ and looking up the correct MIME type in a database.
 %prep
 %setup -q
 %patch0 -p1 -b .ooo-zip
+%patch1 -p1 -b .fix-mp3
 
 %build
 
@@ -80,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man*/*
 
 %changelog
+* Mon Nov 21 2011 Jon Masters <jcm at jonmasters.org> 0.91-6
+- Fix interpretation of MP3 files as application/x-designer (#755472)
+
 * Thu Oct 13 2011 Bastien Nocera <bnocera at redhat.com> 0.91-4
 - Make Evolution the default calendar (and not Gedit...)