From 81cf952ef1c633f5f13ad1a9b0acc5905d299371 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: May 08 2011 23:32:49 +0000 Subject: Add patch to remove mime types from desktop files. Fixes bug #674321 --- diff --git a/exo-0.6.0-mime-type.patch b/exo-0.6.0-mime-type.patch new file mode 100644 index 0000000..6fdb467 --- /dev/null +++ b/exo-0.6.0-mime-type.patch @@ -0,0 +1,46 @@ +From 2e3744b9f9e64fbed18513027c0d000cbc8d046b Mon Sep 17 00:00:00 2001 +From: Nick Schermer +Date: Sun, 08 May 2011 21:00:07 +0000 +Subject: Remove mime-types from the exo helper desktop files (bug #7257). + +The desktop files are only used to advertise the preferred application +framework in menus and launchers. It should not show up when opening +applications, since the user can choose the native application for +that. +--- +diff --git a/exo-open/exo-file-manager.desktop.in b/exo-open/exo-file-manager.desktop.in +index 8d5fa13..ca4aedf 100644 +--- a/exo-open/exo-file-manager.desktop.in ++++ b/exo-open/exo-file-manager.desktop.in +@@ -7,6 +7,5 @@ StartupNotify=true + Terminal=false + Categories=Utility;X-XFCE;X-Xfce-Toplevel; + OnlyShowIn=XFCE; +-MimeType=x-scheme-handler/file;x-scheme-handler/trash; + _Name=File Manager + _Comment=Browse the file system +diff --git a/exo-open/exo-mail-reader.desktop.in b/exo-open/exo-mail-reader.desktop.in +index be971c6..541de0d 100644 +--- a/exo-open/exo-mail-reader.desktop.in ++++ b/exo-open/exo-mail-reader.desktop.in +@@ -7,6 +7,5 @@ StartupNotify=false + Terminal=false + Categories=Network;X-XFCE;X-Xfce-Toplevel; + OnlyShowIn=XFCE; +-MimeType=x-scheme-handler/mailto; + _Name=Mail Reader + _Comment=Read your email +diff --git a/exo-open/exo-web-browser.desktop.in b/exo-open/exo-web-browser.desktop.in +index c323753..65870e5 100644 +--- a/exo-open/exo-web-browser.desktop.in ++++ b/exo-open/exo-web-browser.desktop.in +@@ -7,7 +7,6 @@ StartupNotify=false + Terminal=false + Categories=Network;X-XFCE;X-Xfce-Toplevel; + OnlyShowIn=XFCE; +-MimeType=x-scheme-handler/http;x-scheme-handler/https; + _Name=Web Browser + _Comment=Browse the web + +-- +cgit diff --git a/exo.spec b/exo.spec index 6768f42..b5d3a9f 100644 --- a/exo.spec +++ b/exo.spec @@ -6,7 +6,7 @@ Name: exo Version: 0.6.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Application library for the Xfce desktop environment Group: System Environment/Libraries @@ -20,6 +20,9 @@ Source1: internet-mail-24.png Source2: internet-mail-48.png # FIXME: upstream this patch Patch0: exo-0.5.4-x86_64-build.patch +# https://bugzilla.xfce.org/show_bug.cgi?id=7257 +# http://git.xfce.org/xfce/exo/commit/?id=2e3744b9f9e64fbed18513027c0d000cbc8d046b +Patch1: exo-0.6.0-mime-type.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dbus-devel >= 0.22 @@ -60,6 +63,7 @@ Python libraries and header files for the exo library. %setup -q %patch0 -p1 -b .x86_64-build +%patch1 -p1 -b .mime-remove %build @@ -154,6 +158,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{python_sitearch}/pyexo.* %changelog +* Sun May 08 2011 Kevin Fenzi - 0.6.0-6 +- Add patch to remove mime types from desktop files. +- Fixes bug #674321 + +- https://bugzilla.xfce.org/show_bug.cgi?id=7257 * Tue Apr 26 2011 Christoph Wickert - 0.6.0-5 - Remove the hal-devel BuildRequires, too