From b5a22eaa91dee9cf00578de4eb9ff023e8564286 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 22 May 2012 11:11:48 -0500 Subject: [PATCH] 1.0-4 - defaults.list: s/mozilla-firefox/firefox/ (see #736558) - defaults.list: s/gpk-install-file/gpk-install-local-file/ - defaults.list: application/x-catalog=gpk-install-catalog.desktop (#770019) --- defaults.list | 11 ++++++----- shared-mime-info.spec | 15 ++++++++++----- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/defaults.list b/defaults.list index abe504a..3d0d692 100644 --- a/defaults.list +++ b/defaults.list @@ -69,10 +69,11 @@ 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 +application/x-catalog=gpk-install-catalog.desktop +application/x-rpm=gpk-install-local-file.desktop text/plain=gedit.desktop -text/html=mozilla-firefox.desktop -application/xhtml+xml=mozilla-firefox.desktop +text/html=firefox.desktop +application/xhtml+xml=firefox.desktop inode/directory=nautilus.desktop x-content/blank-cd=brasero-nautilus.desktop x-content/blank-dvd=brasero-nautilus.desktop @@ -90,5 +91,5 @@ x-content/image-dcf=shotwell.desktop x-content/image-picturecd=shotwell.desktop # URI scheme handlers x-scheme-handler/mailto=evolution.desktop -x-scheme-handler/http=mozilla-firefox.desktop -x-scheme-handler/https=mozilla-firefox.desktop +x-scheme-handler/http=firefox.desktop +x-scheme-handler/https=firefox.desktop diff --git a/shared-mime-info.spec b/shared-mime-info.spec index 90ec279..9c002bb 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: 1.0 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://freedesktop.org/Software/shared-mime-info @@ -66,10 +66,9 @@ cat %SOURCE4 >> $RPM_BUILD_ROOT/%{_datadir}/applications/defaults.list ## translations are already in the xml file installed rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/* -%if 0%{?fedora} > 16 +%if 0%{?fedora} < 17 # f17+ mozilla-firefox.desktop renamed to firefox.desktop (#736558) -sed -i -e 's|mozilla-firefox.desktop|firefox.desktop|'\ - $RPM_BUILD_ROOT%{_datadir}/applications/defaults.list +# defaults.list fixed, handle this exceptional case separately, if at all %endif @@ -87,13 +86,19 @@ sed -i -e 's|mozilla-firefox.desktop|firefox.desktop|'\ %{_mandir}/man*/* %changelog +* Tue May 22 2012 Rex Dieter +- 1.0-4 +- defaults.list: s/mozilla-firefox/firefox/ (see #736558) +- defaults.list: s/gpk-install-file/gpk-install-local-file/ +- defaults.list: application/x-catalog=gpk-install-catalog.desktop (#770019) + * Fri May 11 2012 Bastien Nocera 1.0-3 - Use gnome-disk-image-mounter from gnome-disk-utility to handle CD images by default (#820403) * Wed Mar 7 2012 Matthias Clasen - 1.0-2 - Own/%%ghost files generated by update-mime-database from - freedesktop.org.xml (patch by Ville Skyttä) + freedesktop.org.xml (patch by Ville Skyttä, #716451)) * Tue Jan 17 2012 Bastien Nocera 1.0-1 - Update to 1.0