Accepting request 587455 from home:plater

Added scons-fixpy3errors.patch to address boo#1083830

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

scons-fixpy3errors.patch

@@ -0,0 +1,13 @@
+Index: engine/SCons/SConf.py
+===================================================================
+--- engine/SCons/SConf.py.orig	2017-11-14 23:16:57.000000000 +0200
++++ engine/SCons/SConf.py	2018-03-12 10:29:24.210006787 +0200
+@@ -168,7 +168,7 @@ def _createSource( target, source, env )
+     fd.close()
+ def _stringSource( target, source, env ):
+     return (str(target[0]) + ' <-\n  |' +
+-            source[0].get_contents().decode().replace( '\n', "\n  |" ) )
++            source[0].get_text_contents().decode().replace( '\n', "\n  |" ) )
+ 
+ class SConfBuildInfo(SCons.Node.FS.FileBuildInfo):
+     """

scons.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Mar 15 09:47:06 UTC 2018 - davejplater@gmail.com
+
+- Added scons-fixpy3errors.patch to address boo#1083830
+
 -------------------------------------------------------------------
 Fri Nov 24 08:48:43 UTC 2017 - mpluskal@suse.com
 

scons.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package scons
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -29,6 +29,7 @@ Source0:        http://prdownloads.sourceforge.net/scons/%{name}-%{version}.tar.
 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-fixpy3errors.patch
 BuildRequires:  fdupes
 BuildArch:      noarch
 %if %{with_python3}
@@ -48,6 +49,7 @@ full power of Python to control compilation.
 %prep
 %setup -q -a1
 %patch0 -p1
+%patch1
 
 # fix libdir for qt
 patch -p0 <<EOF