From 39636f5b629cea8674c357285508427dd84e0032f631daada2665c3f25b79bf3 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 31 Oct 2018 09:26:34 +0000 Subject: [PATCH 1/2] - Upgrade to 3.0.4 * Version 3.* is a large rewrite including changes of format, so full changelog is too long, and can be found on https://github.com/luarocks/luarocks/blob/master/CHANGELOG.md OBS-URL: https://build.opensuse.org/package/show/devel:languages:lua/lua-luarocks?expand=0&rev=9 --- lua-luarocks.changes | 8 ++++++++ lua-luarocks.spec | 25 ++++++++++++------------- luarocks-2.4.2.tar.gz | 3 --- luarocks-3.0.4.tar.gz | 3 +++ 4 files changed, 23 insertions(+), 16 deletions(-) delete mode 100644 luarocks-2.4.2.tar.gz create mode 100644 luarocks-3.0.4.tar.gz diff --git a/lua-luarocks.changes b/lua-luarocks.changes index 4c189ae..456b466 100644 --- a/lua-luarocks.changes +++ b/lua-luarocks.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Oct 31 07:48:19 CET 2018 - mcepl@suse.com + +- Upgrade to 3.0.4 + * Version 3.* is a large rewrite including changes of format, + so full changelog is too long, and can be found on + https://github.com/luarocks/luarocks/blob/master/CHANGELOG.md + ------------------------------------------------------------------- Mon Oct 30 14:45:32 UTC 2017 - jmatejek@suse.com diff --git a/lua-luarocks.spec b/lua-luarocks.spec index 4e3eeff..56d6a93 100644 --- a/lua-luarocks.spec +++ b/lua-luarocks.spec @@ -1,7 +1,7 @@ # # spec file for package lua-luarocks # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2012 Togan Muftuoglu toganm@opensuse.org # # All modifications and additions to the file contributed by third parties @@ -13,19 +13,20 @@ # 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/ # -%define flavor @BUILD_FLAVOR@ +# %%define flavor @BUILD_FLAVOR@ +%define flavor lua51 %define mod_name luarocks %define lua_value %(echo "%{flavor}" |sed -e 's:lua::') -Version: 2.4.2 +Version: 3.0.4 Release: 0 Summary: A deployment and management system for Lua modules License: MIT Group: Development/Languages/Other -Url: https://luarocks.org +URL: https://luarocks.org Source: https://github.com/luarocks/luarocks/archive/v%{version}.tar.gz#/%{mod_name}-%{version}.tar.gz BuildRequires: %{flavor}-devel BuildRequires: curl @@ -42,6 +43,8 @@ ExclusiveArch: do_not_build %else Name: %{flavor}-%{mod_name} %endif +Requires(post): update-alternatives +Requires(postun): update-alternatives %description LuaRocks allows you to install Lua modules as self-contained packages @@ -60,18 +63,13 @@ repositories, and multiple local rocks trees. ./configure \ --prefix=%{_prefix} \ --lua-version=%{lua_version} \ - --with-downloader=curl \ - --with-md5-checker=openssl \ --versioned-rocks-dir make %{?_smp_mflags} build %install %make_install -# Add C module lib directory to fix "built" rocks not working -# See https://github.com/keplerproject/luarocks/issues/416 -%if %{_lib}==lib64 -echo -e -n "\nlib_modules_path=\"/%{_lib}/lua/\"..lua_version" >> %{buildroot}%{_sysconfdir}/luarocks/config-%{lua_version}.lua -%endif +mv %{buildroot}%{_bindir}/luarocks{,-%{lua_version}} +mv %{buildroot}%{_bindir}/luarocks-admin{,-%{lua_version}} # update-alternatives mkdir -p %{buildroot}%{_sysconfdir}/alternatives/ @@ -90,7 +88,8 @@ if [ "$1" = 0 ] ; then fi %files -%doc COPYING README.md +%license COPYING +%doc README.md %dir %{_sysconfdir}/luarocks %config(noreplace) %{_sysconfdir}/luarocks/config-%{lua_version}.lua %ghost %{_sysconfdir}/alternatives/luarocks diff --git a/luarocks-2.4.2.tar.gz b/luarocks-2.4.2.tar.gz deleted file mode 100644 index ee9e775..0000000 --- a/luarocks-2.4.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eef88c2429c715a7beb921e4b1ba571dddb7c74a250fbb0d3cc0d4be7a5865d9 -size 4027001 diff --git a/luarocks-3.0.4.tar.gz b/luarocks-3.0.4.tar.gz new file mode 100644 index 0000000..b03147e --- /dev/null +++ b/luarocks-3.0.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ce82a2ebe8b5707d18aa99b56cbb995147fee55749f0d994157e8ed62d29f2d4 +size 5374421 From 6808a978ffc2025cf9518efa9dce31eb9b046222f2c2294024363b85b86d067d Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Mon, 27 May 2019 04:11:43 +0000 Subject: [PATCH 2/2] Accepting request 705509 from home:jayvdb:branches:devel:languages:lua Fix Lua 5.3 and Update to v3.1.2 OBS-URL: https://build.opensuse.org/request/show/705509 OBS-URL: https://build.opensuse.org/package/show/devel:languages:lua/lua-luarocks?expand=0&rev=10 --- lua-luarocks.changes | 28 +++++++++++++++++++++++++--- lua-luarocks.spec | 9 ++++----- luarocks-3.0.4.tar.gz | 3 --- luarocks-3.1.2.tar.gz | 3 +++ 4 files changed, 32 insertions(+), 11 deletions(-) delete mode 100644 luarocks-3.0.4.tar.gz create mode 100644 luarocks-3.1.2.tar.gz diff --git a/lua-luarocks.changes b/lua-luarocks.changes index 456b466..c78cce4 100644 --- a/lua-luarocks.changes +++ b/lua-luarocks.changes @@ -1,10 +1,32 @@ +------------------------------------------------------------------- +Sun May 26 16:44:38 UTC 2019 - John Vandenberg + +- Re-enable building for Lua 5.3 +- Add notable enhancements in changelog entry for v3.x update +- Update to v3.1.2 + * cmd: fix handling of unconfigured paths in get_lua_version +- from v3.1.1 + * fix: don't try to look in home_tree if not available + * refactor: reorganise code in get_lua_version + * fix: handle errors in lua wrapper check +- from v3.1.0 + * Includes many fixes and enhancements; full changelog is at + https://github.com/luarocks/luarocks/compare/v3.0.4...v3.1.0 + ------------------------------------------------------------------- Wed Oct 31 07:48:19 CET 2018 - mcepl@suse.com - Upgrade to 3.0.4 - * Version 3.* is a large rewrite including changes of format, - so full changelog is too long, and can be found on - https://github.com/luarocks/luarocks/blob/master/CHANGELOG.md + * Version 3.x is a large rewrite; full changelog is at + https://github.com/luarocks/luarocks/blob/master/CHANGELOG.md + * New rockspec format + * New commands, including luarocks init for per-project workflows + * New flags, including --lua-dir and --lua-version for using + multiple Lua installs with a single LuaRocks + * New build system + * General improvements, including namespaces + * User-visible changes, including some breaking changes + * Internal changes ------------------------------------------------------------------- Mon Oct 30 14:45:32 UTC 2017 - jmatejek@suse.com diff --git a/lua-luarocks.spec b/lua-luarocks.spec index 56d6a93..3bcabdc 100644 --- a/lua-luarocks.spec +++ b/lua-luarocks.spec @@ -1,7 +1,7 @@ # # spec file for package lua-luarocks # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2012 Togan Muftuoglu toganm@opensuse.org # # All modifications and additions to the file contributed by third parties @@ -17,11 +17,10 @@ # -# %%define flavor @BUILD_FLAVOR@ -%define flavor lua51 +%define flavor @BUILD_FLAVOR@ %define mod_name luarocks %define lua_value %(echo "%{flavor}" |sed -e 's:lua::') -Version: 3.0.4 +Version: 3.1.2 Release: 0 Summary: A deployment and management system for Lua modules License: MIT @@ -89,7 +88,7 @@ fi %files %license COPYING -%doc README.md +%doc README.md CHANGELOG.md %dir %{_sysconfdir}/luarocks %config(noreplace) %{_sysconfdir}/luarocks/config-%{lua_version}.lua %ghost %{_sysconfdir}/alternatives/luarocks diff --git a/luarocks-3.0.4.tar.gz b/luarocks-3.0.4.tar.gz deleted file mode 100644 index b03147e..0000000 --- a/luarocks-3.0.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ce82a2ebe8b5707d18aa99b56cbb995147fee55749f0d994157e8ed62d29f2d4 -size 5374421 diff --git a/luarocks-3.1.2.tar.gz b/luarocks-3.1.2.tar.gz new file mode 100644 index 0000000..3d40742 --- /dev/null +++ b/luarocks-3.1.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:11fc78e8aaa23987065e1e4281bec23e94481510e820376bcfe84976332ebb20 +size 5353285