Accepting request 333496 from home:pluskalm:branches:devel:tools:building

- Update to 2.4.0
  * Switched several core classes to use "slots", to reduce the 
    overall memory consumption in large projects (fixes #2180, 
    #2178, #2198)
  * Memoizer counting uses decorators now, instead of the old 
    metaclasses approach.
  * Fixed typo in SWIGPATH description

OBS-URL: https://build.opensuse.org/request/show/333496
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/scons?expand=0&rev=38

scons-1.2.0-fix-install.patch

@@ -2,11 +2,11 @@
  setup.py |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-Index: scons-2.3.1/setup.py
+Index: scons-2.4.0/setup.py
 ===================================================================
---- scons-2.3.1.orig/setup.py	2014-04-02 23:31:21.000000000 +0100
-+++ scons-2.3.1/setup.py	2014-04-02 23:33:54.000000000 +0100
-@@ -365,7 +365,7 @@ class install_data(_install_data):
+--- 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:
@@ -15,7 +15,7 @@ Index: scons-2.3.1/setup.py
              self.data_files = [(dir, man_pages)]
              man_dir = os.path.join(self.install_dir, dir)
              msg = "Installed SCons man pages into %s" % man_dir
-@@ -483,7 +483,7 @@ arguments = {
+@@ -493,7 +493,7 @@ arguments = {
                                                    'docbook-xsl-1.76.1/xhtml/*',
                                                    'docbook-xsl-1.76.1/xhtml-1_1/*',
                                                    'utils/*']},

scons-1.2.0-noenv.patch

@@ -1,4 +1,6 @@
---- script/scons
+Index: script/scons
+===================================================================
+--- script/scons.orig
 +++ script/scons
 @@ -1,4 +1,4 @@
 -#! /usr/bin/env python
@@ -6,7 +8,9 @@
  #
  # SCons - a Software Constructor
  #
---- script/scons-time
+Index: script/scons-time
+===================================================================
+--- script/scons-time.orig
 +++ script/scons-time
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
@@ -14,7 +18,9 @@
  #
  # scons-time - run SCons timings and collect statistics
  #
---- script/sconsign
+Index: script/sconsign
+===================================================================
+--- script/sconsign.orig
 +++ script/sconsign
 @@ -1,4 +1,4 @@
 -#! /usr/bin/env python

scons-2.3.6.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:98adaa351d8f4e4068a5bf1894bdd7f85b390c8c3f80d437cf8bb266012404df
-size 628985

scons-2.4.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1892f472934f1f5947d0e4c5d01e3b992641425553faab4062ddb8e3504c1fb2
+size 632723

scons-user.html-2.3.6.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f47277549e8637082508e462fe5db832be36f91e583f8e4ffe8caaa77ce43aaa
-size 151714

scons-user.html-2.4.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:33dd2cb6b115723460e2de4a0280770de94a076ba2b68adc048d0885e632ef3e
+size 151478

scons.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Sep 24 16:47:39 UTC 2015 - mpluskal@suse.com
+
+- Update to 2.4.0
+  * Switched several core classes to use "slots", to reduce the 
+    overall memory consumption in large projects (fixes #2180, 
+    #2178, #2198)
+  * Memoizer counting uses decorators now, instead of the old 
+    metaclasses approach.
+  * Fixed typo in SWIGPATH description
+
 -------------------------------------------------------------------
 Tue Aug 11 08:56:35 UTC 2015 - astieger@suse.com
 

scons.spec

@@ -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.3.6
+Version:        2.4.0
 Release:        0
 Summary:        Replacement for Make
 License:        MIT
@@ -42,8 +42,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version} > 1110
 BuildArch:      noarch
 %endif
-%if 0%{?suse_version} == 1110
-%{py_requires}
+%if 0%{?suse_version} >= 1110
+%py_requires
 %endif
 
 %description
@@ -56,7 +56,7 @@ full power of Python to control compilation.
 %prep
 %setup -q -a1
 %patch0 -p1
-%patch1
+%patch1 -p0
 
 # fix libdir for qt
 patch -p0 <<EOF
@@ -64,10 +64,10 @@ patch -p0 <<EOF
 +++ engine/SCons/Tool/qt.py
 @@ -247,1 +247,1 @@
 -                   QT_LIBPATH = os.path.join('\$QTDIR', 'lib'),
-+                   QT_LIBPATH = os.path.join('\$QTDIR', '%_lib'),
++                   QT_LIBPATH = os.path.join('\$QTDIR', '%{_lib}'),
 EOF
 
-sed -i 's|/usr/bin/env python|/usr/bin/python|' script/*
+sed -i 's|%{_bindir}/env python|%{_bindir}/python|' script/*
 
 %build
 export CFLAGS="%{optflags}"