rpms/cups
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Applied colorman fix from STR #4232 and STR #4276.

Browse Source
This commit is contained in:
Tim Waugh 2013-02-15 17:16:30 +00:00
parent 9f8c67bb78
commit cc1efc4837
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cups-str4276.patch Normal file
View File

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

10
cups.spec
View File

@ -11,7 +11,7 @@ Summary: Common Unix Printing System
Name: cups Name: cups
Epoch: 1 Epoch: 1
Version: 1.6.1 Version: 1.6.1
Release: 21%{?dist} Release: 22%{?dist}
License: GPLv2 License: GPLv2
Group: System Environment/Daemons Group: System Environment/Daemons
Url: http://www.cups.org/ Url: http://www.cups.org/
@ -40,7 +40,7 @@ Patch9: cups-lpr-help.patch
Patch10: cups-peercred.patch Patch10: cups-peercred.patch
Patch11: cups-pid.patch Patch11: cups-pid.patch
Patch12: cups-eggcups.patch Patch12: cups-eggcups.patch
Patch13: cups-str4276.patch
Patch14: cups-driverd-timeout.patch Patch14: cups-driverd-timeout.patch
Patch15: cups-strict-ppd-line-length.patch Patch15: cups-strict-ppd-line-length.patch
Patch16: cups-logrotate.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 %patch11 -p1 -b .pid
# Fix implementation of com.redhat.PrinterSpooler D-Bus object. # Fix implementation of com.redhat.PrinterSpooler D-Bus object.
%patch12 -p1 -b .eggcups %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). # Increase driverd timeout to 70s to accommodate foomatic (bug #744715).
%patch14 -p1 -b .driverd-timeout %patch14 -p1 -b .driverd-timeout
# Only enforce maximum PPD line length when in strict mode. # 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 %{_mandir}/man5/ipptoolfile.5.gz
%changelog %changelog
* Fri Feb 15 2013 Tim Waugh <twaugh@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@lists.fedoraproject.org> - 1:1.6.1-21 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.6.1-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild