Hello community, here is the log from the commit of package lua-toluapp for openSUSE:Factory checked in at 2019-02-26 22:20:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lua-toluapp (Old) and /work/SRC/openSUSE:Factory/.lua-toluapp.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lua-toluapp" Tue Feb 26 22:20:59 2019 rev:6 rq:679087 version:1.0.93 Changes: -------- --- /work/SRC/openSUSE:Factory/lua-toluapp/lua-toluapp.changes 2018-02-02 22:23:29.226500629 +0100 +++ /work/SRC/openSUSE:Factory/.lua-toluapp.new.28833/lua-toluapp.changes 2019-02-26 22:22:34.318062519 +0100 @@ -1,0 +2,8 @@ +Tue Feb 26 03:51:05 UTC 2019 - Marguerite Su <[email protected]> + +- fix tumbleweed build +- add scons-0.98.1-Options-deprecated.patch + * Options object has been deprecated since scons 0.98.1 + use newer Variables object if available + +------------------------------------------------------------------- New: ---- scons-0.98.1-Options-deprecated.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lua-toluapp.spec ++++++ --- /var/tmp/diff_new_pack.9sAf5c/_old 2019-02-26 22:22:34.786062353 +0100 +++ /var/tmp/diff_new_pack.9sAf5c/_new 2019-02-26 22:22:34.790062351 +0100 @@ -1,7 +1,7 @@ # # spec file for package lua-toluapp # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -41,6 +41,8 @@ Patch2: toluapp-build-compare.patch Patch3: tolua++-1.0.93-lua52.patch Patch4: toluapp-scons-py3.patch +#PATCH-FIX-UPSTREAM [email protected] - scons Options() is deprecated in 0.98.1, use Variables() instead +Patch5: scons-0.98.1-Options-deprecated.patch BuildRequires: %{flavor}-devel BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -95,6 +97,7 @@ %patch1 -p1 %patch2 -p1 %patch4 -p1 +%patch5 -p1 %if "%{flavor}" != "lua51" %patch3 -p1 %endif ++++++ scons-0.98.1-Options-deprecated.patch ++++++ Index: toluapp-1.0.93/SConstruct =================================================================== --- toluapp-1.0.93.orig/SConstruct +++ toluapp-1.0.93/SConstruct @@ -16,7 +16,11 @@ elif 'msvc' in env['TOOLS']: else: options_file = "posix" -opts = Options(["config_"+options_file+".py", "custom.py", "custom_"+options_file+".py"], ARGUMENTS) +try: + opts = Variables(["config_"+options_file+".py", "custom.py", "custom_"+options_file+".py"], ARGUMENTS) +except NameError: + opts = Options(["config_"+options_file+".py", "custom.py", "custom_"+options_file+".py"], ARGUMENTS) + opts.Add('CC', 'The C compiler.') opts.Add('CXX', 'The C++ compiler (for the tests)') opts.Add('CCFLAGS', 'Flags for the compiler.', ['-O2', '-Wall'])
