rpms/shared-mime-info/FC-5 .cvsignore, 1.10, 1.11 shared-mime-info.spec, 1.40, 1.41 sources, 1.10, 1.11

[fedora-cvs-commits redhat com]

Author: krh

Update of /cvs/dist/rpms/shared-mime-info/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv21624

Modified Files:
	.cvsignore shared-mime-info.spec sources 
Log Message:
* Wed Jul  5 2006 Kristian Høgsberg <krh redhat com> - 0.18-1.fc5.1
- Update to 0.18 and drop backported patches.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/shared-mime-info/FC-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	16 Mar 2006 21:11:06 -0000	1.10
+++ .cvsignore	5 Jul 2006 05:02:40 -0000	1.11
@@ -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


Index: shared-mime-info.spec
===================================================================
RCS file: /cvs/dist/rpms/shared-mime-info/FC-5/shared-mime-info.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- shared-mime-info.spec	23 Jun 2006 21:57:53 -0000	1.40
+++ shared-mime-info.spec	5 Jul 2006 05:02:40 -0000	1.41
@@ -1,7 +1,7 @@
 Summary: Shared MIME information database
 Name: shared-mime-info
-Version: 0.17
-Release: 1.fc5.2
+Version: 0.18
+Release: 1.fc5.1
 License: GPL
 Group: System Environment/Libraries
 URL: http://freedesktop.org/Software/shared-mime-info
@@ -10,10 +10,6 @@
 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
-# Bug #190858
-Patch3: shared-mime-info-0.17-pdf.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:  libxml2-devel
 BuildRequires:  glib2-devel
@@ -33,8 +29,6 @@
 %setup -q
 %patch0 -p0 -b .cisco-vpn
 %patch1 -p1 -b .fonts
-%patch2 -p1 -b .postscript
-%patch3 -p0 -b .pdf
 
 %build
 
@@ -68,6 +62,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Wed Jul  5 2006 Kristian Høgsberg <krh redhat com> - 0.18-1.fc5.1
+- Update to 0.18 and drop backported patches.
+
 * Fri Jun 23 2006 Adam Jackson <ajackson redhat com> - 0.17-1.fc5.2
 - Backport upstream change to fix PDFs in mozplugger.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/shared-mime-info/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	16 Mar 2006 21:11:06 -0000	1.10
+++ sources	5 Jul 2006 05:02:40 -0000	1.11
@@ -1 +1 @@
-f1014ad243b5245279c0abe1b95d9e38  shared-mime-info-0.17.tar.gz
+63398294a078dd9f72a7c4e122a668c8  shared-mime-info-0.18.tar.gz