diff --git a/lua-toluapp.changes b/lua-toluapp.changes index 60d8eca..ab44d80 100644 --- a/lua-toluapp.changes +++ b/lua-toluapp.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Feb 26 03:51:05 UTC 2019 - Marguerite Su + +- 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 + ------------------------------------------------------------------- Thu Jan 25 20:16:23 UTC 2018 - tchvatal@suse.com diff --git a/lua-toluapp.spec b/lua-toluapp.spec index f5fed1e..b565123 100644 --- a/lua-toluapp.spec +++ b/lua-toluapp.spec @@ -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 @@ Patch1: toluapp-versioned-shared-lib.patch Patch2: toluapp-build-compare.patch Patch3: tolua++-1.0.93-lua52.patch Patch4: toluapp-scons-py3.patch +#PATCH-FIX-UPSTREAM marguerite@opensuse.org - 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 @@ This package provides development headers for tolua++. %patch1 -p1 %patch2 -p1 %patch4 -p1 +%patch5 -p1 %if "%{flavor}" != "lua51" %patch3 -p1 %endif diff --git a/scons-0.98.1-Options-deprecated.patch b/scons-0.98.1-Options-deprecated.patch new file mode 100644 index 0000000..102c494 --- /dev/null +++ b/scons-0.98.1-Options-deprecated.patch @@ -0,0 +1,17 @@ +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'])