Hello community,
here is the log from the commit of package system-config-printer for
openSUSE:Factory checked in at 2017-09-15 21:07:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/system-config-printer (Old)
and /work/SRC/openSUSE:Factory/.system-config-printer.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "system-config-printer"
Fri Sep 15 21:07:21 2017 rev:85 rq:526322 version:1.5.7
Changes:
--------
---
/work/SRC/openSUSE:Factory/system-config-printer/system-config-printer.changes
2017-08-24 18:25:18.306404624 +0200
+++
/work/SRC/openSUSE:Factory/.system-config-printer.new/system-config-printer.changes
2017-09-15 21:07:22.660791493 +0200
@@ -1,0 +2,7 @@
+Thu Sep 14 14:44:40 UTC 2017 - fezh...@suse.com
+
+- Drop SLE12 conditionals, unconditionally use Adwaita icon theme
+ and python3.
+ + Drop python3-to-python2.diff.
+
+-------------------------------------------------------------------
Old:
----
python3-to-python2.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ system-config-printer.spec ++++++
--- /var/tmp/diff_new_pack.ciKDeC/_old 2017-09-15 21:07:23.520670771 +0200
+++ /var/tmp/diff_new_pack.ciKDeC/_new 2017-09-15 21:07:23.524670210 +0200
@@ -16,19 +16,8 @@
#
-%if 0%{?suse_version} > 1315
%define _icontheme adwaita
%define _iconlocation Adwaita
-%else
-%define _icontheme gnome
-%define _iconlocation gnome
-%endif
-
-%if 0%{?is_opensuse} || 0%{?suse_version} > 1315
-%define use_python3 1
-%else # use python2
-%define use_python3 0
-%endif
Name: system-config-printer
Version: 1.5.7
@@ -51,8 +40,6 @@
Patch21: system-config-printer-no-applet-in-gnome.patch
# PATCH-FIX-UPSTREAM system-config-printer-no-params-to-py3.patch boo#924809
dims...@opensuse.org -- Do not pass parameters to python3
Patch22: system-config-printer-no-params-to-py3.patch
-# PATCH-FIX-SLE python3-to-python2.diff alarr...@suse.com -- Do not use python3
-Patch23: python3-to-python2.diff
# PATCH-FIX-UPSTREAM fix_connect_dialog_focus.diff
gh#twaugh/system-config-printer#38 alarr...@suse.com -- Allow to set the focus
on a connect dialog combobox so the user can edit its contents
Patch24: fix_connect_dialog_focus.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -69,18 +56,11 @@
# For directory ownership
BuildRequires: hicolor-icon-theme
BuildRequires: intltool
-%if %{?use_python3}
BuildRequires: python3-devel
BuildRequires: python3-lxml
Requires: python3-cups
Requires: python3-pycurl
Requires: python3-requests
-%else
-BuildRequires: python-devel
-BuildRequires: python-lxml
-Requires: python-cups
-Requires: python-pycurl
-%endif
BuildRequires: systemd
BuildRequires: update-desktop-files
BuildRequires: xmlto
@@ -98,7 +78,6 @@
%package common
Summary: A printer administration tool -- Common Files
Group: Hardware/Printing
-%if %{?use_python3}
Requires: dbus-1-python3
Requires: python3-cairo
Requires: python3-cups >= 1.9.60
@@ -106,15 +85,6 @@
Requires: python3-gobject
Requires: python3-gobject-Gdk
Requires: python3-smbc
-%else
-Requires: dbus-1-python
-Requires: python-cairo
-Requires: python-cups >= 1.9.60
-Requires: python-cupshelpers
-Requires: python-gobject
-Requires: python-gobject-Gdk
-Requires: python-smbc
-%endif
Recommends: %{name}-common-lang
Recommends: cups-pk-helper
# As soon as this package is installed, it makes sense to have the
@@ -157,7 +127,6 @@
This packages provides a D-Bus service to configure printers and manage
print jobs.
-%if %{?use_python3}
%package -n python3-cupshelpers
Summary: High-level Python Bindings for CUPS
Group: Hardware/Printing
@@ -169,33 +138,13 @@
This package provides high-level python bindings for CUPS, and can be
used on top of python3-cups.
-%else # use python2
-
-%package -n python-cupshelpers
-Summary: High-level Python Bindings for CUPS
-Group: Hardware/Printing
-Requires: python-cups >= 1.9.60
-Requires: python-pycurl
-BuildArch: noarch
-
-%description -n python-cupshelpers
-This package provides high-level python bindings for CUPS, and can be
-used on top of python-cups.
-%endif
-
%package -n udev-configure-printer
Summary: Utility to autoconfigure printers when plugged
Group: Hardware/Printing
Obsoletes: cups-autoconfig <= 0.1.0
-%if %{?use_python3}
Requires: dbus-1-python3
Requires: python3-cups >= 1.9.60
Requires: python3-cupshelpers
-%else # use python2
-Requires: dbus-1-python
-Requires: python-cups >= 1.9.60
-Requires: python-cupshelpers
-%endif
Recommends: dbus(com.redhat.NewPrinterNotification)
%systemd_requires
@@ -211,9 +160,6 @@
%patch20 -p1
%patch21 -p1
%patch22 -p1
-%if !%{?use_python3}
-%patch23 -p1
-%endif
%patch24 -p1
%build
@@ -274,23 +220,13 @@
%{_datadir}/dbus-1/interfaces/org.fedoraproject.Config.Printing.xml
%{_datadir}/dbus-1/services/org.fedoraproject.Config.Printing.service
-%if %{?use_python3}
%files -n python3-cupshelpers
-%else
-%files -n python-cupshelpers
-%endif
%defattr(-,root,root,-)
%dir %{_sysconfdir}/cupshelpers
%config(noreplace) %{_sysconfdir}/cupshelpers/preferreddrivers.xml
-%if %{?use_python3}
%exclude %{python3_sitelib}/cupshelpers/__pycache__/*.pyc
%{python3_sitelib}/cupshelpers
%{python3_sitelib}/cupshelpers*.egg-info
-%else
-%exclude %{python_sitelib}/cupshelpers/*.pyc
-%{python_sitelib}/cupshelpers
-%{python_sitelib}/cupshelpers*.egg-info
-%endif
# The dbus service is provided by cupshelpers/installdriver.py
%config(noreplace)
%{_sysconfdir}/dbus-1/system.d/com.redhat.PrinterDriversInstaller.conf
