rpms/system-config-printer/F-7 pycups-job-sheets.patch, NONE, 1.1 system-config-printer.spec, 1.116, 1.117

[Tim Waugh (twaugh)]

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27665

Modified Files:
	system-config-printer.spec 
Added Files:
	pycups-job-sheets.patch 
Log Message:
* Thu Nov 22 2007 Tim Waugh <twaugh at redhat.com>
- pycups: Fix job-sheets-default attribute.


pycups-job-sheets.patch:

--- NEW FILE pycups-job-sheets.patch ---
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  <twaugh at redhat.com>
+


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-7/system-config-printer.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- system-config-printer.spec	22 Nov 2007 11:33:16 -0000	1.116
+++ system-config-printer.spec	22 Nov 2007 13:34:59 -0000	1.117
@@ -11,7 +11,7 @@
 Source1: pycups-%{pycups_version}.tar.bz2
 Source2: system-config-printer.pam
 Source3: system-config-printer.console
-Patch0: pycups-uninit.patch
+Patch0: pycups-job-sheets.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -55,7 +55,7 @@
 %prep
 %setup -q -a 1
 pushd pycups-%{pycups_version}
-%patch0 -p1 -b .uninit
+%patch0 -p1 -b .job-sheets
 popd
 
 %build
@@ -140,6 +140,7 @@
 
 %changelog
 * Thu Nov 22 2007 Tim Waugh <twaugh at redhat.com>
+- pycups: Fix job-sheets-default attribute.
 - Updated pycups to 1.9.31.
 
 * Wed Nov 21 2007 Tim Waugh <twaugh at redhat.com> 0.7.74.6-2