Hello community, here is the log from the commit of package system-config-printer for openSUSE:Factory checked in at 2016-07-01 09:57:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/system-config-printer (Old) and /work/SRC/openSUSE:Factory/.system-config-printer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "system-config-printer" Changes: -------- --- /work/SRC/openSUSE:Factory/system-config-printer/system-config-printer.changes 2016-06-07 23:44:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.system-config-printer.new/system-config-printer.changes 2016-07-01 09:57:51.000000000 +0200 @@ -1,0 +2,21 @@ +Tue Jun 14 13:57:56 UTC 2016 - dims...@opensuse.org + +- Add Require python(3)?-gobject-Gdk: pygobject was further split + in order to be able to install it without X-dependencies. We + import Gdk from gi.repository, thus also require + python-gobject-Gdk (boo#984252). + +------------------------------------------------------------------- +Tue Jun 7 07:20:29 UTC 2016 - alarr...@suse.com + +- Add python3-to-python2.diff : Remove all python3 dependencies. + Only applied in SLE12 where python3 is not available. +- Create a python3-cupshelpers or python-cupshelpers package + depending on the value of the use_python3 variable. +- Require python3-cups or python-cups (and the associated + python3-cupshelpers/python-cupshelpers) depending on the case. +- Remove %py_requires: It's not really needed. +- Merge the spec file from SLE12-SP2 and GNOME:Factory + (bnc#983255). + +------------------------------------------------------------------- New: ---- python3-to-python2.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ system-config-printer.spec ++++++ --- /var/tmp/diff_new_pack.bxBaDm/_old 2016-07-01 09:57:52.000000000 +0200 +++ /var/tmp/diff_new_pack.bxBaDm/_new 2016-07-01 09:57:52.000000000 +0200 @@ -24,6 +24,12 @@ %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 Release: 0 @@ -45,8 +51,10 @@ 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 -Patch23: fix_connect_dialog_focus.diff +Patch24: fix_connect_dialog_focus.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Obsoletes: gnome-cups-manager <= 0.33 BuildRequires: cups-devel @@ -61,8 +69,18 @@ # 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 @@ -70,12 +88,8 @@ BuildRequires: pkgconfig(libusb-1.0) BuildRequires: pkgconfig(udev) Requires: %{name}-common = %{version} -Requires: python3-cups -Requires: python3-pycurl -Requires: python3-requests # The applet is not strictly necessary, but it really makes sense Recommends: %{name}-applet -%py_requires %description system-config-printer is a graphical user interface that allows the @@ -84,12 +98,23 @@ %package common Summary: A printer administration tool -- Common Files Group: Hardware/Printing +%if %{?use_python3} Requires: dbus-1-python3 -Requires: python-cups >= 1.9.60 -Requires: python-cupshelpers Requires: python3-cairo +Requires: python3-cups >= 1.9.60 +Requires: python3-cupshelpers 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 @@ -110,7 +135,6 @@ # Uses the dbus service to interact with print jobs Requires: %{name}-dbus-service = %{version} BuildArch: noarch -%py_requires %description applet system-config-printer is a graphical user interface that allows the @@ -124,7 +148,6 @@ Group: Hardware/Printing Requires: %{name}-common = %{version} BuildArch: noarch -%py_requires %description dbus-service system-config-printer is a graphical user interface that allows the @@ -133,28 +156,47 @@ 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 +Requires: python3-cups >= 1.9.60 +Requires: python3-pycurl +BuildArch: noarch + +%description -n python3-cupshelpers +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 -%py_requires %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: %{name}-applet %systemd_requires -%py_requires %description -n udev-configure-printer This package contains an utility that will ensure printers get @@ -168,7 +210,10 @@ %patch20 -p1 %patch21 -p1 %patch22 -p1 +%if !%{?use_python3} %patch23 -p1 +%endif +%patch24 -p1 %build %configure \ @@ -228,15 +273,25 @@ %{_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 -# The dbus service is provided by cupshelpers/installdriver.py -%config(noreplace) %{_sysconfdir}/dbus-1/system.d/com.redhat.PrinterDriversInstaller.conf %{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 %files -n udev-configure-printer %defattr(-,root,root,-) ++++++ python3-to-python2.diff ++++++ ++++ 2318 lines (skipped)