commit 0e6b4e06f0ca8d6365f5a0e1fe833153c57f03966bdc7bee9804f0146c935e9c Author: Todd R Date: Fri Jun 9 21:56:56 2017 +0000 Accepting request 502732 from home:alois:branches:devel:languages:python OBS-URL: https://build.opensuse.org/request/show/502732 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pycups?expand=0&rev=1 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/pycups-1.9.73.tar.bz2 b/pycups-1.9.73.tar.bz2 new file mode 100644 index 0000000..f33ad6d --- /dev/null +++ b/pycups-1.9.73.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c381be011889ca6f728598578c89c8ac9f7ab1e95b614474df9f2fa831ae5335 +size 52732 diff --git a/python-pycups.changes b/python-pycups.changes new file mode 100644 index 0000000..ebc0d94 --- /dev/null +++ b/python-pycups.changes @@ -0,0 +1,240 @@ +------------------------------------------------------------------- +Mon Jun 5 10:48:38 UTC 2017 - aloisio@gmx.com + +- Update to 1.9.73 + * Fixed build for CUPS 1.6.3 by making several constants + conditional on CUPS >= 1.7. +- Converted to single-spec +- Renamed package to python-pycups to follow naming guidelines + +------------------------------------------------------------------- +Sun Mar 8 12:28:06 UTC 2015 - benoit.monin@gmx.fr + +- add patch revert-postscriptdriver.prov-py3.patch: + revert back to python2 for postscriptdriver.prov script + +------------------------------------------------------------------- +Thu Feb 26 22:03:25 UTC 2015 - benoit.monin@gmx.fr + +- update to version 1.9.72: + * Removed private CANCEL_DOCUMENT, GET_DOCUMENT_ATTRIBUTES, + GET_DOCUMENTS, DELETE_DOCUMENT, SET_DOCUMENT_ATTRIBUTES IPP + operation constants + * Fixed build for CUPS 1.4 by making several constants + conditional on CUPS >= 1.5 +- additional changes from version 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 +- additional changes from version 1.9.70: + * cups.ippErrorString(). Fixed build with CUPS 1.5. New-style + (CUPS 1.6) naming for HTTP status (cups.HTTP_STATUS_*), IPP + orientation (cups.IPP_ORIENT_*), IPP status (cups.IPP_STATUS_*), + and IPP I/O (cups.IPP_STATE_*) constants +- additional changes from version 1.9.69: + * cups.IPPRequest.operation, cups.IPPRequest.state, + cups.IPPRequest.statuscode, cups.ippOpString(), cups.IPP_OP_*, + cups.IPPRequest.addSeparator(), cups.IPPRequest.add(), + cups.IPPRequest.writeIO() +- additional changes from version 1.9.68: + * Now builds against CUPS 2.0 + * The rpm provider script is now Python3 +- additional changes from version 1.9.67: + * Bindings for streaming API: cups.CUPS_FORMAT_* constants, + cups.createJob(), cups.startDocument(), cups.writeRequestData(), + cups.finishDocument() +- remove Changelog from doc: deleted by upstream + +------------------------------------------------------------------- +Sat Jan 25 01:37:22 UTC 2014 - os-dev@jacraig.com + +- Update to 1.9.66: + * Python3 compatibility +- Changes from 1.9.65: + * cupsconnection.c (PyObject_from_attr_value): Fix getting of booleans. + * cupsconnection.c (UTF8_from_PyObj): Propagate UTF-8 decoding errors. + * cupsconnection.c: Don't just append printer name to base URI to get + printer URI. Need to actually encode the name. + * cupsconnection.c: Fixed documentation typo for Connection.getPPDs2. + +------------------------------------------------------------------- +Sat Sep 14 18:30:34 UTC 2013 - os-dev@jacraig.com + +- Update to 1.9.63: + * cups.IPPError tuple now contains the specific error string, if one is + available. +- Changes from 1.9.62: + * Define all constants regardless of which version of CUPS is built against. +- Added %doc to build section with several doc files from the source. + +------------------------------------------------------------------- +Mon Sep 3 01:59:14 UTC 2012 - jengelh@inai.de + +- Remove redundant %clean section +- Make package compile on RH6-like systems by using standard + python macros + +------------------------------------------------------------------- +Wed Mar 28 11:23:39 UTC 2012 - vuntz@opensuse.org + +- Update to version 1.9.61: + + Several bug fixes, including reference count fixes and better + handling of failures from Py* functions. + +------------------------------------------------------------------- +Tue Nov 15 16:50:12 UTC 2011 - vuntz@opensuse.org + +- Update to version 1.9.60: + + Add new constants defined in cups 1.5. + +------------------------------------------------------------------- +Tue Oct 4 07:45:18 UTC 2011 - vuntz@opensuse.org + +- Update to version 1.9.59: + + Password callbacks can now return None to indicate they want to + abort the current operation. + +------------------------------------------------------------------- +Sat Jul 30 09:57:14 CEST 2011 - vuntz@opensuse.org + +- Update to version 1.9.58: + + Add cups.Connection.adminExportSamba. + + Build fixes. + +------------------------------------------------------------------- +Thu Jun 9 16:37:58 CEST 2011 - vuntz@opensuse.org + +- Update to version 1.9.57: + + Fixed rpm provides script for newer versions of rpm. + +------------------------------------------------------------------- +Fri Jun 3 14:33:32 CEST 2011 - vuntz@opensuse.org + +- Update to version 1.9.56: + + Fix build against CUPS < 1.4. + +------------------------------------------------------------------- +Fri May 27 15:22:12 CEST 2011 - vuntz@opensuse.org + +- Update to version 1.9.55: + + Add: + - cups.IPP_QUALITY_DRAFT, cups.IPP_QUALITY_NORMAL, + cups.IPP_QUALITY_HIGH + - cups.IPP_PORTRAIT, cups.IPP_LANDSCAPE, + cups.IPP_REVERSE_PORTRAIT, cups.IPP_REVERSE_LANDSCAPE + - cups.IPP_RES_UNITS_CM, cups.IPP_RES_UNITS_INCH + + Support for IPP_TAG_RESOLUTION as triplet (xres, yres, units). +- Changes from version 1.9.54: + + Add rpm 4.9 hooks that can tag printer driver RPM packages with + the MFG and MDL values for devices they support. +- Changes from version 1.9.53: + + Fix a thread-local storage issue (rh#662805). + +------------------------------------------------------------------- +Wed Nov 10 14:02:13 CET 2010 - vuntz@opensuse.org + +- Update to version 1.9.52: + + cups.Connection.getPPDs2(): New method, identical to getPPDs() + but returning all attribute values as lists. + +------------------------------------------------------------------- +Fri Sep 3 20:02:22 CEST 2010 - vuntz@opensuse.org + +- Fix build with python 2.7, by fixing a filename in the file list. + +------------------------------------------------------------------- +Fri Aug 6 17:38:14 CEST 2010 - vuntz@opensuse.org + +- Update to version 1.9.51: + + Fixed stack overflow (rh#584991). + + Use strcpy instead of sprintf when no format required. +- Changes from version 1.9.50: + + cups.Connection.getPPD3() + + cups.Connection.getJobs() now takes optional + requested_attributes argument. + + cups.Connection.getPrinterAttributes(): member-names is now + always a list. + + cups.HTTP_NOT_MODIFIED constant. + + cups.PPD_ORDER_ANY constant. + + cups.PPD_ORDER_DOCUMENT constant. + + cups.PPD_ORDER_EXIT constant. + + cups.PPD_ORDER_JCL constant. + + cups.PPD_ORDER_PAGE constant. + + cups.PPD_ORDER_PROLOG constant. + + cups.PPD.emitString() method. + + cups.PPD.emit() method. + + cups.PPD.emitAfterOrder() method. + + cups.PPD.emitFd() method. + + cups.PPD.emitJCL() method. + + cups.PPD.emitJCLEnd() method. + +------------------------------------------------------------------- +Mon Mar 22 14:35:09 CET 2010 - vuntz@opensuse.org + +- Update to version 1.9.49: + + Fix rh#567386. + +------------------------------------------------------------------- +Sat Feb 13 15:31:16 CET 2010 - vuntz@opensuse.org + +- Update to version 1.9.48: + + cups.cancelJob()'s optional second argument is now a keyword. +- Changes from version 1.9.47: + + cups.restartJob() now takes optional job_hold_until argument. + + cups.cancelJob() now takes optional purge_job argument. + + cups.setPasswordCB2() method. + + cups.Connection.moveJob() method. + + cups.IPPAttribute and cups.IPPRequest types. + + IPP state constants. + + cups.Connection.getDevices() now takes optional timeout + argument. +- Changes from version 1.9.46: + + cups.Connection.getDevices() now takes optional limit, + exclude_schemes and include_schemes arguments. + + cups.Connection.getPPDs() now takes optional limit, + exclude_schemes, include_schemes, ppd_device_id, ppd_make, + ppd_make_and_model, ppd_model_number, ppd_product, + ppd_psversion, ppd_type and ppd_natural_language arguments. + + cups.ppdSetConformance() method. + + cups.PPD_CONFORM_RELAXED constant. + + cups.PPD_CONFORM_STRICT constant. + + cups.modelSort() now accepts Unicode strings. +- Changes from version 1.9.45: + + cups.PPD.localizeIPPReason() + + cups.PPD.localizeMarkerName() +- Changes from version 1.9.44: + + Fix threading crashes. +- Changes from version 1.9.43: + + Avoid crashing when CUPS-Get-Devices call asks for password. + + Set printer-uri attribute in Connection.getJobs, not job-uri. + + Fixed threading support. + +------------------------------------------------------------------- +Mon Sep 15 21:39:50 CEST 2008 - dmueller@suse.de + +- fix requires (python-base is unversioned and does not exist) + +------------------------------------------------------------------- +Wed Sep 10 11:59:27 CEST 2008 - kssingvo@suse.de + +- Update to version 1.9.42: + * New function for extracting requested attributes from list + * Support limit and first-job-id attributes + * New parameter requested_attributes + * Documentation fix for getJobAttributes + +------------------------------------------------------------------- +Wed Aug 20 14:19:48 CEST 2008 - kssingvo@suse.de + +- Update to version 1.9.41: + * Allow destination to be a file descriptor or a Python file + object, and call cupsPutFd() in those cases + * Fixed requested_attributes parameter + +------------------------------------------------------------------- +Mon Jul 14 09:51:00 CEST 2008 - dmueller@suse.de + +- Initial package (1.9.40) + diff --git a/python-pycups.spec b/python-pycups.spec new file mode 100644 index 0000000..7067fe6 --- /dev/null +++ b/python-pycups.spec @@ -0,0 +1,57 @@ +# +# spec file for package python-pycups +# +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +%{?!python_module:%define python_module() python-%{**} python3-%{**}} +%define _name pycups +Name: python-pycups +Version: 1.9.73 +Release: 0 +Summary: Python Bindings for CUPS +License: GPL-2.0+ +Group: Development/Libraries/Python +Url: http://cyberelk.net/tim/software/pycups/ +Source: https://files.pythonhosted.org/packages/source/p/pycups/%{_name}-%{version}.tar.bz2 +# PATCH-FIX-OPENSUSE revert-postscriptdriver.prov-py3.patch switch back to python2 +Patch0: revert-postscriptdriver.prov-py3.patch +BuildRequires: %{python_module devel} +BuildRequires: cups-devel +BuildRequires: python-rpm-macros +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%python_subpackages + +%description +Python Bindings for CUPS, the Common Unix Printing System + +%prep +%setup -q -n %{_name}-%{version} +%patch0 -p1 + +%build +export CFLAGS="%{optflags}" +%python_build + +%install +%python_install + +%files %{python_files} +%defattr(-,root,root) +%doc COPYING NEWS README TODO +%{python_sitearch}/cups*.so +%{python_sitearch}/%{_name}-%{version}-py%{python_version}.egg-info + +%changelog diff --git a/revert-postscriptdriver.prov-py3.patch b/revert-postscriptdriver.prov-py3.patch new file mode 100644 index 0000000..c50a92a --- /dev/null +++ b/revert-postscriptdriver.prov-py3.patch @@ -0,0 +1,139 @@ +From: Benoît Monin +Date: Sun, 8 Mar 2015 13:14:03 +0100 +Subject: [PATCH] Revert "Converted postscriptdriver.prov to Python3." +Upstream: no + +This reverts commit 83d0ee6cbafbc7f9abec72d4062643d51fe37974. +Upstream switched to python3 but we're building a pyhon2 package, so revert. + +--- + postscriptdriver.prov | 64 ++++++++++++++++++++------------------------------- + 1 file changed, 25 insertions(+), 39 deletions(-) + +diff --git a/postscriptdriver.prov b/postscriptdriver.prov +index 21c1116..7bf74b1 100755 +--- a/postscriptdriver.prov ++++ b/postscriptdriver.prov +@@ -1,6 +1,6 @@ +-#!/usr/bin/python3 ++#!/usr/bin/python + +-## Copyright (C) 2009, 2010, 2014 Red Hat, Inc. ++## Copyright (C) 2009, 2010 Red Hat, Inc. + ## Author: Tim Waugh + + ## This program is free software; you can redistribute it and/or modify +@@ -54,7 +54,7 @@ class DeviceIDs: + + def get_tags (self): + ret = [] +- for mfg, mdlset in self.ids.items (): ++ for mfg, mdlset in self.ids.iteritems (): + mfgl = mfg.lower ().replace (" ", "_") + for mdl in mdlset: + mdll = mdl.lower ().replace (" ", "_") +@@ -65,7 +65,7 @@ class DeviceIDs: + + def __add__ (self, other): + if isinstance(other, DeviceIDs): +- for omfg, omdlset in other.ids.items (): ++ for omfg, omdlset in other.ids.iteritems (): + try: + mdlset = self.ids[omfg] + except KeyError: +@@ -121,7 +121,7 @@ class PPDDriver(Driver): + def examine_file (self, path): + try: + ppd = cups.PPD (path) +- except RuntimeError: ++ except RuntimeError, e: + # Not a PPD file. Perhaps it's a drv file. + drv = DrvDriver (path) + self.ids += drv.list () +@@ -164,16 +164,16 @@ class DynamicDriver(Driver): + posix.kill (p.pid, signal.SIGKILL) + raise + +- if stderr: +- print(stderr.decode (), file=sys.stderr) ++ if stderr: ++ print >> sys.stderr, stderr + +- ppds = [] +- lines = stdout.decode ().split ('\n') +- for line in lines: +- l = shlex.split (line) +- if len (l) < 5: +- continue +- self.ids += l[4] ++ ppds = [] ++ lines = stdout.split ('\n') ++ for line in lines: ++ l = shlex.split (line) ++ if len (l) < 5: ++ continue ++ self.ids += l[4] + + return Driver.list (self) + +@@ -211,35 +211,22 @@ class DrvDriver(PPDDriver): + posix.kill (p.pid, signal.SIGKILL) + raise + +- for (dirpath, dirnames, filenames) in os.walk (outputdir, +- topdown=False): +- for filename in filenames: +- path = dirpath + os.path.sep + filename +- self.examine_file (path) +- try: +- os.unlink (path) +- except OSError: +- pass +- +- for dirname in dirnames: +- try: +- os.rmdir (dirpath + os.paht.sep + dirname) +- except OSError: +- pass +- +- try: +- os.rmdir (outputdir) +- except OSError: +- pass +- ++ os.path.walk (outputdir, self.examine_directory, None) ++ os.rmdir (outputdir) + return Driver.list (self) + ++ def examine_directory (self, unused, dirname, fnames): ++ for fname in fnames: ++ path = dirname + os.path.sep + fname ++ self.examine_file (path) ++ os.unlink (path) ++ + class TagBuilder: + def __init__ (self, filelist=None): + if filelist == None: + filelist = sys.stdin + +- paths = [x.rstrip () for x in filelist.readlines ()] ++ paths = map (lambda x: x.rstrip (), filelist.readlines ()) + self.ids = DeviceIDs () + + for path in paths: +@@ -248,8 +235,7 @@ class TagBuilder: + self.ids += DynamicDriver (path).list () + except TimedOut: + pass +- except OSError as exc: +- (e, s) = exc.args ++ except OSError, (e, s): + if e == errno.EACCES or e == errno.ENOENT: + # Not executable + pass +@@ -270,4 +256,4 @@ if __name__ == "__main__": + builder = TagBuilder () + tags = builder.get_tags () + for tag in tags: +- print (tag) ++ print tag