Hello community, here is the log from the commit of package Printrun for openSUSE:Factory checked in at 2018-10-31 13:16:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/Printrun (Old) and /work/SRC/openSUSE:Factory/.Printrun.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "Printrun" Wed Oct 31 13:16:54 2018 rev:3 rq:645480 version:2.0.0~rc5.1522069560.e0ee40a Changes: -------- --- /work/SRC/openSUSE:Factory/Printrun/Printrun.changes 2018-07-22 23:04:24.316926845 +0200 +++ /work/SRC/openSUSE:Factory/.Printrun.new/Printrun.changes 2018-10-31 13:20:58.795083207 +0100 @@ -1,0 +2,5 @@ +Tue Oct 30 09:03:21 UTC 2018 - Adrian Schröter <adrian@suse.de> + +- fix dependency to python3 modules (esp. wxWidgets) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Printrun.spec ++++++ --- /var/tmp/diff_new_pack.hLoUsH/_old 2018-10-31 13:20:59.755082309 +0100 +++ /var/tmp/diff_new_pack.hLoUsH/_new 2018-10-31 13:20:59.755082309 +0100 @@ -12,10 +12,13 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # +%{?!python_module:%define python_module() python-%{**} python3-%{**}} +%define skip_python2 1 + Name: Printrun Version: 2.0.0~rc5.1522069560.e0ee40a Release: 0 @@ -30,11 +33,11 @@ Source2: pronterface.desktop Source3: plater.desktop +BuildRequires: %{python_module Cython} +BuildRequires: %{python_module devel} +BuildRequires: %{python_module pyserial} +BuildRequires: %{python_module setuptools} BuildRequires: gettext -BuildRequires: python3-Cython -BuildRequires: python3-devel -BuildRequires: python3-pyserial -BuildRequires: python3-setuptools %if 0%{?suse_version} BuildRequires: fdupes BuildRequires: update-desktop-files @@ -59,9 +62,9 @@ %package common Summary: Common files for Printrun Group: Productivity/Graphics/Convertors -Requires: python3-numpy -Requires: python3-pyglet -Requires: python3-pyserial +Requires: %{python_module numpy} +Requires: %{python_module pyglet} +Requires: %{python_module pyserial} %description common Printrun is a set of G-code sending applications for RepRap. @@ -85,8 +88,8 @@ %package -n pronterface Summary: GUI interface for RepRap Group: Productivity/Graphics/Convertors +Requires: %{python_module wxPython} Requires: pronsole = %{version}-%{release} -Requires: wxPython BuildArch: noarch %description -n pronterface @@ -100,7 +103,7 @@ Summary: RepRap STL plater Group: Productivity/Graphics/Convertors Requires: %{name}-common = %{version}-%{release} -Requires: wxPython +Requires: %{python_module wxPython} BuildArch: noarch %description -n plater @@ -121,7 +124,7 @@ sed -s -i -e '1 s@/usr/bin/env python3@/usr/bin/python3@' printrun/*py %build -CFLAGS="$RPM_OPT_FLAGS" python3 setup.py build +%python_build # rebuild locales cd locale @@ -132,13 +135,7 @@ cd .. %install -DESTDIR=%{buildroot} -# python => 2.5 expects this to exist (it will exist if the package -# installs something there, but we don't) otherwise fails for SLE_11 -mkdir -p %{buildroot}/%{python3_sitearch} -install -dpm 0755 %buildroot/{%_bindir,%_datadir/pixmaps,%_datadir/applications,%_datadir/%progname,%_defaultdocdir/progname} - -python3 setup.py install --skip-build --prefix %{buildroot}%{_prefix} +%python_install # fixup executable bits for f in %{buildroot}%{python3_sitearch}/printrun/*py; do