From 43633faa1937ef38f98e1fa594d0452e0489317c Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Mon, 28 Jun 2010 12:08:21 +0000
Subject: [PATCH] - Avoid empty notify-subscribed-event attributes (bug
 #606909, STR #3608).

---
 cups-str3608.patch | 18 ++++++++++++++++++
 cups.spec          | 10 +++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 cups-str3608.patch

diff --git a/cups-str3608.patch b/cups-str3608.patch
new file mode 100644
index 0000000..c770f19
--- /dev/null
+++ b/cups-str3608.patch
@@ -0,0 +1,18 @@
+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 :
diff --git a/cups.spec b/cups.spec
index 78106f9..17f28bb 100644
--- a/cups.spec
+++ b/cups.spec
@@ -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@redhat.com> 1:1.4.4-5
+- Avoid empty notify-subscribed-event attributes (bug #606909,
+  STR #3608).
+
 * Thu Jun 24 2010 Tim Waugh <twaugh@redhat.com> 1:1.4.4-4
 - Use gnutls again but disable threading (bug #607159).