Accepting request 899419 from home:gmbr3:Lua

- Add -n (name) option to %lua_provides
- Use lua instead of perl for %lua_version_nodots

OBS-URL: https://build.opensuse.org/request/show/899419
OBS-URL: https://build.opensuse.org/package/show/devel:languages:lua/lua-macros?expand=0&rev=16
This commit is contained in:
Matej Cepl 2021-06-11 10:24:56 +00:00 committed by Git OBS Bridge
parent 1fd01ca772
commit 8737e1aad7
2 changed files with 14 additions and 2 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jun 10 16:58:39 UTC 2021 - Callum Farmer <gmbr3@opensuse.org>
- Add -n (name) option to %lua_provides
- Use lua instead of perl for %lua_version_nodots
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Apr 9 10:03:41 UTC 2021 - Callum Farmer <gmbr3@opensuse.org> Fri Apr 9 10:03:41 UTC 2021 - Callum Farmer <gmbr3@opensuse.org>

View File

@ -2,7 +2,7 @@
# The major.minor version of Lua # The major.minor version of Lua
%lua_version %(lua -e 'print(_VERSION)' | cut -d ' ' -f 2) %lua_version %(lua -e 'print(_VERSION)' | cut -d ' ' -f 2)
%lua_version_nodots %(perl -e "print %{lua_version}*10") %lua_version_nodots %(lua -e 'print(math.floor((%{lua_version}*10)))')
# compiled modules should go here # compiled modules should go here
%lua_archdir %{_libdir}/lua/%{lua_version} %lua_archdir %{_libdir}/lua/%{lua_version}
@ -15,8 +15,13 @@
# Lua default version # Lua default version
# -e: Exclude lua prefix # -e: Exclude lua prefix
%lua_provides(e) \ # -n: Specify name
%lua_provides(en:) \
%if "%{flavor}" == "lua54" \ %if "%{flavor}" == "lua54" \
%if 0%{?-n:1} \
Provides: %{-n*} = %{version}-%{release} \
Obsoletes: %{-n*} < %{version}-%{release} \
%else \
%if 0%{?-e:1} \ %if 0%{?-e:1} \
Provides: %{mod_name} = %{version}-%{release} \ Provides: %{mod_name} = %{version}-%{release} \
Obsoletes: %{mod_name} < %{version}-%{release} \ Obsoletes: %{mod_name} < %{version}-%{release} \
@ -25,4 +30,5 @@ Provides: lua-%{mod_name} = %{version}-%{release} \
Obsoletes: lua-%{mod_name} < %{version}-%{release} \ Obsoletes: lua-%{mod_name} < %{version}-%{release} \
%endif \ %endif \
%endif \ %endif \
%endif \
%{nil} %{nil}