diff --git a/lua-macros.changes b/lua-macros.changes index 6df1aea..ba5dc1c 100644 --- a/lua-macros.changes +++ b/lua-macros.changes @@ -1,7 +1,12 @@ +------------------------------------------------------------------- +Fri Apr 9 10:03:41 UTC 2021 - Callum Farmer + +- Add %lua_version_nodots to equal package naming + ------------------------------------------------------------------- Fri Feb 26 15:54:56 UTC 2021 - Callum Farmer -- Add -e (exclude) option +- Add -e (exclude) option to %lua_provides ------------------------------------------------------------------- Wed Jan 27 15:51:37 UTC 2021 - Callum Farmer diff --git a/lua-macros.spec b/lua-macros.spec index 936266f..9aa8ae2 100644 --- a/lua-macros.spec +++ b/lua-macros.spec @@ -15,7 +15,9 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # - +%if %{undefined _rpmmacrodir} +%define _rpmmacrodir %{_rpmconfigdir}/macros.d +%endif Name: lua-macros Version: 20170611 Release: 0 @@ -40,9 +42,9 @@ sed -i -e '/includedir/s!/lua!&-!' macros.lua : %install -install -D -m 644 macros.lua %{buildroot}%{_usr}/lib/rpm/macros.d/macros.lua +install -Dm644 macros.lua %{buildroot}%{_rpmmacrodir}/macros.lua %files -%{_usr}/lib/rpm/macros.d/macros.lua +%{_rpmmacrodir}/macros.lua %changelog diff --git a/macros.lua b/macros.lua index 3696f28..53084ef 100644 --- a/macros.lua +++ b/macros.lua @@ -2,6 +2,7 @@ # The major.minor version of Lua %lua_version %(lua -e 'print(_VERSION)' | cut -d ' ' -f 2) +%lua_version_nodots %(perl -e "print %{lua_version}*10") # compiled modules should go here %lua_archdir %{_libdir}/lua/%{lua_version}