rpms/cups/FC-5 cups-eggcups.patch,1.1,1.2 cups.spec,1.229,1.230
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Nov 6 16:06:41 UTC 2006
Author: twaugh
Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv13861
Modified Files:
cups-eggcups.patch cups.spec
Log Message:
* Mon Nov 6 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.5-1.4
- One more D-Bus signal fix (bug #212763).
cups-eggcups.patch:
Makedefs.in | 1
backend/Makefile | 2 -
backend/ipp.c | 73 ++++++++++++++++++++++++++++++++++++++++++
config-scripts/cups-common.m4 | 5 ++
scheduler/subscriptions.c | 6 +--
5 files changed, 82 insertions(+), 5 deletions(-)
Index: cups-eggcups.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups-eggcups.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cups-eggcups.patch 3 Nov 2006 12:43:56 -0000 1.1
+++ cups-eggcups.patch 6 Nov 2006 16:06:39 -0000 1.2
@@ -28,7 +28,7 @@
dnl New default port definition for IPP...
--- cups-1.2.5/scheduler/subscriptions.c.eggcups 2006-09-29 03:26:29.000000000 +0100
+++ cups-1.2.5/scheduler/subscriptions.c 2006-11-03 09:59:16.000000000 +0000
-@@ -1321,13 +1321,14 @@
+@@ -1321,13 +1321,13 @@
what = "PrinterAdded";
else if (event & CUPSD_EVENT_PRINTER_DELETED)
what = "PrinterRemoved";
@@ -37,16 +37,14 @@
else if (event & CUPSD_EVENT_JOB_CREATED)
what = "JobQueuedLocal";
else if ((event & CUPSD_EVENT_JOB_STATE) && job &&
-- job->state_value == IPP_JOB_PROCESSING)
-+ job->state_value == IPP_JOB_PROCESSING &&
-+ dest && !strncmp (dest->device_uri, "ipp:", 4))
+ job->state_value == IPP_JOB_PROCESSING)
what = "JobStartedLocal";
+ else if (event & (CUPSD_EVENT_PRINTER_CHANGED|CUPSD_EVENT_JOB_STATE_CHANGED))
+ what = "QueueChanged";
else
return;
-@@ -1363,7 +1364,7 @@
+@@ -1363,7 +1363,7 @@
dbus_message_append_iter_init(message, &iter);
if (dest)
dbus_message_iter_append_string(&iter, &(dest->name));
Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -r1.229 -r1.230
--- cups.spec 3 Nov 2006 12:43:56 -0000 1.229
+++ cups.spec 6 Nov 2006 16:06:39 -0000 1.230
@@ -5,7 +5,7 @@
Summary: Common Unix Printing System
Name: cups
Version: 1.2.5
-Release: 1%{?dist}.3
+Release: 1%{?dist}.4
License: GPL
Group: System Environment/Daemons
Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -410,6 +410,9 @@
%{cups_serverbin}/daemon/cups-lpd
%changelog
+* Mon Nov 6 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.5-1.4
+- One more D-Bus signal fix (bug #212763).
+
* Fri Nov 3 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.5-1.3
- Restore missed JobQueuedRemote D-Bus signal in ipp backend (part of
bug #212763).
More information about the fedora-cvs-commits
mailing list