Hello community, here is the log from the commit of package mypaint for openSUSE:Factory checked in at 2018-09-24 13:12:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mypaint (Old) and /work/SRC/openSUSE:Factory/.mypaint.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mypaint" Mon Sep 24 13:12:58 2018 rev:7 rq:637023 version:1.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/mypaint/mypaint.changes 2018-05-03 12:34:36.515522141 +0200 +++ /work/SRC/openSUSE:Factory/.mypaint.new/mypaint.changes 2018-09-24 13:13:00.717733016 +0200 @@ -1,0 +2,7 @@ +Thu Sep 20 20:15:48 UTC 2018 - [email protected] + +- Make mypaint work again (boo#1081099): Explicitely set + python_binary and python_config to python2.7(-config). +- Spec file minor cleanup. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mypaint.spec ++++++ --- /var/tmp/diff_new_pack.K055M0/_old 2018-09-24 13:13:01.645731392 +0200 +++ /var/tmp/diff_new_pack.K055M0/_new 2018-09-24 13:13:01.649731385 +0200 @@ -17,7 +17,6 @@ Name: mypaint -# When updating this package, make sure it actually _starts_ mypaint before submitting. The 1.2.1 update DID NOT work. -Marcus Version: 1.1.0 Release: 0 Summary: Graphics application for digital painters @@ -37,7 +36,9 @@ BuildRequires: python-numpy >= 1.5 BuildRequires: python-numpy-devel %if 0%{?suse_version} > 1320 -# just for a working python3 scons +# Just because numpy detection relies on direct import in scons script (i.e. ran by python3) +# Shouldn't cause problem though as it's only needed for numpy/arrayobject.h which does not +# depend on the python version BuildRequires: python3-numpy BuildRequires: python3-numpy-devel %endif @@ -49,12 +50,7 @@ BuildRequires: pkgconfig(json) BuildRequires: pkgconfig(lcms2) Recommends: %{name}-lang = %{version} -%if 0%{?suse_version} >= 1220 Requires: python-numpy >= 1.7 -%else -Requires: python-numpy >= 1.5 -%endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build %{py_requires} %lang_package @@ -81,11 +77,11 @@ done %build -scons prefix=%{_prefix} \ +scons python_config=python2.7-config python_binary=python2.7 prefix=%{_prefix} \ %{?jobs:-j %jobs} %install -scons prefix=%{_prefix} \ +scons python_config=python2.7-config python_binary=python2.7 prefix=%{_prefix} \ --install-sandbox=install_tmp cp -r {.,po,brushlib,brushlib/po}/install_tmp/* %{buildroot} #FIXME incorrect file permissions, source has them as 0755 @@ -101,7 +97,7 @@ find %{buildroot} -name "libmypaint.mo" -print -delete # Fix env-based hashbang -sed -E -i "s:/usr/bin/env python*.*:/usr/bin/python3:" %{buildroot}%{_bindir}/mypaint +sed -E -i "s:/usr/bin/env python*.*:/usr/bin/python2:" %{buildroot}%{_bindir}/mypaint # Nuke the devel pkg: no one is using it and libmypaint-devel >= 1.3 obsoletes it rm -r %{buildroot}%{_includedir}/lib%{name} @@ -121,8 +117,8 @@ %endif %files -%defattr(-,root,root) -%doc changelog COPYING COPYING.cursors LICENSE README +%doc changelog README +%license COPYING COPYING.cursors LICENSE %{_bindir}/%{name} %dir %{_libdir}/%{name} %{_libdir}/%{name}/_mypaintlib.so
