Accepting request 531448 from devel:tools:building

SCons 3.0.0 OBS-URL: https://build.opensuse.org/request/show/531448 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/scons?expand=0&rev=34
2017-10-10 09:34:55 +00:00 · 2017-10-10 09:34:55 +00:00 · 5a7a043ca3
commit 5a7a043ca3
parent 3a4419d346 9f4f0f0277
11 changed files with 146 additions and 73 deletions
--- a/scons-1.2.0-fix-install.patch
+++ b/scons-1.2.0-fix-install.patch
@ -1,26 +0,0 @@
---
- setup.py |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: scons-2.4.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):
-             if is_win32:
-                 dir = 'Doc'
-             else:
-                dir = os.path.join('man', 'man1')
-+                dir = os.path.join('share', 'man', 'man1')
-             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,
--- a/scons-1.2.0-noenv.patch
+++ b/scons-1.2.0-noenv.patch
@ -1,30 +0,0 @@
-Index: script/scons
-===================================================================
--- script/scons.orig
-+++ script/scons
-@@ -1,4 +1,4 @@
-#! /usr/bin/env python
-+#!/usr/bin/python
- #
- # SCons - a Software Constructor
- #
-Index: script/scons-time
-===================================================================
--- script/scons-time.orig
-+++ script/scons-time
-@@ -1,4 +1,4 @@
-#!/usr/bin/env python
-+#!/usr/bin/python
- #
- # scons-time - run SCons timings and collect statistics
- #
-Index: script/sconsign
-===================================================================
--- script/sconsign.orig
-+++ script/sconsign
-@@ -1,4 +1,4 @@
-#! /usr/bin/env python
-+#!/usr/bin/python
- #
- # SCons - a Software Constructor
- #
--- a/scons-2.5.1.tar.gz
+++ b/scons-2.5.1.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0b25218ae7b46a967db42f2a53721645b3d42874a65f9552ad16ce26d30f51f2
-size 620909
--- a/scons-3.0.0-fix-install.patch
+++ b/scons-3.0.0-fix-install.patch
@ -0,0 +1,26 @@
+---
+ setup.py |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: scons-3.0.0/setup.py
+===================================================================
+--- 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:
+-                dir = os.path.join('man', 'man1')
+                dir = os.path.join('share', 'man', 'man1')
+             self.data_files = [(dir, man_pages)]
+             man_dir = os.path.join(self.install_dir, dir)
+             msg = "Installed SCons man pages into %s" % man_dir
+@@ -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,
--- a/scons-3.0.0-support-python-2-prints.patch
+++ b/scons-3.0.0-support-python-2-prints.patch
@ -0,0 +1,91 @@
+From 2e0de3c55f22b3eaa7767b69740b898f3d2f46bf Mon Sep 17 00:00:00 2001
+From: Thomas Berg <merlin66b@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:
--- a/scons-3.0.0.tar.gz
+++ b/scons-3.0.0.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0f532f405b98c60b731d231b3c503ab5bf47d89a6f66f70cb62c9249e9f45216
+size 630418
--- a/4
+++ b/4
@ -1,4 +0,0 @@
-# Source URL pointed to upstream release, tar.gz
-addFilter("W: source-or-patch-not-bzipped")
-# It's not really an extension/module (is it?)
-addFilter("W: python-naming-policy-not-applied")
--- a/scons-user.html-2.5.1.tar.bz2
+++ b/scons-user.html-2.5.1.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6250b583d1d905b479bf75b7d1e48fda11009abfb10c41b8e7545e76472388ac
-size 152937
--- a/scons-user.html-3.0.0.tar.bz2
+++ b/scons-user.html-3.0.0.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3e0198ce5b1b561a8ba6887be2b9eb38dac3c7b56d269188a9740252c3fdfe51
+size 153266
--- a/scons.changes
+++ b/scons.changes
@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Wed Oct  4 19:09:07 UTC 2017 - astieger@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
+
 -------------------------------------------------------------------
 Tue Nov 22 12:44:48 UTC 2016 - astieger@suse.com

--- a/scons.spec
+++ b/scons.spec
@ -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 @@ Url:            http://www.scons.org/
 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 @@ full power of Python to control compilation.
 %prep
 %setup -q -a1
 %patch0 -p1
-%patch1 -p0
+%patch1 -p1

 # fix libdir for qt
 patch -p0 <<EOF