diff --git a/xsane-0.998-desktop-file.patch b/xsane-0.998-desktop-file.patch new file mode 100644 index 0000000..f148fcb --- /dev/null +++ b/xsane-0.998-desktop-file.patch @@ -0,0 +1,40 @@ +From 1834f4a87438153c1e8ca8c175719f22585af497 Mon Sep 17 00:00:00 2001 +From: Nils Philippsen +Date: Fri, 19 Nov 2010 12:42:18 +0100 +Subject: [PATCH] patch: desktop-file + +Squashed commit of the following: + +commit c59edca6b96613f59cd4c08350b64a46b5992ddc +Author: Nils Philippsen +Date: Fri Nov 19 12:41:23 2010 +0100 + + customize desktop file +--- + src/xsane.desktop | 9 +++++++-- + 1 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/src/xsane.desktop b/src/xsane.desktop +index d5161e5..efb2011 100644 +--- a/src/xsane.desktop ++++ b/src/xsane.desktop +@@ -1,9 +1,14 @@ + [Desktop Entry] ++Version=1.0 + Encoding=UTF-8 +-Name=XSane - Scanning ++#Name=XSane - Scanning ++Name=Scanner Tool ++GenericName=Scanner Tool + Comment=Acquire images from a scanner + Exec=xsane ++TryExec=xsane + Icon=xsane + Terminal=false + Type=Application +-Categories=Application;Graphics ++Categories=Graphics;2DGraphics;RasterGraphics;Scanning;GTK; ++StartupNotify=true +-- +1.7.3.2 + diff --git a/xsane.spec b/xsane.spec index 048330e..4aec2a9 100644 --- a/xsane.spec +++ b/xsane.spec @@ -16,7 +16,6 @@ Summary: X Window System front-end for the SANE scanner interface Version: 0.998 Release: 1%{?dist} Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz -Source1: xsane.desktop # distro-specific: use "xdg-open" instead of "netscape" to launch help browser Patch0: xsane-0.995-xdg-open.patch # submitted to upstream (Oliver Rauch) via email, 2009-08-18 @@ -33,6 +32,8 @@ Patch4: xsane-0.997-no-file-selected.patch # https://bugzilla.redhat.com/show_bug.cgi?id=198422 # submitted to upstream (Oliver Rauch) via email, 2010-06-29 Patch5: xsane-0.997-ipv6.patch +# distro-specific: customize desktop file +Patch6: xsane-0.998-desktop-file.patch # autoconf-generated files Patch100: xsane-0.998-1-autoconf.patch.bz2 License: GPLv2+ @@ -89,6 +90,7 @@ done %patch3 -p1 -b .off-root-build %patch4 -p1 -b .no-file-selected %patch5 -p1 -b .ipv6 +%patch6 -p1 -b .desktop-file %patch100 -p1 -b .autoconf @@ -123,11 +125,11 @@ popd install -m 0755 -d %{buildroot}%{gimpplugindir} install -m 0755 build-with-gimp/src/xsane %{buildroot}%{gimpplugindir} -# use our own desktop file +# install customized desktop file rm %{buildroot}%{_datadir}/applications/xsane.desktop desktop-file-install --vendor fedora \ --dir %{buildroot}%{_datadir}/applications \ - %{SOURCE1} + src/xsane.desktop %find_lang %{name} XSANE.lang @@ -161,6 +163,7 @@ fi %changelog * Fri Nov 19 2010 Nils Philippsen - 0.998-1 - version 0.998 +- patch desktop file instead of copying it over * Tue Jul 13 2010 Nils Philippsen - 0.997-10 - don't crash if no files are selected, take two