Update to 1.5.18

i9
Arkady L. Shane 1 year ago
parent 73df2f6b6f
commit ad3f2b8246
Signed by: tigro
GPG Key ID: 9C7900103E1C4F8B

2
.gitignore vendored

@ -1 +1 @@
SOURCES/system-config-printer-1.5.15.tar.xz SOURCES/system-config-printer-1.5.18.tar.xz

@ -1 +1 @@
766ffe01642cbc959ea34ee01cbe4e7116a514ed SOURCES/system-config-printer-1.5.15.tar.xz ac248b688ab103da7f034bd0d913e4e299206f4b SOURCES/system-config-printer-1.5.18.tar.xz

@ -0,0 +1,26 @@
From 399b3334d6519639cfe7f1c0457e2475b8ee5230 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Thu, 13 Oct 2022 14:03:37 +0200
Subject: [PATCH] Fix debugprint() in options.py (fixes #291)
---
NEWS | 4 ++++
options.py | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/options.py b/options.py
index d756f98d..d7c236de 100644
--- a/options.py
+++ b/options.py
@@ -423,7 +423,7 @@ class OptionSelectOne(Option):
debugprint("Unknown value for %s: %s" % (name, value))
debugprint("Choices: %s" % (supported))
if len(supported) > 0:
- debugprint("Selecting from choices:", supported[0])
+ debugprint("Selecting from choices: %s" % supported[0])
self.selector.set_active(0)
self.selector.connect("changed", self.changed)
--
2.39.2

@ -8,46 +8,74 @@
Summary: A printer administration tool Summary: A printer administration tool
Name: system-config-printer Name: system-config-printer
Version: 1.5.15 Version: 1.5.18
Release: 4%{?dist} Release: 5%{?dist}.inferit
License: GPLv2+ License: GPLv2+
URL: https://github.com/%{username}/%{name} URL: https://github.com/%{username}/%{name}
Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz
# all upstream patches, remove with new release # all upstream patches, remove with new release
Patch0001: 0001-Fix-debugprint-in-options.py-fixes-291.patch
# needed for macro AM_GNU_GETTEXT in configure.ac
BuildRequires: autoconf-archive
# uses CUPS API functions
BuildRequires: cups-devel >= 1.2
# we install a desktop file
BuildRequires: desktop-file-utils >= 0.2.92
# gcc is no longer in buildroot by default # gcc is no longer in buildroot by default
# gcc is needed for udev-configure-printer.c # gcc is needed for udev-configure-printer.c
BuildRequires: gcc BuildRequires: gcc
# for translations
BuildRequires: gettext-devel
# for autosetup # for autosetup
BuildRequires: git-core BuildRequires: git-core
# uses make # for translations
BuildRequires: make
BuildRequires: cups-devel >= 1.2
BuildRequires: desktop-file-utils >= 0.2.92
BuildRequires: gettext-devel
BuildRequires: intltool BuildRequires: intltool
# automatic printer setup tool, which uses udev, is only for USB printers
# we need libusb API to communicate
BuildRequires: libusb1-devel BuildRequires: libusb1-devel
# uses make
BuildRequires: make
# GNOME library for GUI
BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(glib-2.0)
BuildRequires: xmlto # for python3 API
BuildRequires: python3-devel
#BuildRequires: python3-setuptools
# for automatic USB printer setup tool - udev-configure-printer
BuildRequires: systemd BuildRequires: systemd
BuildRequires: systemd-devel BuildRequires: systemd-devel
BuildRequires: python3-devel # for generating manual
BuildRequires: xmlto
Requires: python3-gobject%{?_isa}
Requires: gtk3%{?_isa} # for dBUS support in scp-dbus-service
Requires: desktop-file-utils >= 0.2.92
Requires: dbus-x11 Requires: dbus-x11
Requires: python3-dbus%{?_isa} # for desktop file
Requires: system-config-printer-libs = %{version}-%{release} Requires: desktop-file-utils >= 0.2.92
# for system notifications
Requires: desktop-notification-daemon Requires: desktop-notification-daemon
# for GUI, the app is written in gtk3
Requires: gtk3%{?_isa}
# for GUI to prevent warning during the startup
Requires: libcanberra-gtk3
# for notifications
Requires: libnotify%{?_isa} Requires: libnotify%{?_isa}
# for GUI
Requires: python3-cairo%{?_isa} Requires: python3-cairo%{?_isa}
# for dBUS python API
Requires: python3-dbus%{?_isa}
# the app can adjust firewalld, so we need firewall API in Python
Requires: python3-firewall Requires: python3-firewall
Requires: libcanberra-gtk3 # for GUI
Requires: python3-gobject%{?_isa}
# runtime systemd requires for udev-configure-printer service
%{?systemd_requires} %{?systemd_requires}
# we use classes define in our library
Requires: system-config-printer-libs = %{version}-%{release}
# require python3-smbc for SMB printers
Requires: python3-smbc
%description %description
system-config-printer is a graphical user interface that allows system-config-printer is a graphical user interface that allows
@ -55,14 +83,27 @@ the user to configure a CUPS print server.
%package libs %package libs
Summary: Libraries and shared code for printer administration tool Summary: Libraries and shared code for printer administration tool
Requires: libnotify # PackageKit can bring you a popup window if some package in the repo provides a driver
Requires: python3-cups >= 1.9.60 # for your printer
Requires: python3-pycurl Recommends: PackageKit
Recommends: PackageKit-glib
# for GUI
Requires: gobject-introspection Requires: gobject-introspection
Requires: python3-gobject # written in GTK3
Requires: gtk3 Requires: gtk3
# for notifications
Requires: libnotify
# s-c-p classes uses Python CUPS API
Requires: python3-cups >= 1.9.60
# the libs subpackage contains scp-dbus-service, so we need dBUS API in Python here
Requires: python3-dbus Requires: python3-dbus
Requires: python3-requests # for GUI
Requires: python3-gobject
# the app can download printer data from database with CURL
Requires: python3-pycurl
# s-c-p has a plug-in support for Samba, if the relevant package is installed
Suggests: python3-smbc Suggests: python3-smbc
BuildArch: noarch BuildArch: noarch
@ -70,7 +111,7 @@ BuildArch: noarch
The common code used by both the graphical and non-graphical parts of The common code used by both the graphical and non-graphical parts of
the configuration tool. the configuration tool.
%if 0%{?rhel} <= 8 || 0%{?fedora} %if 0%{?rhel} <= 9 || 0%{?fedora}
%package applet %package applet
Summary: Print job notification applet Summary: Print job notification applet
Requires: %{name}-libs Requires: %{name}-libs
@ -89,6 +130,8 @@ printers.
%prep %prep
%autosetup -S git %autosetup -S git
# workaround https://github.com/pypa/setuptools/issues/3143
sed -i 's/setup.py install --prefix=$(DESTDIR)$(prefix)/setup.py install --root $(DESTDIR) --prefix=$(prefix)/' Makefile*
%build %build
%configure --with-udev-rules %configure --with-udev-rules
@ -106,7 +149,7 @@ touch %buildroot%{_localstatedir}/run/udev-configure-printer/usb-uris
%find_lang system-config-printer %find_lang system-config-printer
%if 0%{?rhel} > 8 %if 0%{?rhel} > 9
rm -rf %{buildroot}%{_bindir}/%{name}-applet \ rm -rf %{buildroot}%{_bindir}/%{name}-applet \
%{buildroot}%{_datadir}/%{name}/__pycache__/applet* \ %{buildroot}%{_datadir}/%{name}/__pycache__/applet* \
%{buildroot}%{_datadir}/%{name}/applet.py* \ %{buildroot}%{_datadir}/%{name}/applet.py* \
@ -196,9 +239,9 @@ rm -rf %{buildroot}%{_bindir}/%{name}-applet \
%dir %{_sysconfdir}/cupshelpers %dir %{_sysconfdir}/cupshelpers
%config(noreplace) %{_sysconfdir}/cupshelpers/preferreddrivers.xml %config(noreplace) %{_sysconfdir}/cupshelpers/preferreddrivers.xml
%{python3_sitelib}/cupshelpers %{python3_sitelib}/cupshelpers
%{python3_sitelib}/*.egg-info %{python3_sitelib}/*.egg-info/
%if 0%{?rhel} <= 8 || 0%{?fedora} %if 0%{?rhel} <= 9 || 0%{?fedora}
%files applet %files applet
%{_bindir}/%{name}-applet %{_bindir}/%{name}-applet
%{_datadir}/%{name}/__pycache__/applet* %{_datadir}/%{name}/__pycache__/applet*
@ -214,7 +257,7 @@ rm -rf %{buildroot}%{_bindir}/%{name}-applet \
%ghost %verify(not md5 size mtime) %config(noreplace,missingok) %attr(0644,root,root) %{_localstatedir}/run/udev-configure-printer/usb-uris %ghost %verify(not md5 size mtime) %config(noreplace,missingok) %attr(0644,root,root) %{_localstatedir}/run/udev-configure-printer/usb-uris
%{_unitdir}/configure-printer@.service %{_unitdir}/configure-printer@.service
%if 0%{?rhel} <= 8 || 0%{?fedora} %if 0%{?rhel} <= 9 || 0%{?fedora}
%files %files
%doc ChangeLog NEWS ABOUT-NLS AUTHORS ChangeLog-OLD %doc ChangeLog NEWS ABOUT-NLS AUTHORS ChangeLog-OLD
%license COPYING %license COPYING
@ -253,15 +296,45 @@ exit 0
%endif %endif
%changelog %changelog
* Wed Mar 15 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 1.5.15-4 * Sat Aug 19 2023 Arkady L. Shane <ashejn@msvsphere.ru> - 1.5.18-5.inferit
- Rebuilt for MSVSphere 9.1. - Rebuilt for MSVSphere 9.2
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.18-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 1.5.18-4
- Rebuilt for Python 3.12
* Tue Mar 14 2023 Zdenek Dohnal <zdohnal@redhat.com> - 1.5.18-3
- 2178027 - fix crash in options.py
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.18-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Tue Sep 06 2022 Zdenek Dohnal <zdohnal@redhat.com> - 1.5.18-1
- 1.5.18
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.16-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1.5.16-2
- Rebuilt for Python 3.11
* Mon May 23 2022 Zdenek Dohnal <zdohnal@redhat.com> - 1.5.16-1
- 1.5.16
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.15-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Mon Sep 06 2021 Zdenek Dohnal <zdohnal@redhat.com> - 1.5.15-5
- fix issues reported by Coverity scan
- add a weak dependency on PackageKit for scp-libs
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.5.15-4 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.15-4
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Related: rhbz#1991688
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.5.15-3 * Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 1.5.15-3
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 - Rebuilt for Python 3.10
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.15-2 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.15-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Loading…
Cancel
Save