From d223f38ee9cc9894dfab201bee8a6e8f50570b24 Mon Sep 17 00:00:00 2001
From: Kristian Høgsberg <krh@fedoraproject.org>
Date: Jul 05 2006 04:38:48 +0000
Subject: - Update to 0.18 and drop backported patches.


---

diff --git a/.cvsignore b/.cvsignore
index 9d9d6c9..5977b54 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-shared-mime-info-0.16.cvs20060212.tar.gz
-shared-mime-info-0.17.tar.gz
+shared-mime-info-0.18.tar.gz
diff --git a/shared-mime-info.spec b/shared-mime-info.spec
index a41e753..c8a06c6 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.17
-Release: 3
+Version: 0.18
+Release: 1
 License: GPL
 Group: System Environment/Libraries
 URL: http://freedesktop.org/Software/shared-mime-info
@@ -11,9 +11,6 @@ Source1: defaults.list
 Patch0: shared-mime-info-0.16-cisco-vpn.patch
 # https://bugs.freedesktop.org/show_bug.cgi?id=4675 
 Patch1: shared-mime-info-0.16-fonts.patch
-# fixed in upstream cvs
-Patch2: shared-mime-info-0.17-postscript.patch
-Patch3: shared-mime-info-0.17-pdf.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:  libxml2-devel
@@ -34,8 +31,6 @@ and looking up the correct MIME type in a database.
 %setup -q
 %patch0 -p0 -b .cisco-vpn
 %patch1 -p1 -b .fonts
-%patch2 -p1 -b .postscript
-%patch3 -p0 -b .pdf
 %build
 
 %configure --disable-update-mimedb
@@ -68,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man*/*
 
 %changelog
+* Wed Jul  5 2006 Kristian Høgsberg <krh@redhat.com> - 0.18-1
+- Update to 0.18 and drop backported patches.
+
 * Thu Jun 29 2006 Kristian Høgsberg <krh@redhat.com> - 0.17-3
 - Adding PDF fix backported from CVS.
 
diff --git a/sources b/sources
index 53cfc06..f046aab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f1014ad243b5245279c0abe1b95d9e38  shared-mime-info-0.17.tar.gz
+63398294a078dd9f72a7c4e122a668c8  shared-mime-info-0.18.tar.gz