Hello community,
here is the log from the commit of package python-cups for openSUSE:Factory
checked in at Mon Jun 6 11:52:27 CEST 2011.
--------
--- python-cups/python-cups.changes 2011-05-27 15:39:13.000000000 +0200
+++ /mounts/work_src_done/STABLE/python-cups/python-cups.changes
2011-06-03 14:34:01.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Jun 3 14:33:32 CEST 2011 - vu...@opensuse.org
+
+- Update to version 1.9.56:
+ + Fix build against CUPS < 1.4.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
pycups-1.9.55.tar.bz2
New:
----
pycups-1.9.56.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-cups.spec ++++++
--- /var/tmp/diff_new_pack.gCSgZA/_old 2011-06-06 11:49:35.000000000 +0200
+++ /var/tmp/diff_new_pack.gCSgZA/_new 2011-06-06 11:49:35.000000000 +0200
@@ -21,7 +21,7 @@
Name: python-cups
%define _name pycups
BuildRequires: cups-devel python-devel
-Version: 1.9.55
+Version: 1.9.56
Release: 1
Group: Development/Libraries/Python
License: GPLv2+
++++++ pycups-1.9.55.tar.bz2 -> pycups-1.9.56.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pycups-1.9.55/ChangeLog new/pycups-1.9.56/ChangeLog
--- old/pycups-1.9.55/ChangeLog 2011-03-20 14:42:36.000000000 +0100
+++ new/pycups-1.9.56/ChangeLog 2011-06-02 10:57:43.000000000 +0200
@@ -1,3 +1,20 @@
+2011-06-02 Tim Waugh <twa...@redhat.com>
+
+ * setup.py: Version 1.9.56.
+
+2011-05-24 Tim Waugh <twa...@redhat.com>
+
+ * cupsconnection.c (Connection_getPPD3): Only provide this
+ binding for CUPS >= 1.4.
+
+ * cupsmodule.c (cups_setPasswordCB): Fixed build against
+ CUPS < 1.4.
+
+2011-05-23 Tim Waugh <twa...@redhat.com>
+
+ * cupsmodule.c (do_password_callback): Fixed typo preventing
+ build against CUPS < 1.4.
+
2011-03-20 Tim Waugh <twa...@redhat.com>
* setup.py: Version 1.9.55.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pycups-1.9.55/NEWS new/pycups-1.9.56/NEWS
--- old/pycups-1.9.55/NEWS 2011-02-24 13:04:39.000000000 +0100
+++ new/pycups-1.9.56/NEWS 2011-06-02 10:58:07.000000000 +0200
@@ -1,6 +1,10 @@
NEWS
----
+New in 1.9.56:
+
+* Builds against older versions of CUPS again.
+
New in 1.9.55:
* cups.IPP_QUALITY_DRAFT, cups.IPP_QUALITY_NORMAL,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pycups-1.9.55/cupsconnection.c
new/pycups-1.9.56/cupsconnection.c
--- old/pycups-1.9.55/cupsconnection.c 2011-02-24 14:04:24.000000000 +0100
+++ new/pycups-1.9.56/cupsconnection.c 2011-05-24 12:22:04.000000000 +0200
@@ -3523,6 +3523,7 @@
return ret;
}
+#ifdef HAVE_CUPS_1_4
static PyObject *
Connection_getPPD3 (Connection *self, PyObject *args, PyObject *kwds)
{
@@ -3602,6 +3603,7 @@
status, modtime, fname);
return ret;
}
+#endif /* HAVE_CUPS_1_4 */
static PyObject *
Connection_printTestPage (Connection *self, PyObject *args, PyObject *kwds)
@@ -4246,7 +4248,6 @@
{
int id;
ipp_t *request, *answer;
- ipp_attribute_t *attr;
if (!PyArg_ParseTuple (args, "i", &id))
return NULL;
@@ -4257,8 +4258,8 @@
"printer-uri", NULL, "/");
ippAddString (request, IPP_TAG_OPERATION, IPP_TAG_NAME,
"requesting-user-name", NULL, cupsUser ());
- attr = ippAddInteger (request, IPP_TAG_OPERATION, IPP_TAG_INTEGER,
- "notify-subscription-id", id);
+ ippAddInteger (request, IPP_TAG_OPERATION, IPP_TAG_INTEGER,
+ "notify-subscription-id", id);
Connection_begin_allow_threads (self);
answer = cupsDoRequest (self->http, request, "/");
@@ -4963,6 +4964,7 @@
"@return: temporary PPD file name\n"
"@raise IPPError: IPP problem" },
+#ifdef HAVE_CUPS_1_4
{ "getPPD3",
(PyCFunction) Connection_getPPD3, METH_VARARGS | METH_KEYWORDS,
"getPPD3(name[, modtime, filename]) -> (status,modtime,filename)\n\n"
@@ -4974,6 +4976,7 @@
"@type filename: string\n"
"@param filename: filename of existing file\n"
"@return: tuple of HTTP status, modification time, and filename\n" },
+#endif /* HAVE_CUPS_1_4 */
{ "enablePrinter",
(PyCFunction) Connection_enablePrinter, METH_VARARGS | METH_KEYWORDS,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pycups-1.9.55/cupsmodule.c
new/pycups-1.9.56/cupsmodule.c
--- old/pycups-1.9.55/cupsmodule.c 2011-02-24 13:03:33.000000000 +0100
+++ new/pycups-1.9.56/cupsmodule.c 2011-05-24 12:01:42.000000000 +0200
@@ -152,7 +152,7 @@
debugprintf ("-> do_password_callback\n");
Connection_end_allow_threads (tls->g_current_connection);
args = Py_BuildValue ("(s)", prompt);
- result = PyEval_CallObject (cups_password_callback, args);
+ result = PyEval_CallObject (tls->cups_password_callback, args);
Py_DECREF (args);
if (result == NULL)
{
@@ -220,8 +220,6 @@
return NULL;
}
- wca = malloc (size_a);
-
len_b = 1 + PyUnicode_GetSize (b);
size_b = len_b * sizeof (wchar_t);
if ((size_b / sizeof (wchar_t)) != len_b) {
@@ -231,8 +229,8 @@
return NULL;
}
+ wca = malloc (size_a);
wcb = malloc (size_b);
-
if (wca == NULL || wcb == NULL) {
Py_DECREF (a);
Py_DECREF (b);
@@ -339,8 +337,10 @@
}
debugprintf ("-> cups_setPasswordCB\n");
+#ifdef HAVE_CUPS_1_4
Py_XDECREF (tls->cups_password_callback_context);
tls->cups_password_callback_context = NULL;
+#endif /* HAVE_CUPS_1_4 */
Py_XINCREF (cb);
Py_XDECREF (tls->cups_password_callback);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pycups-1.9.55/cupsppd.c new/pycups-1.9.56/cupsppd.c
--- old/pycups-1.9.55/cupsppd.c 2010-04-26 00:48:20.000000000 +0200
+++ new/pycups-1.9.56/cupsppd.c 2011-05-23 12:25:31.000000000 +0200
@@ -682,7 +682,7 @@
return NULL;
dfd = dup (fd);
- if (!dfd) {
+ if (dfd == -1) {
PyErr_SetFromErrno (PyExc_RuntimeError);
return NULL;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pycups-1.9.55/setup.py new/pycups-1.9.56/setup.py
--- old/pycups-1.9.55/setup.py 2011-03-20 14:42:23.000000000 +0100
+++ new/pycups-1.9.56/setup.py 2011-06-02 10:57:31.000000000 +0200
@@ -1,5 +1,5 @@
from distutils.core import setup, Extension
-VERSION="1.9.55"
+VERSION="1.9.56"
setup (name="pycups",
version=VERSION,
ext_modules=[Extension("cups",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pycups-1.9.55/test.py new/pycups-1.9.56/test.py
--- old/pycups-1.9.55/test.py 2010-12-15 14:47:54.000000000 +0100
+++ new/pycups-1.9.56/test.py 2011-05-24 12:20:34.000000000 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/python
import cups
-# Simple desmontration of cups module
+# Simple demonstration of cups module
def callback (prompt):
print "Password is required for this operation"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
