[system-config-printer] Don't start the applet in GNOME at all (bug #677676).

[Tim Waugh]

commit 788b98a449933c2dcbe03980167237f904e9b643
Author: Tim Waugh <twaugh at redhat.com>
Date:   Tue Mar 22 17:01:12 2011 +0000

    Don't start the applet in GNOME at all (bug #677676).

 system-config-printer-no-applet-in-gnome.patch   |   11 +++++++++++
 system-config-printer-no-job-notifications.patch |   11 -----------
 system-config-printer.spec                       |   14 ++++++++++----
 3 files changed, 21 insertions(+), 15 deletions(-)
---
diff --git a/system-config-printer-no-applet-in-gnome.patch b/system-config-printer-no-applet-in-gnome.patch
new file mode 100644
index 0000000..86bc484
--- /dev/null
+++ b/system-config-printer-no-applet-in-gnome.patch
@@ -0,0 +1,11 @@
+diff -up system-config-printer-1.3.2/print-applet.desktop.in.no-applet-in-gnome system-config-printer-1.3.2/print-applet.desktop.in
+--- system-config-printer-1.3.2/print-applet.desktop.in.no-applet-in-gnome	2011-03-22 16:52:27.022333561 +0000
++++ system-config-printer-1.3.2/print-applet.desktop.in	2011-03-22 16:57:39.782439447 +0000
+@@ -6,6 +6,6 @@ Exec=system-config-printer-applet
+ Terminal=false
+ Type=Application
+ Icon=printer
+-NotShowIn=KDE;
++NotShowIn=GNOME;KDE;
+ StartupNotify=false
+ X-GNOME-Autostart-Delay=30
diff --git a/system-config-printer.spec b/system-config-printer.spec
index 03fa954..2bb7473 100644
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@ -5,12 +5,12 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.3.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
 Source0: http://cyberelk.net/tim/data/system-config-printer/1.2/%{name}-%{version}.tar.xz
-Patch1: system-config-printer-no-job-notifications.patch
+Patch1: system-config-printer-no-applet-in-gnome.patch
 BuildRequires: cups-devel >= 1.2
 BuildRequires: desktop-file-utils >= 0.2.92
 BuildRequires: gettext-devel
@@ -68,8 +68,8 @@ printers.
 %prep
 %setup -q
 
-# Don't show job notifications.
-%patch1 -p1 -b .no-job-notifications
+# Don't start the applet in GNOME.
+%patch1 -p1 -b .no-applet-in-gnome
 
 %build
 %configure --with-udev-rules
@@ -179,6 +179,12 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Tue Mar 22 2011 Tim Waugh <twaugh at redhat.com> 1.3.2-2
+- Don't start the applet in GNOME at all (bug #677676), now that GNOME
+  Shell is capable of handling New Printer notifications. (Note that
+  automatic driver installation won't work until GNOME Shell implements
+  that part.)
+
 * Fri Mar 18 2011 Tim Waugh <twaugh at redhat.com> 1.3.2-1
 - 1.3.2:
   - Set connected state when connecting to server fails (bug #685098).