diff --git a/lua-macros.changes b/lua-macros.changes index 7480255..3fab09e 100644 --- a/lua-macros.changes +++ b/lua-macros.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Sat Aug 28 09:42:55 UTC 2021 - Callum Farmer + +- Change usage of math to string.gsub to prevent extra decimal + places causing issues + +------------------------------------------------------------------- +Fri Aug 27 10:07:01 UTC 2021 - Callum Farmer + +- Add %lua_version_default, %lua_version_default_nodots + and %ifluadefault: to allow to separate what flavour builds + the documentation +- Bump version to 20210827 + ------------------------------------------------------------------- Thu Jun 10 16:58:39 UTC 2021 - Callum Farmer diff --git a/lua-macros.spec b/lua-macros.spec index 9aa8ae2..23c684e 100644 --- a/lua-macros.spec +++ b/lua-macros.spec @@ -19,7 +19,7 @@ %define _rpmmacrodir %{_rpmconfigdir}/macros.d %endif Name: lua-macros -Version: 20170611 +Version: 20210827 Release: 0 Summary: Macros for lua language License: MIT diff --git a/macros.lua b/macros.lua index f71651d..92e222a 100644 --- a/macros.lua +++ b/macros.lua @@ -2,7 +2,7 @@ # The major.minor version of Lua %lua_version %(lua -e 'print(_VERSION)' | cut -d ' ' -f 2) -%lua_version_nodots %(lua -e 'print(math.floor((%{lua_version}*10)))') +%lua_version_nodots %(lua -e 'print((string.gsub("%{lua_version}", "%.", "")))') # compiled modules should go here %lua_archdir %{_libdir}/lua/%{lua_version} @@ -13,11 +13,18 @@ # lua includes folder %lua_incdir %{_includedir}/lua%{lua_version} +%lua_version_default 5.4 +%lua_version_default_nodots %(lua -e 'print((string.gsub("%{lua_version_default}", "%.", "")))') + +%ifluadefault \ +%if %{lua_version_nodots} == %{lua_version_default_nodots} \ +%{nil} + # Lua default version # -e: Exclude lua prefix # -n: Specify name %lua_provides(en:) \ -%if "%{flavor}" == "lua54" \ +%ifluadefault \ %if 0%{?-n:1} \ Provides: %{-n*} = %{version}-%{release} \ Obsoletes: %{-n*} < %{version}-%{release} \