rpms/shared-mime-info/F-11 defaults.list, 1.28, 1.29 shared-mime-info.spec, 1.79, 1.80

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/shared-mime-info/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31997

Modified Files:
	defaults.list shared-mime-info.spec 
Log Message:
* Thu Oct 08 2009 Bastien Nocera <bnocera at redhat.com> 0.60-4
- Fix OO.o desktop files defaults (#508559)
- Same for Brasero, abiword, gthumb and gnumeric



Index: defaults.list
===================================================================
RCS file: /cvs/pkgs/rpms/shared-mime-info/F-11/defaults.list,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- defaults.list	4 Mar 2009 12:35:12 -0000	1.28
+++ defaults.list	8 Oct 2009 16:10:32 -0000	1.29
@@ -42,48 +42,48 @@ image/x-xbitmap=gnome-eog.desktop;gthumb
 image/x-xpixmap=gnome-eog.desktop;gthumb.desktop;
 image/x-xwindowdump=gnome-eog.desktop;gthumb.desktop;
 image/svg+xml=gnome-eog.desktop;gthumb.desktop;
-application/vnd.ms-word=openoffice.org-1.9-writer.desktop
-application/vnd.wordperfect=openoffice.org-1.9-writer.desktop
-application/vnd.sun.xml.writer=openoffice.org-1.9-writer.desktop
-application/vnd.sun.xml.writer.global=openoffice.org-1.9-writer.desktop
-application/vnd.stardivision.writer=openoffice.org-1.9-writer.desktop
-application/vnd.oasis.opendocument.text=openoffice.org-1.9-writer.desktop
-application/vnd.oasis.opendocument.text-template=openoffice.org-1.9-writer.desktop
-application/vnd.oasis.opendocument.text-web=openoffice.org-1.9-writer.desktop
-application/vnd.oasis.opendocument.text-master=openoffice.org-1.9-writer.desktop
-application/vnd.ms-excel=openoffice.org-1.9-calc.desktop
-application/vnd.stardivision.calc=openoffice.org-1.9-calc.desktop
-application/vnd.sun.xml.calc=openoffice.org-1.9-calc.desktop
-application/vnd.sun.xml.calc.template=openoffice.org-1.9-calc.desktop
-application/vnd.oasis.opendocument.spreadsheet=openoffice.org-1.9-calc.desktop
-application/vnd.oasis.opendocument.spreadsheet-template=openoffice.org-1.9-calc.desktop
-application/vnd.ms-powerpoint=openoffice.org-1.9-impress.desktop
-application/vnd.stardivision.impress=openoffice.org-1.9-impress.desktop
-application/vnd.sun.xml.impress=openoffice.org-1.9-impress.desktop
-application/vnd.sun.xml.impress.template=openoffice.org-1.9-impress.desktop
-application/vnd.oasis.opendocument.presentation=openoffice.org-1.9-impress.desktop
-application/vnd.oasis.opendocument.presentation-template=openoffice.org-1.9-impress.desktop
-application/vnd.stardivision.draw=openoffice.org-1.9-draw.desktop
-application/vnd.sun.xml.draw=openoffice.org-1.9-draw.desktop
-application/vnd.sun.xml.draw.template=openoffice.org-1.9-draw.desktop
+application/vnd.ms-word=openoffice.org-writer.desktop
+application/vnd.wordperfect=openoffice.org-writer.desktop
+application/vnd.sun.xml.writer=openoffice.org-writer.desktop
+application/vnd.sun.xml.writer.global=openoffice.org-writer.desktop
+application/vnd.stardivision.writer=openoffice.org-writer.desktop
+application/vnd.oasis.opendocument.text=openoffice.org-writer.desktop
+application/vnd.oasis.opendocument.text-template=openoffice.org-writer.desktop
+application/vnd.oasis.opendocument.text-web=openoffice.org-writer.desktop
+application/vnd.oasis.opendocument.text-master=openoffice.org-writer.desktop
+application/vnd.ms-excel=openoffice.org-calc.desktop
+application/vnd.stardivision.calc=openoffice.org-calc.desktop
+application/vnd.sun.xml.calc=openoffice.org-calc.desktop
+application/vnd.sun.xml.calc.template=openoffice.org-calc.desktop
+application/vnd.oasis.opendocument.spreadsheet=openoffice.org-calc.desktop
+application/vnd.oasis.opendocument.spreadsheet-template=openoffice.org-calc.desktop
+application/vnd.ms-powerpoint=openoffice.org-impress.desktop
+application/vnd.stardivision.impress=openoffice.org-impress.desktop
+application/vnd.sun.xml.impress=openoffice.org-impress.desktop
+application/vnd.sun.xml.impress.template=openoffice.org-impress.desktop
+application/vnd.oasis.opendocument.presentation=openoffice.org-impress.desktop
+application/vnd.oasis.opendocument.presentation-template=openoffice.org-impress.desktop
+application/vnd.stardivision.draw=openoffice.org-draw.desktop
+application/vnd.sun.xml.draw=openoffice.org-draw.desktop
+application/vnd.sun.xml.draw.template=openoffice.org-draw.desktop
 application/pdf=evince.desktop
 application/postscript=evince.desktop
 application/x-qw=gnome-gnucash.desktop
 application/x-gnucash=gnome-gnucash.desktop
-application/vnd.lotus-1-2-3=gnome-gnumeric.desktop
-application/x-oleo=gnome-gnumeric.desktop
-application/x-gnumeric=gnome-gnumeric.desktop
-application/x-xbase=gnome-gnumeric.desktop
-application/x-abiword=gnome-abiword.desktop
+application/vnd.lotus-1-2-3=fedora-gnumeric.desktop
+application/x-oleo=fedora-gnumeric.desktop
+application/x-gnumeric=fedora-gnumeric.desktop
+application/x-xbase=fedora-gnumeric.desktop
+application/x-abiword=fedora-abiword.desktop
 application/x-dvi=evince.desktop
 application/x-rpm=gpk-install-file.desktop
 text/plain=gedit.desktop
 text/html=mozilla-firefox.desktop
 inode/directory=gnome-nautilus-folder-handler.desktop
-x-content/blank-cd=brasero-ncb.desktop
-x-content/blank-dvd=brasero-ncb.desktop
-x-content/blank-bd=brasero-ncb.desktop
-x-content/blank-hddvd=brasero-ncb.desktop
+x-content/blank-cd=brasero-nautilus.desktop
+x-content/blank-dvd=brasero-nautilus.desktop
+x-content/blank-bd=brasero-nautilus.desktop
+x-content/blank-hddvd=brasero-nautilus.desktop
 x-content/video-dvd=totem.desktop
 x-content/video-vcd=totem.desktop
 x-content/video-svcd=totem.desktop
@@ -92,5 +92,5 @@ x-content/video-svcd=totem.desktop
 x-content/audio-cdda=rhythmbox.desktop
 x-content/audio-dvd=rhythmbox.desktop
 x-content/audio-player=rhythmbox.desktop
-x-content/image-dcf=gthumb-importer.desktop
-x-content/image-picturecd=gthumb-importer.desktop
+x-content/image-dcf=gthumb-import.desktop
+x-content/image-picturecd=gthumb-import.desktop


Index: shared-mime-info.spec
===================================================================
RCS file: /cvs/pkgs/rpms/shared-mime-info/F-11/shared-mime-info.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- shared-mime-info.spec	4 Mar 2009 12:30:24 -0000	1.79
+++ shared-mime-info.spec	8 Oct 2009 16:10:32 -0000	1.80
@@ -1,7 +1,7 @@
 Summary: Shared MIME information database
 Name: shared-mime-info
 Version: 0.60
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://freedesktop.org/Software/shared-mime-info
@@ -65,6 +65,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man*/*
 
 %changelog
+* Thu Oct 08 2009 Bastien Nocera <bnocera at redhat.com> 0.60-4
+- Fix OO.o desktop files defaults (#508559)
+- Same for Brasero, abiword, gthumb and gnumeric
+
 * Wed Mar 04 2009 - Bastien Nocera <bnocera at redhat.com> - 0.60-3
 - Remove Totem as handling Blu-ray and HD-DVD
 - Use brasero-ncb.desktop instead of nautilus-cd-burner for blank devices