diff --git a/_multibuild b/_multibuild index a01285a..72d2b45 100644 --- a/_multibuild +++ b/_multibuild @@ -1,4 +1,5 @@ lua51 lua53 +lua54 diff --git a/lua-luasql.changes b/lua-luasql.changes index f003788..eede5a7 100644 --- a/lua-luasql.changes +++ b/lua-luasql.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 6 19:06:15 UTC 2020 - Matej Cepl + +- Add lua54 as new build target + ------------------------------------------------------------------- Wed Dec 5 22:14:00 CET 2018 - mcepl@suse.com diff --git a/lua-luasql.spec b/lua-luasql.spec index fd7127b..2e90554 100644 --- a/lua-luasql.spec +++ b/lua-luasql.spec @@ -1,7 +1,7 @@ # -# spec file for package luasql +# spec file for package lua-luasql # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # Copyright (c) 2014 Malcolm J Lewis # # All modifications and additions to the file contributed by third parties @@ -16,6 +16,7 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + %global flavor @BUILD_FLAVOR@%{nil} %define flavor_dec $(c=%{flavor}; echo ${c:0:-1}.${c: -1}) %define flavor_ver %{lua:ver, ok = string.gsub(rpm.expand("%{flavor}"), "lua(%d)(%d)", "%1.%2"); print(ver)} @@ -41,13 +42,13 @@ Source0: https://github.com/keplerproject/luasql/archive/v%{version}/%{mo # PATCH-FIX-OPENSUSE luasql-fix-configuration.patch malcolmlewis@opensuse.org -- Clean up building and add rpm optflags. Patch0: luasql-fix-configuration.patch BuildRequires: %{flavor}-devel +BuildRequires: libiodbc-devel BuildRequires: libmysqlclient-devel +BuildRequires: pkg-config BuildRequires: postgresql-devel BuildRequires: sqlite3-devel -BuildRequires: libiodbc-devel -BuildRequires: pkg-config -Requires: libmariadb3 Requires: %{flavor} +Requires: libmariadb3 %description A simple interface from Lua to a DBMS. It enables a Lua program to: @@ -73,7 +74,6 @@ make %{?_smp_mflags} \ make %{?_smp_mflags} \ DRIVER_INCS="-I%{_includedir}" DRIVER_LIBS_odbc="-liodbc" odbc - %install %make_install LUA_LIBDIR='$(DESTDIR)%{lua_archdir}' sqlite3 %make_install LUA_LIBDIR='$(DESTDIR)%{lua_archdir}' postgres