diff --git a/shared-mime-info-0.51.tar.bz2 b/shared-mime-info-0.51.tar.bz2
deleted file mode 100644
index d91157e..0000000
--- a/shared-mime-info-0.51.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1c247e03418d6b90bcbc0da6c1abe6ac9cd5bacf9c3a2f3b6105376cf7b0eed8
-size 445565
diff --git a/shared-mime-info-0.60.tar.bz2 b/shared-mime-info-0.60.tar.bz2
new file mode 100644
index 0000000..afb8415
--- /dev/null
+++ b/shared-mime-info-0.60.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a0d0a948fbb8d0de576876791d53efd1c5e8dd782eb9e5369cafc06c3969de22
+size 457377
diff --git a/shared-mime-info-msi-no-magic.patch b/shared-mime-info-msi-no-magic.patch
deleted file mode 100644
index eb7bd41..0000000
--- a/shared-mime-info-msi-no-magic.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- freedesktop.org.xml.in
-+++ freedesktop.org.xml.in
-@@ -2133,9 +2133,6 @@
-
- <_comment>Windows Installer package
-
--
--
--
-
-
-
diff --git a/shared-mime-info.changes b/shared-mime-info.changes
index 30cd51c..3153d73 100644
--- a/shared-mime-info.changes
+++ b/shared-mime-info.changes
@@ -1,3 +1,43 @@
+-------------------------------------------------------------------
+Sun Feb 22 00:48:09 CET 2009 - vuntz@novell.com
+
+- Update to version 0.60:
+ + Mime-type Changes:
+ - Add alias for SMIL
+ - Fix SMIL detection
+ - Add Annodex mime-type
+ - Only use .ogg for audio Ogg files
+ - Fix RDF mime-type
+ - Oasis mime-type fixes
+ - Make PICTURES match a picture CD but not "pictures"
+ - Add alias for application/zip
+ - Add Microsoft Document Imaging format
+ - Add magic for 7z archives
+ - Add cb7 comic book archives
+ - Add magic for XCF files
+ - Remove application/x-msi magic
+ - Add audio/x-gsm mime-type
+ - Add MS cab mime-type
+ - Add FictionBook mime-type
+ - Fix PKCS#12 bundles definition (not text files)
+ - Add PKCS#7 and PkiPath mime-types
+ - Add application/vnd.ms-wpl mime-type
+ - Add more aliases for media types
+ - Add alias for text/x-csv
+ - Fix comment for Gnucash files
+ - Make Javascript a sub-class of C
+ - Add *.vapi as a glob for Vala files
+ - Fix image/fits to match IANA
+ - Add Office 2007/OpenXML documents mime-types
+ - Add Pocket Word and AportisDoc document types
+ - Fix MS ICO, and Photoshop image to match IANA
+ + Other changes:
+ - Regenerate the pot file when needed
+ - Some clarifications in the spec
+ - Build fix when srcdir != builddir
+- Drop shared-mime-info-msi-no-magic.patch: fixed upstream.
+- Remove perl-XML-Parser BuildRequires.
+
-------------------------------------------------------------------
Wed Oct 15 14:38:52 CEST 2008 - sbrabec@suse.cz
diff --git a/shared-mime-info.spec b/shared-mime-info.spec
index 11d31b4..73cc55a 100644
--- a/shared-mime-info.spec
+++ b/shared-mime-info.spec
@@ -1,7 +1,7 @@
#
-# spec file for package shared-mime-info (Version 0.51)
+# spec file for package shared-mime-info (Version 0.60)
#
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,17 +19,17 @@
Name: shared-mime-info
-BuildRequires: glib2-devel intltool libxml2-devel perl-XML-Parser
-Version: 0.51
-Release: 12
+BuildRequires: glib2-devel
+BuildRequires: intltool
+BuildRequires: libxml2-devel
+Version: 0.60
+Release: 1
Url: http://freedesktop.org/wiki/Software/shared-mime-info
Group: System/X11/Utilities
License: GPL v2 or later
Summary: Shared MIME Database
Source: %{name}-%{version}.tar.bz2
Source1: mime-info-to-mime
-# PATCH-FIX-UPSTREAM shared-mime-info-msi-no-magic.patch bnc#430389 fdo#18072 sbrabec@suse.cz -- Prevent OLE files to be recognized as MSI.
-Patch: shared-mime-info-msi-no-magic.patch
# needed by mime-info-to-mime:
Requires: /bin/rm /bin/mkdir /usr/bin/fgrep
# needed by update-mime-database
@@ -53,7 +53,6 @@ Authors:
%prep
%setup -q
-%patch
%build
%configure
@@ -80,6 +79,43 @@ usr/bin/update-mime-database usr/share/mime >/dev/null
%{_mandir}/man?/*.*
%changelog
+* Sun Feb 22 2009 vuntz@novell.com
+- Update to version 0.60:
+ + Mime-type Changes:
+ - Add alias for SMIL
+ - Fix SMIL detection
+ - Add Annodex mime-type
+ - Only use .ogg for audio Ogg files
+ - Fix RDF mime-type
+ - Oasis mime-type fixes
+ - Make PICTURES match a picture CD but not "pictures"
+ - Add alias for application/zip
+ - Add Microsoft Document Imaging format
+ - Add magic for 7z archives
+ - Add cb7 comic book archives
+ - Add magic for XCF files
+ - Remove application/x-msi magic
+ - Add audio/x-gsm mime-type
+ - Add MS cab mime-type
+ - Add FictionBook mime-type
+ - Fix PKCS#12 bundles definition (not text files)
+ - Add PKCS#7 and PkiPath mime-types
+ - Add application/vnd.ms-wpl mime-type
+ - Add more aliases for media types
+ - Add alias for text/x-csv
+ - Fix comment for Gnucash files
+ - Make Javascript a sub-class of C
+ - Add *.vapi as a glob for Vala files
+ - Fix image/fits to match IANA
+ - Add Office 2007/OpenXML documents mime-types
+ - Add Pocket Word and AportisDoc document types
+ - Fix MS ICO, and Photoshop image to match IANA
+ + Other changes:
+ - Regenerate the pot file when needed
+ - Some clarifications in the spec
+ - Build fix when srcdir != builddir
+- Drop shared-mime-info-msi-no-magic.patch: fixed upstream.
+- Remove perl-XML-Parser BuildRequires.
* Wed Oct 15 2008 sbrabec@suse.cz
- Prevent OLE containers to be recognized as Windows Installer
package (bnc#430389, fdo#18072).
@@ -267,7 +303,7 @@ usr/bin/update-mime-database usr/share/mime >/dev/null
- Updated to CVS version (#72797).
* Mon Feb 21 2005 sbrabec@suse.cz
- Updated to version 0.15.
-* Tue Oct 19 2004 ro@suse.de
+* Mon Oct 18 2004 ro@suse.de
- locale rename: no -> nb
* Mon Sep 20 2004 ro@suse.de
- added missing prereq for update-mime-database