From 6ba65ec84e5c9a4f2e004a29ded3d3c43e8a36cc Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Tue, 17 Jan 2012 16:38:13 +0000
Subject: [PATCH] Update to 1.0

---
 .gitignore                                    |  1 +
 ...pplications-desktop-mime-recognition.patch | 24 -------------------
 shared-mime-info.spec                         |  9 +++----
 sources                                       |  2 +-
 4 files changed, 7 insertions(+), 29 deletions(-)
 delete mode 100644 shared-mime-info-fix-applications-desktop-mime-recognition.patch

diff --git a/.gitignore b/.gitignore
index f50a109..c086317 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ shared-mime-info-0.71.tar.bz2
 /shared-mime-info-0.80.tar.bz2
 /shared-mime-info-0.90.tar.bz2
 /shared-mime-info-0.91.tar.xz
+/shared-mime-info-1.0.tar.xz
diff --git a/shared-mime-info-fix-applications-desktop-mime-recognition.patch b/shared-mime-info-fix-applications-desktop-mime-recognition.patch
deleted file mode 100644
index cbca9ea..0000000
--- a/shared-mime-info-fix-applications-desktop-mime-recognition.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From bb6a26ff9f45363e8290372e113044a2dd2b70dd Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@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 f85b2c3..383f4e9 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: 7%{?dist}
+Version: 1.0
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://freedesktop.org/Software/shared-mime-info
@@ -19,7 +19,6 @@ 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
@@ -42,7 +41,6 @@ and looking up the correct MIME type in a database.
 %prep
 %setup -q
 %patch0 -p1 -b .ooo-zip
-%patch1 -p1 -b .fix-mp3
 
 %build
 
@@ -89,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man*/*
 
 %changelog
+* Tue Jan 17 2012 Bastien Nocera <bnocera@redhat.com> 1.0-1
+- Update to 1.0
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.91-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 5862293..c8d80f1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-982a211560ba4c47dc791ccff34e8fbc  shared-mime-info-0.91.tar.xz
+901b7977dbb2b71d12d30d4d8fb97028  shared-mime-info-1.0.tar.xz