rpms/cups
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Synthesize notify-printer-uri for job-completed events where the job never started processing (bug #784786, STR #4014).

Browse Source
This commit is contained in:
Tim Waugh 2012-02-15 13:19:02 +00:00
parent 1d73f20c6a
commit 3ace51f9ae
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cups-str4014.patch Normal file
View File

@ -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...

7
cups.spec
View File

@ -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 <twaugh@redhat.com> 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 <jpopelka@redhat.com> 1:1.5.2-1