[cups] Applied colorman fix from STR #4232 and STR #4276.
Tim Waugh
twaugh at fedoraproject.org
Fri Feb 15 17:16:40 UTC 2013
commit cc1efc4837b1db8e9ffef05f27fe9f72435c3e8c
Author: Tim Waugh <twaugh at redhat.com>
Date: Fri Feb 15 17:16:30 2013 +0000
Applied colorman fix from STR #4232 and STR #4276.
cups-str4276.patch | 12 ++++++++++++
cups.spec | 10 +++++++---
2 files changed, 19 insertions(+), 3 deletions(-)
---
diff --git a/cups-str4276.patch b/cups-str4276.patch
new file mode 100644
index 0000000..24fbd99
--- /dev/null
+++ b/cups-str4276.patch
@@ -0,0 +1,12 @@
+diff -up cups-1.6.1/scheduler/colorman.c.str4276 cups-1.6.1/scheduler/colorman.c
+--- cups-1.6.1/scheduler/colorman.c.str4276 2013-02-15 17:09:23.053544061 +0000
++++ cups-1.6.1/scheduler/colorman.c 2013-02-15 17:10:07.972783360 +0000
+@@ -1128,7 +1128,7 @@ colord_delete_device(
+ message = COLORD_DBUS_MSG(COLORD_DBUS_PATH, "DeleteDevice");
+
+ dbus_message_iter_init_append(message, &args);
+- dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &device_id);
++ dbus_message_iter_append_basic(&args, DBUS_TYPE_OBJECT_PATH, &device_path);
+
+ /*
+ * Send the DeleteDevice request synchronously...
diff --git a/cups.spec b/cups.spec
index 46e118c..d49e2f9 100644
--- a/cups.spec
+++ b/cups.spec
@@ -11,7 +11,7 @@ Summary: Common Unix Printing System
Name: cups
Epoch: 1
Version: 1.6.1
-Release: 21%{?dist}
+Release: 22%{?dist}
License: GPLv2
Group: System Environment/Daemons
Url: http://www.cups.org/
@@ -40,7 +40,7 @@ Patch9: cups-lpr-help.patch
Patch10: cups-peercred.patch
Patch11: cups-pid.patch
Patch12: cups-eggcups.patch
-
+Patch13: cups-str4276.patch
Patch14: cups-driverd-timeout.patch
Patch15: cups-strict-ppd-line-length.patch
Patch16: cups-logrotate.patch
@@ -198,7 +198,8 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
%patch11 -p1 -b .pid
# Fix implementation of com.redhat.PrinterSpooler D-Bus object.
%patch12 -p1 -b .eggcups
-
+# Applied colorman fix from STR #4232 and STR #4276.
+%patch13 -p1 -b .str4276
# Increase driverd timeout to 70s to accommodate foomatic (bug #744715).
%patch14 -p1 -b .driverd-timeout
# Only enforce maximum PPD line length when in strict mode.
@@ -623,6 +624,9 @@ rm -f %{cups_serverbin}/backend/smb
%{_mandir}/man5/ipptoolfile.5.gz
%changelog
+* Fri Feb 15 2013 Tim Waugh <twaugh at redhat.com> 1:1.6.1-22
+- Applied colorman fix from STR #4232 and STR #4276.
+
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.6.1-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list