PR#2: Update to latest upstream, add dependencies - rpms/luarocks

rpms / luarocks

#2 Update to latest upstream, add dependencies

Merged 2 years ago by salimma. Opened 2 years ago by ferdnyc.

rpms/ ferdnyc/luarocks update-new-deps into rawhide

Recommend lua-devel, cmake, make; require gcc

FeRD (Frank Dana) • 2 years ago

dc92af2

Update to latest 3.9.1 release

FeRD (Frank Dana) • 2 years ago

71c3cce

.gitignore

file modified

		`@@ -1,1 +1,3 @@`
		`/luarocks-3.7.0.tar.gz`
		`+ /luarocks-3.9.0.tar.gz`
		`+ /luarocks-3.9.1.tar.gz`

luarocks-3.5.0-dynamic_libdir.patch

file removed

-40

		`@@ -1,40 +0,0 @@`
		`- From aed621d5db1d521404238a92f16b879180a469a2 Mon Sep 17 00:00:00 2001`
		`- From: Michel Alexandre Salim <michel@michel-slm.name>`
		`- Date: Wed, 27 Jan 2021 20:32:07 -0800`
		`- Subject: [PATCH] Dynamically detect libdir on Linux`
		`-`
		`- Some Linux distributions (e.g. Fedora, CentOS) put 64-bit libraries`
		- in `/usr/lib64` rather than `/usr/lib`. On such systems `luarocks`
		- should use `lib64` rather than `lib`.
		`-`
		`- Signed-off-by: Michel Alexandre Salim <michel@michel-slm.name>`
		`- ---`
		`- src/luarocks/core/cfg.lua \| 12 ++++++++++++`
		`- 1 file changed, 12 insertions(+)`
		`-`
		`- diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua`
		`- index 4ac5ee2..c7d2cb2 100644`
		`- --- a/src/luarocks/core/cfg.lua`
		`- +++ b/src/luarocks/core/cfg.lua`
		`- @@ -397,6 +397,18 @@ local function make_defaults(lua_version, target_cpu, platforms, home)`
		`- defaults.variables.CFLAGS = defaults.variables.CFLAGS.." -fPIC"`
		`- end`
		`- defaults.web_browser = "xdg-open"`
		`- + if platforms.linux then`
		`- + -- inline code from fs/linux.lua since`
		`- + -- luarocks.fs can't be required here`
		`- + -- (circular dependencies)`
		`- + local fd, _, code = io.open("/usr/lib64", "r")`
		`- + if code ~= 2 then`
		`- + defaults.lib_modules_path = "/lib64/lua/"..lua_version`
		`- + end`
		`- + if fd then`
		`- + fd:close()`
		`- + end`
		`- + end`
		`- end`
		`-`
		`- if platforms.cygwin then`
		`- --`
		`- 2.29.2`
		`-`

luarocks.spec

file modified

+11 -4

		`@@ -1,12 +1,11 @@`
		`Name: luarocks`
		`- Version: 3.7.0`
		`- Release: 4%{?dist}`
		`+ Version: 3.9.1`
		`+ Release: 1%{?dist}`
		`Summary: A deployment and management system for Lua modules`

		`License: MIT`
		`URL: http://luarocks.org`
		`Source0: http://luarocks.org/releases/luarocks-%{version}.tar.gz`
		`- Patch0: luarocks-3.5.0-dynamic_libdir.patch`

		`BuildArch: noarch`
		`# this package was previously arched, and needs to be obsoleted`
		`@@ -23,10 +22,13 @@`
		`%endif`
		`Requires: unzip`
		`Requires: zip`
		`+ Requires: gcc`

		`%if 0%{?fedora}`
		`Recommends: lua-sec`
		`- Suggests: lua-devel`
		`+ Recommends: lua-devel`
		`+ Recommends: make`
		`+ Recommends: cmake`
		`%endif`

		`%description`
		`@@ -73,6 +75,11 @@`


		`%changelog`
		`+ * Wed Sep 14 2022 FeRD (Frank Dana) <ferdnyc@gmail.com> - 3.9.1-1`
		`+ - New upstream release, drop upstreamed patch`
		`+ - Raise lua-devel from Suggests to Recommends, add new Requires: gcc`
		`+ and Recommends: make and cmake (rhbz#2091484)`
		`+`
		`* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.7.0-4`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (luarocks-3.7.0.tar.gz) = cc3c555c488da9f95a118eedb74cb9e2a38b572e172958843dabebce125524e58a13ac65e89a349deb8fef13b6de751074fc3adbb430ab55d4e4109288119153`
		`+ SHA512 (luarocks-3.9.1.tar.gz) = 2dfc1326118c2868b05a17acc5fe8d2c07503ef2bb3f2560a3d7ce385b85893d593bacfab7086c57923f042d7e7cfd09a0a9795afc473a73edbba0a44d23ed60`

ferdnyc commented 2 years ago

In separate commits, this PR:

Updates to the latest luarocks-3.9.0 upstream release
Enhances the package dependencies, by...
- Promoting the lua-devel dependency from Suggests: to Recommends:
- Adding a Requires: dependency on gcc, which is called by the luarocks code to determine configuration details
- Adding new (and Fedora-only) Recommends: runtime dependencies on make and cmake, both of which luarocks has the ability to use (along with gcc) when compiling modules to be installed.

See bug 2091484 for additional details on the dependency issue.

ferdnyc commented 2 years ago

*poke* Sorry to be a pest, but... would any of the fourteen subscribers to this PR (other than myself) be able to spare a moment to look it over? AdvThanksance.

Actually I may as well update it, first — luarocks 3.9.1 is out, now.

1 new commit added

Update to 3.9.1

2 years ago

churchyard commented 2 years ago

I am subscribed because I am a member of @lua-packagers-sig. However, I don't have much time for Lua currently, and considering the SIG is practically dead (it's just me and @salimma who is the primary maintainer here) I might as well consider removing myself from it. Sorry about that.

Many other users subscribed here are only subscribed because they are part of the @epel-packagers-sig and I think by the nature of their participation they won't be interested in a Fedora PR.

rebased onto e48888e

2 years ago

ferdnyc commented 2 years ago

Done, PR now upgrades to 3.9.1, as well as making the other changes mentioned.

ferdnyc commented 2 years ago

I am subscribed because I am a member of @lua-packagers-sig.

Many other users subscribed here are only subscribed because they are part of the @epel-packagers-sig

Fair. But as long as y'all are lurking, I reserve the right to poke everyone with a stick once every four months. It wasn't even summer yet (northern hemisphere) when I opened this PR! :wink:

rebased onto 937a169

2 years ago

kkeithle commented 2 years ago

Ken Dreyer is an admin for this package. I'm an epel-packagers-sig member (seems to have collaborator privs across the board), but like Ken I work on ceph, and I imagine some of the ceph devs are doing devel on fedora and this would probably be useful for ceph.

If it's just a matter of merging the PR and building on rawhide, either Ken or I could do that.

Edited 2 years ago by kkeithle