Hello community,
here is the log from the commit of package scons for openSUSE:Factory checked
in at 2017-10-10 11:34:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/scons (Old)
and /work/SRC/openSUSE:Factory/.scons.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scons"
Tue Oct 10 11:34:55 2017 rev:34 rq:531448 version:3.0.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/scons/scons.changes 2016-11-24
21:19:22.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.scons.new/scons.changes 2017-10-10
11:35:09.828072506 +0200
@@ -1,0 +2,18 @@
+Wed Oct 4 19:09:07 UTC 2017 - astie...@suse.com
+
+- SCons 3.0.0, a major release:
+ * Some targets may rebuild when upgrading.
+ * Significant changes in some python action signatures
+ * Supports Python version earlier than 2.7 and 3.5+
+ * Switching between PY 2.7 and PY 3.5, 3.6 will cause rebuilds
+ * Updated language support: D, LaTeX, docbook
+ * Remove deprecated tools CVS, Perforce, BitKeeper, RCS, SCCS, Subversion
+ * Removed deprecated module SCons.Sig
+- refresh scons-1.2.0-fix-install.patch to
+ scons-3.0.0-fix-install.patch
+- drop scons-1.2.0-noenv.patch, fix is done in spec
+- drop rpmlintrc, no longer needed
+- prevent a regression that would require Python3 syntax for
+ print statements, add scons-3.0.0-support-python-2-prints.patch
+
+-------------------------------------------------------------------
Old:
----
scons-1.2.0-fix-install.patch
scons-1.2.0-noenv.patch
scons-2.5.1.tar.gz
scons-rpmlintrc
scons-user.html-2.5.1.tar.bz2
New:
----
scons-3.0.0-fix-install.patch
scons-3.0.0-support-python-2-prints.patch
scons-3.0.0.tar.gz
scons-user.html-3.0.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ scons.spec ++++++
--- /var/tmp/diff_new_pack.7da8WJ/_old 2017-10-10 11:35:10.488043541 +0200
+++ /var/tmp/diff_new_pack.7da8WJ/_new 2017-10-10 11:35:10.496043189 +0200
@@ -1,7 +1,7 @@
#
# spec file for package scons
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -22,7 +22,7 @@
%{!?python_sitearch: %global python_sitearch %(python -c "from
distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%endif
Name: scons
-Version: 2.5.1
+Version: 3.0.0
Release: 0
Summary: Replacement for Make
License: MIT
@@ -31,11 +31,9 @@
Source0:
http://prdownloads.sourceforge.net/scons/%{name}-%{version}.tar.gz
#http://www.scons.org/doc/%%{version}/HTML/scons-user.html
Source1: scons-user.html-%{version}.tar.bz2
-# rpmlintrc
-Source99: %{name}-rpmlintrc
# Sets _mandir to _datadir/man instead of _prefix/man
-Patch0: %{name}-1.2.0-fix-install.patch
-Patch1: %{name}-1.2.0-noenv.patch
+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
@@ -56,7 +54,7 @@
%prep
%setup -q -a1
%patch0 -p1
-%patch1 -p0
+%patch1 -p1
# fix libdir for qt
patch -p0 <<EOF
++++++ scons-1.2.0-fix-install.patch -> scons-3.0.0-fix-install.patch ++++++
--- /work/SRC/openSUSE:Factory/scons/scons-1.2.0-fix-install.patch
2015-10-03 20:29:37.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.scons.new/scons-3.0.0-fix-install.patch
2017-10-10 11:35:09.756075666 +0200
@@ -2,11 +2,11 @@
setup.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
-Index: scons-2.4.0/setup.py
+Index: scons-3.0.0/setup.py
===================================================================
---- scons-2.4.0.orig/setup.py
-+++ scons-2.4.0/setup.py
-@@ -375,7 +375,7 @@ class install_data(_install_data):
+--- scons-3.0.0.orig/setup.py
++++ scons-3.0.0/setup.py
+@@ -386,7 +386,7 @@ class install_data(_install_data):
if is_win32:
dir = 'Doc'
else:
@@ -15,12 +15,12 @@
self.data_files = [(dir, man_pages)]
man_dir = os.path.join(self.install_dir, dir)
msg = "Installed SCons man pages into %s" % man_dir
-@@ -493,7 +493,7 @@ arguments = {
-
'docbook-xsl-1.76.1/xhtml/*',
-
'docbook-xsl-1.76.1/xhtml-1_1/*',
- 'utils/*']},
-- 'data_files' : [('man/man1', man_pages)],
-+ 'data_files' : [('share/man/man1', man_pages)],
- 'scripts' : scripts,
- 'cmdclass' : {'install' : install,
- 'install_lib' : install_lib,
+@@ -506,7 +506,7 @@ arguments = {
+ 'docbook-xsl-1.76.1/xhtml/*',
+ 'docbook-xsl-1.76.1/xhtml-1_1/*',
+ 'utils/*']},
+- 'data_files': [('man/man1', man_pages)],
++ 'data_files': [('share/man/man1', man_pages)],
+ 'scripts': scripts,
+ 'cmdclass': {'install': install,
+ 'install_lib': install_lib,
++++++ scons-3.0.0-support-python-2-prints.patch ++++++
>From 2e0de3c55f22b3eaa7767b69740b898f3d2f46bf Mon Sep 17 00:00:00 2001
From: Thomas Berg <merlin...@gmail.com>
Date: Wed, 20 Sep 2017 13:24:22 +0200
Subject: [PATCH] Support python 2 print statements in SConscripts
This fixes a regression introduced in scons-3.0.0, where
SConscripts containing python 2 print statements would cause
syntax errors even when executing scons with python 2.7.
This ensures backward compatibility, allowing users to build
legacy code with scons-3.0.0 without having to patch it.
---
src/engine/SCons/Script/SConscript.py | 2 --
test/print_statement.py | 56 +++++++++++++++++++++++++++++++++++
3 files changed, 59 insertions(+), 2 deletions(-)
create mode 100644 test/print_statement.py
Index: scons-3.0.0/engine/SCons/Script/SConscript.py
===================================================================
--- scons-3.0.0.orig/engine/SCons/Script/SConscript.py
+++ scons-3.0.0/engine/SCons/Script/SConscript.py
@@ -5,8 +5,6 @@ files.
"""
-from __future__ import print_function
-
#
# Copyright (c) 2001 - 2017 The SCons Foundation
#
Index: scons-3.0.0/print_statement.py
===================================================================
--- /dev/null
+++ scons-3.0.0/print_statement.py
@@ -0,0 +1,56 @@
+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+import sys
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+
+test.write('SConstruct', """\
+print('python 3 style statement')
+Exit(0)
+""")
+
+test.run()
+
+test.write('SConstruct', """\
+print 'python 2 style statement'
+Exit(0)
+""")
+
+if sys.version_info >= (3,0):
+ test.skip_test('Python 2 print statement test, skipping on Python 3.\n')
+else:
+ test.run()
+
+test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
++++++ scons-2.5.1.tar.gz -> scons-3.0.0.tar.gz ++++++
++++ 20851 lines of diff (skipped)
++++++ scons-user.html-2.5.1.tar.bz2 -> scons-user.html-3.0.0.tar.bz2 ++++++
++++ 3706 lines of diff (skipped)
