diff --git a/cups-1.3.9-desktop_file.patch b/cups-1.3.9-desktop_file.patch index 6a85a77..d34ac82 100644 --- a/cups-1.3.9-desktop_file.patch +++ b/cups-1.3.9-desktop_file.patch @@ -1,11 +1,14 @@ ---- desktop/cups.desktop.in.orig 2009-10-02 19:15:07.000000000 +0200 -+++ desktop/cups.desktop.in 2010-01-27 15:14:58.000000000 +0100 -@@ -1,6 +1,6 @@ +Index: desktop/cups.desktop.in +=================================================================== +--- desktop/cups.desktop.in.orig ++++ desktop/cups.desktop.in +@@ -1,6 +1,7 @@ [Desktop Entry] -Categories=System;Printing;HardwareSettings;X-Red-Hat-Base; -Exec=@CUPS_HTMLVIEW@ http://localhost:631/ -+Categories=System;Printing;HardwareSettings; ++Categories=System;Printing;Settings;HardwareSettings; +Exec=desktop-launch http://localhost:631/ ++NotShowIn=GNOME; Icon=cups StartupNotify=false Terminal=false diff --git a/cups.changes b/cups.changes index 49dc6be..0a36f8b 100644 --- a/cups.changes +++ b/cups.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Jun 14 14:47:29 CEST 2010 - vuntz@opensuse.org + +- Update cups-1.3.9-desktop_file.patch: add the Settings category + (required since we use HardwareSettigns) and add NotShowIn=GNOME: + in GNOME, the configuration tool we want to use is + system-config-printer. + ------------------------------------------------------------------- Wed Jun 2 15:16:02 CEST 2010 - jsmeix@suse.de diff --git a/cups.spec b/cups.spec index cc9e28f..c9ff91c 100644 --- a/cups.spec +++ b/cups.spec @@ -30,7 +30,7 @@ License: GPLv2+ ; LGPLv2.1+ Group: Hardware/Printing Summary: The Common UNIX Printing System Version: 1.4.3 -Release: 5 +Release: 6 # Require the exact matching version-release of the cups-libs sub-package because # non-matching CUPS libraries may let CUPS software crash (e.g. segfault) # because all CUPS software is built from the one same CUPS source tar ball