diff --git a/lua-toluapp.changes b/lua-toluapp.changes index ab44d80..9ab2234 100644 --- a/lua-toluapp.changes +++ b/lua-toluapp.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 2 21:23:34 UTC 2020 - Max Lin + +- Fix build with scons 3.1.2 - env.Copy() has been depreacated + * add toluapp-fix-deprecared-env-copy.patch + ------------------------------------------------------------------- Tue Feb 26 03:51:05 UTC 2019 - Marguerite Su diff --git a/lua-toluapp.spec b/lua-toluapp.spec index b565123..6a217ca 100644 --- a/lua-toluapp.spec +++ b/lua-toluapp.spec @@ -1,7 +1,7 @@ # # spec file for package lua-toluapp # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -34,7 +34,7 @@ Release: 0 Summary: C/C++ with Lua Integration Tool License: MIT Group: Development/Languages/Other -Url: https://github.com/LuaDist/toluapp +URL: https://github.com/LuaDist/toluapp Source: https://github.com/LuaDist/toluapp/archive/%{version}/toluapp-%{version}.tar.gz Patch0: toluapp-libdir.patch Patch1: toluapp-versioned-shared-lib.patch @@ -43,6 +43,8 @@ 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 +#PATCH-FIX-OPENSUSE mlin@suse.com - scons env.Copy() has been deprecated, use env.Clone() instead if needed +Patch6: toluapp-fix-deprecared-env-copy.patch BuildRequires: %{flavor}-devel BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -98,6 +100,7 @@ This package provides development headers for tolua++. %patch2 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %if "%{flavor}" != "lua51" %patch3 -p1 %endif diff --git a/toluapp-fix-deprecared-env-copy.patch b/toluapp-fix-deprecared-env-copy.patch new file mode 100644 index 0000000..fa650c2 --- /dev/null +++ b/toluapp-fix-deprecared-env-copy.patch @@ -0,0 +1,14 @@ +Index: b/src/tests/SCsub +=================================================================== +--- a/src/tests/SCsub ++++ b/src/tests/SCsub +@@ -1,5 +1,8 @@ + Import('env') +-env_tests = env.Copy() ++try: ++ env_tests = env.Copy() ++except AttributeError: ++ env_tests = env.Clone() + + env_tests.LuaBinding('tclassbind.cpp', 'tclass.pkg', 'tclass', use_own=1, use_typeid=1) +