rpms/cups/F-12 cups-str3608.patch,NONE,1.1 cups.spec,1.593,1.594

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv4628

Modified Files:
	cups.spec 
Added Files:
	cups-str3608.patch 
Log Message:
* Mon Jun 28 2010 Tim Waugh <twaugh at redhat.com> 1:1.4.4-5
- Avoid empty notify-subscribed-event attributes (bug #606909,
  STR #3608).


cups-str3608.patch:
 subscriptions.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE cups-str3608.patch ---
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");
 
     case CUPSD_EVENT_PRINTER_ADDED :
+    case CUPSD_EVENT_PRINTER_ADDED | CUPSD_EVENT_PRINTER_CONFIG:
         return ("printer-added");
 
     case CUPSD_EVENT_PRINTER_DELETED :
         return ("printer-deleted");
 
     case CUPSD_EVENT_PRINTER_MODIFIED :
+    case CUPSD_EVENT_PRINTER_MODIFIED | CUPSD_EVENT_PRINTER_CONFIG:
         return ("printer-modified");
 
     case CUPSD_EVENT_PRINTER_QUEUE_ORDER_CHANGED :


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups.spec,v
retrieving revision 1.593
retrieving revision 1.594
diff -u -p -r1.593 -r1.594
--- cups.spec	24 Jun 2010 12:07:41 -0000	1.593
+++ cups.spec	28 Jun 2010 12:08:21 -0000	1.594
@@ -8,7 +8,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -67,6 +67,7 @@ Patch34: cups-hp-deviceid-oid.patch
 Patch35: cups-dnssd-deviceid.patch
 Patch36: cups-ricoh-deviceid-oid.patch
 Patch37: cups-texttops-rotate-page.patch
+Patch38: cups-str3608.patch
 
 Patch100: cups-lspp.patch
 
@@ -271,6 +272,9 @@ module. 
 # This fixes page-label orientation when texttops is used in the
 # filter chain (bug #572338).
 %patch37 -p1 -b .texttops-rotate-page
+# Avoid empty notify-subscribed-event attributes (bug #606909, STR
+# #3608).
+%patch38 -p1 -b .str3608
 
 %if %lspp
 # LSPP support.
@@ -574,6 +578,10 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Mon Jun 28 2010 Tim Waugh <twaugh at redhat.com> 1:1.4.4-5
+- Avoid empty notify-subscribed-event attributes (bug #606909,
+  STR #3608).
+
 * Thu Jun 24 2010 Tim Waugh <twaugh at redhat.com> 1:1.4.4-4
 - Use gnutls again but disable threading (bug #607159).