Compare commits
No commits in common. "c8s" and "c9s" have entirely different histories.
|
|
@ -1 +1,19 @@
|
|||
SOURCES/pycups-1.9.72.tar.bz2
|
||||
/pycups-1.9.52.tar.bz2
|
||||
/pycups-1.9.53.tar.bz2
|
||||
/pycups-1.9.54.tar.bz2
|
||||
/pycups-1.9.55.tar.bz2
|
||||
/pycups-1.9.57.tar.bz2
|
||||
/pycups-1.9.59.tar.bz2
|
||||
/pycups-1.9.60.tar.bz2
|
||||
/pycups-1.9.61.tar.bz2
|
||||
/pycups-1.9.62.tar.bz2
|
||||
/pycups-1.9.63.tar.bz2
|
||||
/pycups-1.9.65.tar.bz2
|
||||
/pycups-1.9.66.tar.bz2
|
||||
/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.72.tar.bz2
|
||||
/pycups-1.9.74.tar.bz2
|
||||
/pycups-2.0.1.tar.gz
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
71d2136f817dfa225f7dfa0e77b35ab1422f9f80 SOURCES/pycups-1.9.72.tar.bz2
|
||||
b6057da7830fb49c30021902393d94acb045087e pycups-2.0.1.tar.gz
|
||||
|
|
|
|||
|
|
@ -0,0 +1,22 @@
|
|||
From 09145aa3ad0ce6e0558aceccabcafdf6c1b282d8 Mon Sep 17 00:00:00 2001
|
||||
From: zdohnal <zdohnal@redhat.com>
|
||||
Date: Fri, 28 Aug 2020 07:48:20 +0200
|
||||
Subject: [PATCH] examples/cupstree.py: remove shebang
|
||||
|
||||
It is unneeded within examples.
|
||||
---
|
||||
examples/cupstree.py | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/examples/cupstree.py b/examples/cupstree.py
|
||||
index e954615..af19b07 100755
|
||||
--- a/examples/cupstree.py
|
||||
+++ b/examples/cupstree.py
|
||||
@@ -1,4 +1,3 @@
|
||||
-#!/usr/bin/python
|
||||
import cups
|
||||
|
||||
def do_indent (indent):
|
||||
--
|
||||
2.26.2
|
||||
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
From 845c65358e3ba6e5972df1dd37756be97130cc90 Mon Sep 17 00:00:00 2001
|
||||
From: zdohnal <zdohnal@redhat.com>
|
||||
Date: Fri, 28 Aug 2020 08:23:24 +0200
|
||||
Subject: [PATCH] postscriptdriver.prov: ignore driverless utilities
|
||||
|
||||
Driverless utilities are generic tools for driverless support, which generate 'drivers' based on communication with a device, so it is not usable to try to generate rpm tags for specific models.
|
||||
Creating generic ```postscriptdriver(driverless)``` doesn't make sense too, because utilities are shipped within core printing packages (CUPS/cups-filters), so just ignore postscriptdriver tag creation for them.
|
||||
---
|
||||
postscriptdriver.prov | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/postscriptdriver.prov b/postscriptdriver.prov
|
||||
index 7447def..c9e3cee 100755
|
||||
--- a/postscriptdriver.prov
|
||||
+++ b/postscriptdriver.prov
|
||||
@@ -243,7 +243,8 @@ class TagBuilder:
|
||||
self.ids = DeviceIDs ()
|
||||
|
||||
for path in paths:
|
||||
- if path.find ("/usr/lib/cups/driver/") != -1:
|
||||
+ if path.find ("/usr/lib/cups/driver/") != -1 and \
|
||||
+ path.find("driverless") == -1:
|
||||
try:
|
||||
self.ids += DynamicDriver (path).list ()
|
||||
except TimedOut:
|
||||
--
|
||||
2.26.2
|
||||
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-9
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
|
||||
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tedude.validation}
|
||||
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.acceptance-tier.functional}
|
||||
|
|
@ -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-----
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
diff --git a/cupsconnection.c b/cupsconnection.c
|
||||
index 132dd25..d54a7fa 100644
|
||||
--- a/cupsconnection.c
|
||||
+++ b/cupsconnection.c
|
||||
@@ -3827,7 +3827,7 @@ Connection_printTestPage (Connection *self, PyObject *args, PyObject *kwds)
|
||||
const char *datadir;
|
||||
char filename[PATH_MAX];
|
||||
char uri[HTTP_MAX_URI];
|
||||
- ipp_t *request, *answer;
|
||||
+ ipp_t *request, *answer = NULL;
|
||||
ipp_attribute_t *attr;
|
||||
char *resource;
|
||||
int jobid = 0;
|
||||
@@ -3923,6 +3923,7 @@ Connection_printTestPage (Connection *self, PyObject *args, PyObject *kwds)
|
||||
Connection_end_allow_threads (self);
|
||||
if (answer && ippGetStatusCode (answer) == IPP_NOT_POSSIBLE) {
|
||||
ippDelete (answer);
|
||||
+ answer = NULL;
|
||||
// Perhaps it's a class, not a printer.
|
||||
construct_uri (uri, sizeof (uri),
|
||||
"ipp://localhost/classes/", printer);
|
||||
|
|
@ -1,23 +1,31 @@
|
|||
%{?filter_setup:
|
||||
%filter_provides_in %{python_sitearch}/.*\.so$
|
||||
%filter_provides_in %{python3_sitearch}/.*\.so$
|
||||
%filter_setup
|
||||
}
|
||||
|
||||
Summary: Python bindings for CUPS
|
||||
Name: python-cups
|
||||
Version: 1.9.72
|
||||
Release: 21%{?dist}
|
||||
URL: http://cyberelk.net/tim/software/pycups/
|
||||
Source: http://cyberelk.net/tim/data/pycups/pycups-%{version}.tar.bz2
|
||||
Version: 2.0.1
|
||||
Release: 10%{?dist}
|
||||
# older URL, but still with useful information about pycups
|
||||
#URL: http://cyberelk.net/tim/software/pycups/
|
||||
URL: https://github.com/OpenPrinting/pycups/
|
||||
Source: https://github.com/OpenPrinting/pycups/releases/download/v%{version}/pycups-%{version}.tar.gz
|
||||
License: GPLv2+
|
||||
|
||||
# all taken from upstream
|
||||
Patch01: 0001-examples-cupstree.py-remove-shebang.patch
|
||||
Patch02: 0001-postscriptdriver.prov-ignore-driverless-utilities.patch
|
||||
Patch03: pycups-invalid-pointer.patch
|
||||
|
||||
# gcc is no longer in buildroot by default
|
||||
BuildRequires: gcc
|
||||
# for autosetup
|
||||
BuildRequires: git-core
|
||||
# uses make
|
||||
BuildRequires: make
|
||||
|
||||
BuildRequires: cups-devel
|
||||
%if 0%{?rhel} <= 7
|
||||
BuildRequires: python2-devel
|
||||
%endif
|
||||
BuildRequires: python3-devel
|
||||
|
||||
%description
|
||||
|
|
@ -25,20 +33,6 @@ This package provides Python bindings for CUPS API,
|
|||
known as pycups. It was written for use with
|
||||
system-config-printer, but can be put to other uses as well.
|
||||
|
||||
%if 0%{?rhel} <= 7
|
||||
%package -n python2-cups
|
||||
Summary: Python2 bindings for CUPS API, known as pycups.
|
||||
# defined in /usr/lib/rpm/macros.d/macros.python
|
||||
# if python_provide() is defined, call python_provide(python2-cups)
|
||||
# which may eventually add Provides: ... (see the function definition)
|
||||
%{?python_provide:%python_provide python2-cups}
|
||||
|
||||
%description -n python2-cups
|
||||
This package provides Python 2 bindings for CUPS API,
|
||||
known as pycups. It was written for use with
|
||||
system-config-printer, but can be put to other uses as well.
|
||||
%endif
|
||||
|
||||
%package -n python3-cups
|
||||
Summary: Python3 bindings for CUPS API, known as pycups.
|
||||
%{?python_provide:%python_provide python3-cups}
|
||||
|
|
@ -55,37 +49,19 @@ Summary: Documentation for python-cups
|
|||
Documentation for python-cups.
|
||||
|
||||
%prep
|
||||
%setup -n pycups-%{version}
|
||||
|
||||
sed -i '/^#!\/usr\/bin\/python/d' examples/cupstree.py
|
||||
sed -i '1s=^#!/usr/bin/python3=#!%{__python3}=' \
|
||||
postscriptdriver.prov
|
||||
%autosetup -S git -n pycups-%{version}
|
||||
|
||||
%build
|
||||
%if 0%{?rhel} <= 7
|
||||
%py2_build
|
||||
%endif
|
||||
%py3_build
|
||||
|
||||
%install
|
||||
make install-rpmhook DESTDIR="%{buildroot}"
|
||||
%if 0%{?rhel} <= 7
|
||||
%py2_install
|
||||
%endif
|
||||
%py3_install
|
||||
export PYTHONPATH=%{buildroot}%{python3_sitearch}
|
||||
%{_bindir}/pydoc3 -w cups
|
||||
%{__python3} -m pydoc -w cups
|
||||
%{_bindir}/mkdir html
|
||||
%{_bindir}/mv cups.html html
|
||||
|
||||
%if 0%{?rhel} <= 7
|
||||
%files -n python2-cups
|
||||
%doc README NEWS TODO
|
||||
%license COPYING
|
||||
%{python2_sitearch}/cups.so
|
||||
%{python2_sitearch}/pycups*.egg-info
|
||||
%endif
|
||||
|
||||
%files -n python3-cups
|
||||
%doc README NEWS TODO
|
||||
%license COPYING
|
||||
|
|
@ -98,8 +74,64 @@ export PYTHONPATH=%{buildroot}%{python3_sitearch}
|
|||
%doc examples html
|
||||
|
||||
%changelog
|
||||
* Thu Jun 07 2018 Tomas Orsava <torsava@redhat.com> - 1.9.72-21
|
||||
- Switch hardcoded python3 shebangs into the %%{__python3} macro
|
||||
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.0.1-10
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.0.1-9
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Mon Dec 14 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2.0.1-7
|
||||
- fix invalid delete (upstream ticket #11)
|
||||
|
||||
* Thu Nov 05 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2.0.1-6
|
||||
- make is no longer in buildroot by default
|
||||
- use smaller git-core instead of git
|
||||
|
||||
* Fri Aug 28 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2.0.1-5
|
||||
- 1873385 - ignore driverless utilities during tags creation
|
||||
|
||||
* Wed Jul 29 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2.0.1-4
|
||||
- use %%python3_sitearch in filter_provides_in, otherwise the package fails to build
|
||||
|
||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 2.0.1-2
|
||||
- Rebuilt for Python 3.9
|
||||
|
||||
* Fri Apr 24 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2.0.1-1
|
||||
- 2.0.1, fixes #1816107
|
||||
|
||||
* Mon Mar 16 2020 Zdenek Dohnal <zdohnal@redhat.com> - 1.9.74-7
|
||||
- use __python macro for calling pydoc
|
||||
|
||||
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.74-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 1.9.74-5
|
||||
- Rebuilt for Python 3.8
|
||||
|
||||
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.74-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.74-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Wed Oct 03 2018 Zdenek Dohnal <zdohnal@redhat.com> - 1.9.74-2
|
||||
- 1578356 - Remove python2 subpackage
|
||||
|
||||
* Wed Sep 26 2018 Zdenek Dohnal <zdohnal@redhat.com> - 1.9.74-1
|
||||
- 1.9.74
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.72-22
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 1.9.72-21
|
||||
- Rebuilt for Python 3.7
|
||||
|
||||
* Fri Apr 20 2018 Zdenek Dohnal <zdohnal@redhat.com> - 1.9.72-20
|
||||
- adding docs back
|
||||
|
|
@ -0,0 +1 @@
|
|||
SHA512 (pycups-2.0.1.tar.gz) = fdebf1cac8cc4fffb8a76a938aa91965dae4a3dcdb6d8ee26e8e6054809d26dd3fb20b10c2351fb9265c03b16d6bde011815111c452ccb058518372f22d9d617
|
||||
|
|
@ -0,0 +1,41 @@
|
|||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||
Version: GnuPG v1.4.11 (GNU/Linux)
|
||||
|
||||
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
|
||||
yN+XBvYpzg==
|
||||
=uNLi
|
||||
-----END PGP PUBLIC KEY BLOCK-----
|
||||
Loading…
Reference in New Issue