Hello community,
here is the log from the commit of package scons for openSUSE:Factory checked
in at 2017-11-29 10:50:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/scons (Old)
and /work/SRC/openSUSE:Factory/.scons.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scons"
Wed Nov 29 10:50:36 2017 rev:35 rq:545189 version:3.0.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/scons/scons.changes 2017-10-10
11:35:09.828072506 +0200
+++ /work/SRC/openSUSE:Factory/.scons.new/scons.changes 2017-11-29
10:50:37.397083498 +0100
@@ -1,0 +2,27 @@
+Fri Nov 24 08:48:43 UTC 2017 - mplus...@suse.com
+
+- Explicitly require python3 for python3 version of scons as
+ dependency does not get generated automatically
+
+-------------------------------------------------------------------
+Wed Nov 15 16:28:48 UTC 2017 - astie...@suse.com
+
+- SCons 3.0.1:
+ * Fix return value handling in to_String_for_subst()
+ * Fixe Variables.GenerateHelpText() to now use the sort parameter
+ * Fix Tool loading logic from exploding sys.path with many
+ site_scons/site_tools prepended on py3.
+ * Add additional output with time to process each SConscript file
+ when using --debug=time.
+ * Fix broken subst logic with "$$([...])"
+ * Java/Jar building improvements and fixes
+- Packaging changes:
+ * drop scons-3.0.0-support-python-2-prints.patch, now upstream
+ * Restore python2 support for SLE 12 and Leap 42.x
+
+-------------------------------------------------------------------
+Fri Nov 3 11:22:45 UTC 2017 - mplus...@suse.com
+
+- Switch to python3
+
+-------------------------------------------------------------------
Old:
----
scons-3.0.0-support-python-2-prints.patch
scons-3.0.0.tar.gz
scons-user.html-3.0.0.tar.bz2
New:
----
scons-3.0.1.tar.gz
scons-user.html-3.0.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ scons.spec ++++++
--- /var/tmp/diff_new_pack.33ahM5/_old 2017-11-29 10:50:38.449045335 +0100
+++ /var/tmp/diff_new_pack.33ahM5/_new 2017-11-29 10:50:38.449045335 +0100
@@ -16,13 +16,9 @@
#
-# Potential build fix for SLE11 SLE11SP1
-%if 0%{?suse_version} <= 1120
-%{!?python_sitelib: %global python_sitelib %(python -c "from
distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-%{!?python_sitearch: %global python_sitearch %(python -c "from
distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
-%endif
+%define with_python3 (0%{?suse_version} > 1320)
Name: scons
-Version: 3.0.0
+Version: 3.0.1
Release: 0
Summary: Replacement for Make
License: MIT
@@ -33,15 +29,13 @@
Source1: scons-user.html-%{version}.tar.bz2
# Sets _mandir to _datadir/man instead of _prefix/man
Patch0: %{name}-3.0.0-fix-install.patch
-Patch1: scons-3.0.0-support-python-2-prints.patch
BuildRequires: fdupes
-BuildRequires: python-devel >= 2.7
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%if 0%{?suse_version} > 1110
BuildArch: noarch
-%endif
-%if 0%{?suse_version} >= 1110
-%py_requires
+%if %{with_python3}
+BuildRequires: python3-devel >= 3.5
+Requires: python3-base >= 3.5
+%else
+BuildRequires: python-devel >= 2.7
%endif
%description
@@ -54,7 +48,6 @@
%prep
%setup -q -a1
%patch0 -p1
-%patch1 -p1
# fix libdir for qt
patch -p0 <<EOF
@@ -65,26 +58,41 @@
+ QT_LIBPATH = os.path.join('\$QTDIR', '%{_lib}'),
EOF
+%if %{with_python3}
+sed -i 's|%{_bindir}/env python|%{_bindir}/python3|' script/*
+%else
sed -i 's|%{_bindir}/env python|%{_bindir}/python|' script/*
+%endif
%build
export CFLAGS="%{optflags}"
+%if %{with_python3}
+%python3_build
+%else
python setup.py build
+%endif
%install
+%if %{with_python3}
+%python3_install
+%else
python setup.py \install \
--prefix=%{_prefix} \
--root=%{buildroot} \
--install-lib=%{python_sitelib} \
--no-version-script
+%endif
%fdupes %{buildroot}%{_bindir}
%files
-%defattr(-,root,root)
%doc CHANGES.txt LICENSE.txt README.txt RELEASE.txt scons-user.html
%{_bindir}/*
+%if %{with_python3}
+%{_libexecdir}/scons-%{version}
+%else
%{python_sitelib}/SCons/
%{python_sitelib}/*.egg-info
-%{_mandir}/man1/*.gz
+%endif
+%{_mandir}/man1/*%{ext_man}
%changelog
++++++ scons-3.0.0.tar.gz -> scons-3.0.1.tar.gz ++++++
++++ 3198 lines of diff (skipped)
++++++ scons-user.html-3.0.0.tar.bz2 -> scons-user.html-3.0.1.tar.bz2 ++++++
++++ 2654 lines of diff (skipped)
