diff --git a/pycups-request-readio.patch b/pycups-request-readio.patch new file mode 100644 index 0000000..1eb3459 --- /dev/null +++ b/pycups-request-readio.patch @@ -0,0 +1,21 @@ +diff -U0 pycups-1.9.47/ChangeLog.request-readio pycups-1.9.47/ChangeLog +diff -up pycups-1.9.47/cupsipp.c.request-readio pycups-1.9.47/cupsipp.c +--- pycups-1.9.47/cupsipp.c.request-readio 2009-08-18 11:56:03.000000000 +0100 ++++ pycups-1.9.47/cupsipp.c 2010-01-06 15:54:37.978283521 +0000 +@@ -1,6 +1,6 @@ + /* + * cups - Python bindings for CUPS +- * Copyright (C) 2002, 2005, 2006, 2007, 2008, 2009 Red Hat, Inc. ++ * Copyright (C) 2002, 2005, 2006, 2007, 2008, 2009, 2010 Red Hat, Inc. + * Author: Tim Waugh + * + * This program is free software; you can redistribute it and/or modify +@@ -421,7 +421,7 @@ IPPRequest_getAttributes (IPPRequest *se + if (!value) { + Py_DECREF (values); + values = NULL; +- break; ++ continue; + } + + debugprintf ("\n"); diff --git a/system-config-printer.spec b/system-config-printer.spec index 2d303fd..0052269 100644 --- a/system-config-printer.spec +++ b/system-config-printer.spec @@ -25,6 +25,8 @@ Patch7: system-config-printer-notification-timeouts.patch Patch8: system-config-printer-select-nonexistent-printer.patch Patch9: system-config-printer-ink-levels.patch +Patch101: pycups-request-readio.patch + BuildRequires: cups-devel >= 1.2 BuildRequires: python-devel >= 2.4 BuildRequires: libsmbclient-devel >= 3.2 @@ -93,6 +95,10 @@ printers. %patch8 -p1 -b .select-nonexistent-printer %patch9 -p1 -b .ink-levels +pushd pycups-%{pycups_version} +%patch101 -p1 -b .request-readio +popd + %build %configure --with-udev-rules --with-polkit-1 @@ -209,6 +215,7 @@ exit 0 %changelog * Wed Jan 6 2010 Tim Waugh - 1.1.16-3 +- Fixed pycups IPPRequest attribute handling bug. - Make sure there are enough ink level values (bug #541882). - Make sure the printer we added still exists before selecting it (bug #551436).