1.9.70.

.gitignore

@@ -13,3 +13,4 @@
 /pycups-1.9.67.tar.bz2
 /pycups-1.9.68.tar.bz2
 /pycups-1.9.69.tar.bz2
+/pycups-1.9.70.tar.bz2

pycups-1.9.69.tar.bz2.asc

@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQEVAwUAVIB81XlVEo2joavTAQKhmQgAhjYdmljDNq4hJM+2Ps/z5hm+fo6cCbbr
-Aw0kYWo6+GexS7U+8Qx3RMvq1IoM3OgUi57srTCiYB64NxayK2gEAWL8Se1HK4wr
-p89ev6APJYz7+UnaaFMBCdj1i00+C/Iqy9rW6lqPBaZNrGSZjPUk/khAd6kgHZTq
-gMZV0SQcN9+8w6xAa043FarbW0aw2QVuK/PJ6KHwcGi8/pRFWtoXdVKrdMzK8S7j
-Eac4/Y9JF7/JY+YXv5eWkyzjMUm6+4bAjsKo9kMvHzG3rfA2R/SbpUaTCFYsFW/F
-nzC9cQciXO0agSrIC3XGyYS5shpdohKJtY1nAWWFlkR5kwug+ZcoIw==
-=uGkc
------END PGP SIGNATURE-----

pycups-1.9.70.tar.bz2.asc

@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQEVAwUAVJl3RnlVEo2joavTAQJcpAf8DLx8XsWAauKnQwiboeHG6pJca/lql/f6
+mRuDyog9XsqaTvXTgllTXVFqZrJqfviCwSuE8M7FgB/QiTs8Sx9JOJcKHybUFMhT
+3CKKos7lFTngzM+SpOrnfCyd61fV51FEDSv4La/Exx/dyfxKzFLU6gXCKjgpGzs7
+YDccZbQ23EHw9BoB4vm2eUTXD4Kdm2Wmt5Wwocwe6EQ2JIpl1aDNbTOwBMjFIt5Z
+xB4/GSeVkbhcnN57Q46lA4PYnsGy5JLj2NmMxSL/wF+W0/KQtMK1NQ7eriyKqzey
+MNTh4mDX3GJgoyH8mqDZMtehg8wZSEsVzYmzwCisE8JpWSkQGhzvew==
+=sXka
+-----END PGP SIGNATURE-----

python-cups-pw-callback.patch

@@ -1,35 +0,0 @@
-diff -up pycups-1.9.69/cupsconnection.c.pw-callback pycups-1.9.69/cupsconnection.c
---- pycups-1.9.69/cupsconnection.c.pw-callback	2014-06-20 15:13:07.000000000 +0100
-+++ pycups-1.9.69/cupsconnection.c	2014-12-13 00:05:00.559619993 +0000
-@@ -1,6 +1,6 @@
- /*
-  * cups - Python bindings for CUPS
-- * Copyright (C) 2002, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2013  Red Hat, Inc
-+ * Copyright (C) 2002, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2013, 2014  Red Hat, Inc
-  * Author: Tim Waugh <twaugh@redhat.com>
-  *
-  * This program is free software; you can redistribute it and/or modify
-@@ -362,7 +362,6 @@ password_callback (int newstyle,
-   Connection *self = NULL;
-   PyObject *args;
-   PyObject *result;
--  const char *pwval;
-   int i;
- 
-   debugprintf ("-> password_callback for http=%p, newstyle=%d\n",
-@@ -403,13 +402,9 @@ password_callback (int newstyle,
-   }
- 
-   free (self->cb_password);
--  if (result == Py_None)
-+  if (result == Py_None ||
-+      !UTF8_from_PyObj (&self->cb_password, result))
-     self->cb_password = NULL;
--  else
--  {
--    pwval = PyBytes_AsString (result);
--    self->cb_password = strdup (pwval);
--  }
- 
-   Py_DECREF (result);
-   if (!self->cb_password || !*self->cb_password)

python-cups.spec

@@ -5,11 +5,10 @@
 
 Summary:       Python bindings for CUPS
 Name:          python-cups
-Version:       1.9.69
-Release:       2%{?dist}
+Version:       1.9.70
+Release:       1%{?dist}
 URL:           http://cyberelk.net/tim/software/pycups/
 Source:        http://cyberelk.net/tim/data/pycups/pycups-%{version}.tar.bz2
-Patch1:        python-cups-pw-callback.patch
 License:       GPLv2+
 Group:         Development/Languages
 BuildRequires: cups-devel
@@ -41,7 +40,6 @@ Documentation for python-cups.
 
 %prep
 %setup -q -n pycups-%{version}
-%patch1 -p1 -b .pw-callback
 
 rm -rf %{py3dir}
 cp -a . %{py3dir}
@@ -83,6 +81,9 @@ popd
 %doc examples html
 
 %changelog
+* Tue Dec 23 2014 Tim Waugh <twaugh@redhat.com> - 1.9.70-1
+- 1.9.70.
+
 * Sat Dec 13 2014 Tim Waugh <twaugh@redhat.com> - 1.9.69-2
 - Fixed password_callback so it obtains UTF-8 password correctly
   (bug #1155469).

sources

@@ -1 +1 @@
-51f70a94b56c01dbf1085fa819e3e1d8  pycups-1.9.69.tar.bz2
+4c448743260b6cac6f56ae18f6b0adb7  pycups-1.9.70.tar.bz2