Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package cups-airprint for openSUSE:Factory checked in at 2026-09-14 16:25:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cups-airprint (Old) and /work/SRC/openSUSE:Factory/.cups-airprint.new.1265 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cups-airprint" Mon Sep 14 16:25:54 2026 rev:4 rq:1377849 version:1.2 Changes: -------- --- /work/SRC/openSUSE:Factory/cups-airprint/cups-airprint.changes 2024-02-27 22:49:06.252160641 +0100 +++ /work/SRC/openSUSE:Factory/.cups-airprint.new.1265/cups-airprint.changes 2026-09-14 16:25:57.109548146 +0200 @@ -1,0 +2,12 @@ +Tue Sep 8 19:52:40 UTC 2026 - Olav Reinert <[email protected]> + +- Update to the latest upstream version, fix build + * python3.patch: fixed by upstream + +------------------------------------------------------------------- +Tue Sep 8 16:40:53 UTC 2026 - Matej Cepl <[email protected]> + +- Fix the build by running the smoke test with the primary + versioned Python interpreter. + +------------------------------------------------------------------- Old: ---- python3.patch ----------(Old B)---------- Old:- Update to the latest upstream version, fix build * python3.patch: fixed by upstream ----------(Old E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cups-airprint.spec ++++++ --- /var/tmp/diff_new_pack.glvlLh/_old 2026-09-14 16:25:58.559608904 +0200 +++ /var/tmp/diff_new_pack.glvlLh/_new 2026-09-14 16:25:58.561608988 +0200 @@ -1,7 +1,8 @@ # # spec file for package cups-airprint # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2026 SUSE LLC +# Copyright (c) 2026 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,11 +18,10 @@ Name: cups-airprint -Version: 1.1 +Version: 1.2 Release: 0 Summary: AirPrint for CUPS printers License: MIT -Group: Hardware/Printing URL: https://github.com/tjfontaine/airprint-generate Source0: https://raw.githubusercontent.com/tjfontaine/airprint-generate/master/airprint-generate.py Source10: apple.types @@ -31,8 +31,11 @@ Source22: README.SUSE Source23: LICENSE.txt Patch0: airprint-generate.patch -Patch1: python3.patch -Patch2: pdf-support.patch +Patch1: pdf-support.patch +%if 0%{?suse_version} >= 1500 && !0%{?is_opensuse} +Group: Hardware/Printing +BuildRequires: python3-base +%endif BuildRequires: python3-pycups Requires: avahi # cups-airprint will not work reasonably well with traditional CUPS <= 1.5.4 @@ -69,14 +72,18 @@ cp %{SOURCE0} %{SOURCE10} %{SOURCE11} . cp %{SOURCE21} %{SOURCE22} %{SOURCE23} . %patch -P 0 -%patch -P 1 -p1 -%patch -P 2 -p1 +%patch -P 1 %build %install mkdir -p %{buildroot}%{_sbindir} install airprint-generate.py %{buildroot}%{_sbindir} +%if %{defined python3_fix_shebang} +%python3_fix_shebang +%else +sed -i -e 's|^#!/usr/bin/env |#!/usr/bin/|' %{buildroot}%{_sbindir}/airprint-generate.py +%endif mkdir -p %{buildroot}%{_datadir}/cups/mime install -m 644 apple.types local.convs %{buildroot}%{_datadir}/cups/mime @@ -85,7 +92,11 @@ install -m 644 %{SOURCE20} %{buildroot}/%{_mandir}/man8 %check +%if 0%{?suse_version} >= 1500 && !0%{?is_opensuse} python3 airprint-generate.py -h +%else +python%{python_version} airprint-generate.py -h +%endif %files %{_sbindir}/airprint-generate.py ++++++ airprint-generate.py ++++++ --- /var/tmp/diff_new_pack.glvlLh/_old 2026-09-14 16:25:58.629611838 +0200 +++ /var/tmp/diff_new_pack.glvlLh/_new 2026-09-14 16:25:58.632611963 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ Copyright (c) 2010 Timothy J Fontaine <[email protected]> @@ -22,9 +22,10 @@ THE SOFTWARE. """ -import cups, os, optparse, re, urlparse +import cups, os, optparse, re +import urllib.parse as urlparse import os.path -from StringIO import StringIO +from io import StringIO from xml.dom.minidom import parseString from xml.dom import minidom @@ -43,7 +44,8 @@ from elementtree import Element, ElementTree, tostring etree = None except: - raise 'Failed to find python libxml or elementtree, please install one of those or use python >= 2.5' + print('Failed to find python libxml or elementtree, please install one of those or use python >= 2.5') + raise XML_TEMPLATE = """<!DOCTYPE service-group SYSTEM "avahi-service.dtd"> <service-group> @@ -121,7 +123,7 @@ printers = conn.getPrinters() - for p, v in printers.items(): + for p, v in list(printers.items()): if v['printer-is-shared']: attrs = conn.getPrinterAttributes(p) uri = urlparse.urlparse(v['printer-uri-supported']) ++++++ pdf-support.patch ++++++ --- /var/tmp/diff_new_pack.glvlLh/_old 2026-09-14 16:25:58.677613849 +0200 +++ /var/tmp/diff_new_pack.glvlLh/_new 2026-09-14 16:25:58.680613975 +0200 @@ -1,21 +1,13 @@ -commit 8d1b60bf828ab842731b91af121fcf8a27854811 -Author: Olav Reinert <[email protected]> -Date: Sun May 17 16:47:44 2020 +0200 - - Ensure PDF support (via CUPS) - - This is needed to ensure that suitable printers are discovered. - -diff --git a/airprint-generate.py b/airprint-generate.py -index ed224ff..358d627 100644 ---- a/airprint-generate.py -+++ b/airprint-generate.py -@@ -71,6 +71,7 @@ DOCUMENT_TYPES = { - 'application/pdf': True, - 'application/postscript': True, - 'application/vnd.cups-postscript': True, -+ 'application/vnd.cups-pdf': True, - 'application/vnd.cups-raster': True, - 'application/octet-stream': True, - 'image/urf': True, +*** airprint-generate.py.orig 2026-09-08 21:43:01.628635997 +0200 +--- airprint-generate.py 2026-09-08 21:43:35.987665163 +0200 +*************** +*** 72,77 **** +--- 72,78 ---- + # These content-types will be at the front of the list + 'application/pdf': True, + 'application/postscript': True, ++ 'application/vnd.cups-pdf': True, + 'application/vnd.cups-raster': True, + 'application/octet-stream': True, + 'image/urf': True,
