[cups/f12/master] Use better upstream fix for STR #3608 (bug #606909).

[Tim Waugh]

commit 1ccc93fd9b20ab43635004ce025967e0a91c7097
Author: Tim Waugh <twaugh at redhat.com>
Date:   Fri Aug 20 11:38:32 2010 +0100

    Use better upstream fix for STR #3608 (bug #606909).

 cups-str3608.patch |   49 +++++++++++++++++++++++++++++++++++--------------
 cups.spec          |    5 ++++-
 2 files changed, 39 insertions(+), 15 deletions(-)
---
diff --git a/cups-str3608.patch b/cups-str3608.patch
index c770f19..c9b27aa 100644
--- a/cups-str3608.patch
+++ b/cups-str3608.patch
@@ -1,18 +1,39 @@
-diff -up cups-1.4.4/scheduler/subscriptions.c.str3608 cups-1.4.4/scheduler/subscriptions.c
---- cups-1.4.4/scheduler/subscriptions.c.str3608	2010-06-28 12:07:54.611008831 +0100
-+++ cups-1.4.4/scheduler/subscriptions.c	2010-06-28 12:09:25.315887577 +0100
-@@ -551,12 +551,14 @@ cupsdEventName(
-         return ("printer-media-changed");
+diff -up cups-1.4.4/scheduler/ipp.c.str3608 cups-1.4.4/scheduler/ipp.c
+--- cups-1.4.4/scheduler/ipp.c.str3608	2010-08-20 11:36:58.490089326 +0100
++++ cups-1.4.4/scheduler/ipp.c	2010-08-20 11:37:11.965213877 +0100
+@@ -1245,7 +1245,7 @@ add_class(cupsd_client_t  *con,		/* I - 
  
-     case CUPSD_EVENT_PRINTER_ADDED :
-+    case CUPSD_EVENT_PRINTER_ADDED | CUPSD_EVENT_PRINTER_CONFIG:
-         return ("printer-added");
+   if (modify)
+   {
+-    cupsdAddEvent(CUPSD_EVENT_PRINTER_MODIFIED | CUPSD_EVENT_PRINTER_CONFIG,
++    cupsdAddEvent(CUPSD_EVENT_PRINTER_MODIFIED,
+ 		  pclass, NULL, "Class \"%s\" modified by \"%s\".",
+ 		  pclass->name, get_username(con));
  
-     case CUPSD_EVENT_PRINTER_DELETED :
-         return ("printer-deleted");
+@@ -1256,7 +1256,7 @@ add_class(cupsd_client_t  *con,		/* I - 
+   {
+     cupsdAddPrinterHistory(pclass);
  
-     case CUPSD_EVENT_PRINTER_MODIFIED :
-+    case CUPSD_EVENT_PRINTER_MODIFIED | CUPSD_EVENT_PRINTER_CONFIG:
-         return ("printer-modified");
+-    cupsdAddEvent(CUPSD_EVENT_PRINTER_ADDED | CUPSD_EVENT_PRINTER_CONFIG,
++    cupsdAddEvent(CUPSD_EVENT_PRINTER_ADDED,
+ 		  pclass, NULL, "New class \"%s\" added by \"%s\".",
+ 		  pclass->name, get_username(con));
+ 
+@@ -3034,7 +3034,7 @@ add_printer(cupsd_client_t  *con,	/* I -
+ 
+   if (modify)
+   {
+-    cupsdAddEvent(CUPSD_EVENT_PRINTER_MODIFIED | CUPSD_EVENT_PRINTER_CONFIG,
++    cupsdAddEvent(CUPSD_EVENT_PRINTER_MODIFIED,
+                   printer, NULL, "Printer \"%s\" modified by \"%s\".",
+ 		  printer->name, get_username(con));
+ 
+@@ -3045,7 +3045,7 @@ add_printer(cupsd_client_t  *con,	/* I -
+   {
+     cupsdAddPrinterHistory(printer);
+ 
+-    cupsdAddEvent(CUPSD_EVENT_PRINTER_ADDED | CUPSD_EVENT_PRINTER_CONFIG,
++    cupsdAddEvent(CUPSD_EVENT_PRINTER_ADDED,
+                   printer, NULL, "New printer \"%s\" added by \"%s\".",
+ 		  printer->name, get_username(con));
  
-     case CUPSD_EVENT_PRINTER_QUEUE_ORDER_CHANGED :
diff --git a/cups.spec b/cups.spec
index e7a3446..fa5db42 100644
--- a/cups.spec
+++ b/cups.spec
@@ -8,7 +8,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -578,6 +578,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Fri Aug 20 2010 Tim Waugh <twaugh at redhat.com> 1:1.4.4-7
+- Use better upstream fix for STR #3608 (bug #606909).
+
 * Tue Aug  3 2010 Tim Waugh <twaugh at redhat.com> 1:1.4.4-6
 - Specify udevadm trigger action in initscript (bug #623959).
 - Build requires gnutls-devel not openssl-devel.