Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package zerobranestudio for openSUSE:Factory
checked in at 2021-04-24 23:09:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/zerobranestudio (Old)
and /work/SRC/openSUSE:Factory/.zerobranestudio.new.12324 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "zerobranestudio"
Sat Apr 24 23:09:26 2021 rev:5 rq:888228 version:1.90
Changes:
--------
--- /work/SRC/openSUSE:Factory/zerobranestudio/zerobranestudio.changes
2020-07-01 14:26:39.586761019 +0200
+++
/work/SRC/openSUSE:Factory/.zerobranestudio.new.12324/zerobranestudio.changes
2021-04-24 23:10:40.103523369 +0200
@@ -1,0 +2,5 @@
+Sun Apr 18 15:48:07 UTC 2021 - Callum Farmer <[email protected]>
+
+- Use Lua default on TW and 5.1 on anything else
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zerobranestudio.spec ++++++
--- /var/tmp/diff_new_pack.3Jg7kJ/_old 2021-04-24 23:10:40.579524041 +0200
+++ /var/tmp/diff_new_pack.3Jg7kJ/_new 2021-04-24 23:10:40.579524041 +0200
@@ -15,9 +15,12 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
-
+%if 0%{suse_version} < 1550
%define lua_version 5.1
-
+%define lua_version_nodots 51
+%else
+%define lua_version_nodots %{nil}
+%endif
Name: zerobranestudio
Version: 1.90
Release: 0
@@ -33,21 +36,28 @@
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: hicolor-icon-theme
-BuildRequires: lua51-copas
-BuildRequires: lua51-devel
-BuildRequires: lua51-lpeg
-BuildRequires: lua51-luafilesystem
-BuildRequires: lua51-luasec
-BuildRequires: lua51-luasocket
+BuildRequires: lua%{lua_version_nodots}-devel
+BuildRequires: lua%{lua_version_nodots}-copas
+BuildRequires: lua%{lua_version_nodots}-lpeg
+BuildRequires: lua%{lua_version_nodots}-luafilesystem
+BuildRequires: lua%{lua_version_nodots}-luasec
+%if 0%{suse_version} < 1550
+BuildRequires: lua%{lua_version_nodots}-luasocket
+%else
+BuildRequires: luasocket
+%endif
BuildRequires: wxlua-devel
Requires: libwxlua
-Requires: lua51-BitOp
-Requires: lua51-copas
-Requires: lua51-lpeg
-Requires: lua51-luafilesystem
-Requires: lua51-luasec
-Requires: lua51-luasocket
-Requires: Lua(API) = %lua_version
+Requires: lua%{lua_version_nodots}-copas
+Requires: lua%{lua_version_nodots}-lpeg
+Requires: lua%{lua_version_nodots}-luafilesystem
+Requires: lua%{lua_version_nodots}-luasec
+%if 0%{suse_version} < 1550
+Requires: lua%{lua_version_nodots}-luasocket
+%else
+Requires: luasocket
+%endif
+Requires: Lua(API) = %{lua_version}
Recommends: luajit
Provides: zbstudio
Provides: zerobrane-studio
@@ -70,7 +80,7 @@
%build
cd build
cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DCMAKE_BUILD_TYPE=RelWithDebInfo \
- -DLUA_EXECUTABLE=%{_bindir}/lua%lua_version
+ -DLUA_EXECUTABLE=%{_bindir}/lua%{lua_version}
make %{?_smp_mflags}
@@ -78,7 +88,7 @@
%cmake_install
cat >> %{buildroot}%{_datadir}/zbstudio/cfg/user.lua <<EOF
-path.lua = '%{_bindir}/lua%lua_version'
+path.lua = '%{_bindir}/lua%{lua_version}'
path.lua52 = '%{_bindir}/lua5.2'
EOF
