rpms/gnome-mime-data/devel gnome-mime-data-2.2.0-openoffice.patch, 1.1, 1.2 gnome-mime-data-2.2.0-rpminstall.patch, 1.1, 1.2 gnome-mime-data.spec, 1.25, 1.26

[Tom Callaway (spot)]

Author: spot

Update of /cvs/pkgs/rpms/gnome-mime-data/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26960

Modified Files:
	gnome-mime-data-2.2.0-openoffice.patch 
	gnome-mime-data-2.2.0-rpminstall.patch gnome-mime-data.spec 
Log Message:
fix license tag

gnome-mime-data-2.2.0-openoffice.patch:

Index: gnome-mime-data-2.2.0-openoffice.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-mime-data/devel/gnome-mime-data-2.2.0-openoffice.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-mime-data-2.2.0-openoffice.patch	9 Sep 2004 05:29:02 -0000	1.1
+++ gnome-mime-data-2.2.0-openoffice.patch	23 Jul 2008 16:38:16 -0000	1.2
@@ -1,6 +1,7 @@
---- gnome-mime-data-2.2.0/gnome-vfs.keys.in.openoffice	2003-02-04 14:53:53.000000000 -0500
-+++ gnome-mime-data-2.2.0/gnome-vfs.keys.in	2003-02-04 14:54:46.000000000 -0500
-@@ -29,9 +29,9 @@
+diff -up gnome-mime-data-2.18.0/gnome-vfs.keys.in.openoffice gnome-mime-data-2.18.0/gnome-vfs.keys.in
+--- gnome-mime-data-2.18.0/gnome-vfs.keys.in.openoffice	2007-04-03 13:24:30.000000000 -0400
++++ gnome-mime-data-2.18.0/gnome-vfs.keys.in	2008-07-23 12:32:52.000000000 -0400
+@@ -27,9 +27,9 @@ application/mime-type-test
  application/msword
  	_description=Microsoft Word document
  	default_action_type=application
@@ -13,9 +14,9 @@
  	_category=Documents/Word Processor
  	use_category_default=yes
  
-@@ -104,9 +104,9 @@
+@@ -111,9 +111,9 @@ application/qif
  application/rtf
- 	_description=rich text document
+ 	_description=Rich text document
  	default_action_type=application
 -	short_list_application_ids_for_novice_user_level=abiword,openoffice,staroffice,applix
 -	short_list_application_ids_for_intermediate_user_level=abiword,openoffice,staroffice,applix
@@ -26,7 +27,7 @@
  	_category=Documents/Word Processor
  	use_category_default=yes
  
-@@ -124,9 +124,9 @@
+@@ -135,9 +135,9 @@ application/vnd.ms-excel
  	_description=Microsoft Excel spreadsheet
  	icon_filename=i-spreadsheet
  	default_action_type=application

gnome-mime-data-2.2.0-rpminstall.patch:

Index: gnome-mime-data-2.2.0-rpminstall.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-mime-data/devel/gnome-mime-data-2.2.0-rpminstall.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-mime-data-2.2.0-rpminstall.patch	9 Sep 2004 05:29:02 -0000	1.1
+++ gnome-mime-data-2.2.0-rpminstall.patch	23 Jul 2008 16:38:16 -0000	1.2
@@ -13,4 +13,4 @@
 +	short_list_application_ids_for_advanced_user_level=redhat-install-packages
  
  application/x-shar
- 	_description=shell archive
+ 	_description=Shell archive


Index: gnome-mime-data.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-mime-data/devel/gnome-mime-data.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- gnome-mime-data.spec	18 Apr 2007 11:12:50 -0000	1.25
+++ gnome-mime-data.spec	23 Jul 2008 16:38:16 -0000	1.26
@@ -1,10 +1,11 @@
 Summary: MIME type data files for GNOME desktop
 Name: gnome-mime-data
 Version: 2.18.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
-License: GPL
+# No license attribution, just COPYING.
+License: GPL+
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-root
 BuildArch: noarch
@@ -63,6 +64,10 @@
 %{_datadir}/pkgconfig/*
 
 %changelog
+* Wed Jul 23 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.18.0-3
+- fix license tag
+- fix patches to apply with fuzz=0
+
 * Wed Apr 18 2007 - Bastien Nocera <bnocera at redhat.com> - 2.18.0-2
 - Really make noarch