Latest upstream release.

This commit is contained in:
Tim Waugh 2015-02-10 12:58:11 +00:00
parent 26d6a23fe9
commit 96e49fae13
6 changed files with 18 additions and 63 deletions

1
.gitignore vendored
View File

@ -14,3 +14,4 @@
/pycups-1.9.68.tar.bz2
/pycups-1.9.69.tar.bz2
/pycups-1.9.70.tar.bz2
/pycups-1.9.72.tar.bz2

View File

@ -1,11 +0,0 @@
-----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-----

11
pycups-1.9.72.tar.bz2.asc Normal file
View File

@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQEVAwUAVNn/h3lVEo2joavTAQIAMgf9HhJIzJU6JPCYyMBhK7RKBNLBkf0eRKIq
Y3byDsN/fFxo+HLx/8gwayMCdIst5/eOsTFrDbEzxNfUvOQSzVVgLthRl8PkmQdg
jM1taFvlRXfccYH9YN93+F5gcyix1tLRZA+HXEOwgIfaAIMC3CfoKvHMyBQ4VzDx
8Fsr2lbgY1ARRtPDYs9iOzXFrlgDHt6dgd8EWtb1yWxbMjXUo/o9QR2+H4rG4C4F
gYhlut1Vo5HJksu8oLQmN4ZqTazIn5PYEZKBBjoVShHekXQbmofH3THoHOtkAwJ1
wy9k6M4t5dja4BYcuXrC6pk0tvTfTROWR4T2Dra+d2vGb1CT9yKzjA==
=mvXK
-----END PGP SIGNATURE-----

View File

@ -1,45 +0,0 @@
diff -up pycups-1.9.70/cupsmodule.c.ipp-constants pycups-1.9.70/cupsmodule.c
--- pycups-1.9.70/cupsmodule.c.ipp-constants 2014-12-23 13:01:14.000000000 +0000
+++ pycups-1.9.70/cupsmodule.c 2015-01-12 11:19:16.132501327 +0000
@@ -1,6 +1,6 @@
/*
* cups - Python bindings for CUPS
- * Copyright (C) 2002, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Red Hat, Inc
+ * Copyright (C) 2002, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Red Hat, Inc
* Author: Tim Waugh <twaugh@redhat.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -1341,10 +1341,14 @@ initcups (void)
INT_16_CONSTANT (IPP_STATUS_ERROR_TEMPORARY, IPP_TEMPORARY_ERROR);
INT_16_CONSTANT (IPP_STATUS_ERROR_NOT_ACCEPTING_JOBS, IPP_NOT_ACCEPTING);
INT_16_CONSTANT (IPP_STATUS_ERROR_BUSY, IPP_PRINTER_BUSY);
- INT_IPP_STATUS_ERROR_CONSTANT (JOB_CANCELED);
+ INT_16_CONSTANT (IPP_STATUS_ERROR_JOB_CANCELED, IPP_ERROR_JOB_CANCELED);
INT_IPP_STATUS_ERROR_CONSTANT (MULTIPLE_JOBS_NOT_SUPPORTED);
INT_IPP_STATUS_ERROR_CONSTANT (PRINTER_IS_DEACTIVATED);
+ INT_16_CONSTANT (IPP_STATUS_ERROR_CUPS_AUTHENTICATION_CANCELED,
+ IPP_AUTHENTICATION_CANCELED);
INT_16_CONSTANT (IPP_STATUS_ERROR_CUPS_PKI, IPP_PKI_ERROR);
+ INT_16_CONSTANT (IPP_STATUS_ERROR_CUPS_UPGRADE_REQUIRED,
+ IPP_UPGRADE_REQUIRED);
// IPP states
/* Also define legacy names */
diff -up pycups-1.9.70/NEWS.ipp-constants pycups-1.9.70/NEWS
--- pycups-1.9.70/NEWS.ipp-constants 2014-12-23 13:07:01.000000000 +0000
+++ pycups-1.9.70/NEWS 2015-01-12 11:19:16.117501266 +0000
@@ -1,6 +1,14 @@
NEWS
----
+New in 1.9.71:
+
+* Fixes for cups.IPP_JOB_CANCELED, cups.IPP_ERROR_JOB_CANCELED,
+ cups.IPP_STATUS_ERROR_CUPS_AUTHENTICATION_CANCELED,
+ cups.IPP_AUTHENTICATION_CANCELED,
+ cups.IPP_STATUS_ERROR_CUPS_UPGRADE_REQUIRED, and
+ cups.IPP_UPGRADE_REQUIRED.
+
New in 1.9.70:
* cups.ippErrorString(). Fixed build with CUPS 1.5. New-style (CUPS

View File

@ -5,11 +5,10 @@
Summary: Python bindings for CUPS
Name: python-cups
Version: 1.9.70
Release: 3%{?dist}
Version: 1.9.72
Release: 1%{?dist}
URL: http://cyberelk.net/tim/software/pycups/
Source: http://cyberelk.net/tim/data/pycups/pycups-%{version}.tar.bz2
Patch1: python-cups-ipp-constants.patch
License: GPLv2+
Group: Development/Languages
BuildRequires: cups-devel
@ -42,9 +41,6 @@ Documentation for python-cups.
%prep
%setup -q -n pycups-%{version}
# Fixes for IPP constants (bug #1181043, bug #1181055).
%patch1 -p1 -b .ipp-constants
rm -rf %{py3dir}
cp -a . %{py3dir}
@ -83,6 +79,9 @@ popd
%doc examples html
%changelog
* Tue Feb 10 2015 Tim Waugh <twaugh@redhat.com> - 1.9.72-1
- Latest upstream release.
* Thu Jan 15 2015 Tim Waugh <twaugh@redhat.com> - 1.9.70-3
- Only ship the postscriptdriver rpm-provides script in python3-cups
as it is a python3 script.

View File

@ -1 +1 @@
4c448743260b6cac6f56ae18f6b0adb7 pycups-1.9.70.tar.bz2
c790bfbf4a3e9da2412c12c860fe191f pycups-1.9.72.tar.bz2