From 3ace51f9aebad459d3d6df122b09006b6817a202 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Feb 15 2012 13:19:20 +0000 Subject: Synthesize notify-printer-uri for job-completed events where the job never started processing (bug #784786, STR #4014). --- diff --git a/cups-str4014.patch b/cups-str4014.patch new file mode 100644 index 0000000..6e50c25 --- /dev/null +++ b/cups-str4014.patch @@ -0,0 +1,16 @@ +diff -up cups-1.5.2/scheduler/subscriptions.c.str4014 cups-1.5.2/scheduler/subscriptions.c +--- cups-1.5.2/scheduler/subscriptions.c.str4014 2012-02-15 13:17:24.065004731 +0000 ++++ cups-1.5.2/scheduler/subscriptions.c 2012-02-15 13:17:34.021009331 +0000 +@@ -146,7 +146,11 @@ cupsdAddEvent( + temp->time = time(NULL); + temp->attrs = ippNew(); + temp->job = job; +- temp->dest = dest; ++ ++ if (dest) ++ temp->dest = dest; ++ else if (job) ++ temp->dest = dest = cupsdFindPrinter(job->dest); + + /* + * Add common event notification attributes... diff --git a/cups.spec b/cups.spec index 477f3f5..8c2f001 100644 --- a/cups.spec +++ b/cups.spec @@ -76,6 +76,7 @@ Patch34: cups-avahi-5-services.patch Patch35: cups-icc.patch Patch36: cups-systemd-socket.patch +Patch37: cups-str4014.patch Patch100: cups-lspp.patch @@ -295,6 +296,10 @@ Sends IPP requests to the specified URI and tests and/or displays the results. # Poettering). %patch36 -p1 -b .systemd-socket +# Synthesize notify-printer-uri for job-completed events where the job +# never started processing (bug #784786, STR #4014). +%patch37 -p1 -b .str4014 + %if %lspp # LSPP support. %patch100 -p1 -b .lspp @@ -655,6 +660,8 @@ rm -rf $RPM_BUILD_ROOT %changelog * Wed Feb 15 2012 Tim Waugh 1:1.5.2-2 +- Synthesize notify-printer-uri for job-completed events where the job + never started processing (bug #784786, STR #4014). - Removed banners from LSPP patch on Dan Walsh's advice. * Mon Feb 06 2012 Jiri Popelka 1:1.5.2-1