From 869a2be5792377651f3cdeb6fe2a50f66f4bbd3a Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Thu, 22 Nov 2007 13:29:02 +0000 Subject: [PATCH] - pycups: Fix job-sheets-default attribute. --- pycups-job-sheets.patch | 21 +++++++++++++++++++++ system-config-printer.spec | 5 +++++ 2 files changed, 26 insertions(+) create mode 100644 pycups-job-sheets.patch diff --git a/pycups-job-sheets.patch b/pycups-job-sheets.patch new file mode 100644 index 0000000..7b72917 --- /dev/null +++ b/pycups-job-sheets.patch @@ -0,0 +1,21 @@ +diff -up pycups-1.9.31/cupsconnection.c.job-sheets pycups-1.9.31/cupsconnection.c +--- pycups-1.9.31/cupsconnection.c.job-sheets 2007-11-22 11:01:19.000000000 +0000 ++++ pycups-1.9.31/cupsconnection.c 2007-11-22 13:27:43.000000000 +0000 +@@ -2042,7 +2042,7 @@ Connection_getPrinterAttributes (Connect + startobj = PyObj_from_UTF8 (start); + endobj = PyObj_from_UTF8 (end); + PyDict_SetItemString (ret, "job-sheets-default", +- Py_BuildValue ("(ss)", startobj, endobj)); ++ Py_BuildValue ("(OO)", startobj, endobj)); + Py_DECREF (startobj); + Py_DECREF (endobj); + continue; +diff -U0 pycups-1.9.31/ChangeLog.job-sheets pycups-1.9.31/ChangeLog +--- pycups-1.9.31/ChangeLog.job-sheets 2007-11-22 11:04:25.000000000 +0000 ++++ pycups-1.9.31/ChangeLog 2007-11-22 13:27:43.000000000 +0000 +@@ -2,0 +3,5 @@ ++ * cupsconnection.c (Connection_getPrinterAttributes): Fixed ++ job-sheets-default tuple. ++ ++2007-11-22 Tim Waugh ++ diff --git a/system-config-printer.spec b/system-config-printer.spec index 5005e4e..5d7c1f4 100644 --- a/system-config-printer.spec +++ b/system-config-printer.spec @@ -11,6 +11,7 @@ Source0: system-config-printer-%{version}.tar.bz2 Source1: pycups-%{pycups_version}.tar.bz2 Source2: system-config-printer.pam Source3: system-config-printer.console +Patch0: pycups-job-sheets.patch BuildRequires: cups-devel >= 1.2 BuildRequires: python-devel >= 2.4 @@ -52,6 +53,9 @@ the configuration tool. %prep %setup -q -a 1 +pushd pycups-%{pycups_version} +%patch0 -p1 -b .job-sheets +popd %build %configure @@ -123,6 +127,7 @@ exit 0 %changelog * Thu Nov 22 2007 Tim Waugh +- pycups: Fix job-sheets-default attribute. - Updated pycups to 1.9.31. * Wed Nov 21 2007 Tim Waugh