Accepting request 1000932 from home:gmbr3:Lua

- Use new luarocks macros
- Keep luarocks data in the correct place

OBS-URL: https://build.opensuse.org/request/show/1000932
OBS-URL: https://build.opensuse.org/package/show/devel:languages:lua/lua-luautf8?expand=0&rev=2

lua-luautf8.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Sep  2 15:15:21 UTC 2022 - Callum Farmer <gmbr3@opensuse.org>
+
+- Use new luarocks macros
+- Keep luarocks data in the correct place
+
 -------------------------------------------------------------------
 Wed Aug 24 01:38:15 UTC 2022 - Gordon Leung <pirateclip@protonmail.com>
 

lua-luautf8.spec

@@ -28,11 +28,6 @@
   %define luarock_arch %{_arch}
  %endif
 %endif
-%ifarch armv7hl %{ix86}
- %bcond_with is64Bit
-%else
- %bcond_without is64Bit
-%endif
 Version:        0.1.3+git3
 Release:        0
 Summary:        A utf-8 support module for Lua and LuaJIT
@@ -63,35 +58,15 @@ test in lua test suite2.
 %autosetup -n %{mod_name}-%{version}
 
 %build
+%luarocks_build "rockspecs/%{mod_name}-%{rock_version}.rockspec"
 
 %install
-luarocks --lua-version "%{lua_version}" \
-  make --pack-binary-rock --deps-mode none "rockspecs/%{mod_name}-%{rock_version}.rockspec"
-install -Dm 644 -t "lua-%{lua_version}/" "%{mod_name}-%{rock_version}.linux-%{luarock_arch}.rock"
-luarocks --lua-version="%{lua_version}" --tree="%{buildroot}/usr/" \
- install --deps-mode=none --no-manifest "lua-%{lua_version}/%{mod_name}-%{rock_version}.linux-%{luarock_arch}.rock"
-
-# Seperate out documentation and licence
-mv %{buildroot}/usr/lib/luarocks/rocks-%{lua_version}/%{mod_name}/%{rock_version}/doc/LICENSE .
-mkdir -p docs
-mv %{buildroot}/usr/lib/luarocks/rocks-%{lua_version}/%{mod_name}/%{rock_version}/doc/* docs/
-rmdir %{buildroot}/usr/lib/luarocks/rocks-%{lua_version}/%{mod_name}/%{rock_version}/doc
-
-# Move pure lua modules to lua_noarchdir
-mkdir -p %{buildroot}%{lua_noarchdir}/luarocks/rocks-%{lua_version}/%{mod_name}/%{rock_version}
-mv %{buildroot}/usr/lib/luarocks/rocks-%{lua_version}/%{mod_name}/%{rock_version}/* \
-%{buildroot}%{lua_noarchdir}/luarocks/rocks-%{lua_version}/%{mod_name}/%{rock_version}
-
-# Move compiled modules to lua_archdir for 64bit archs, 32bit archs already in position
-%if %{with is64Bit}
-mkdir -p %{buildroot}%{lua_archdir}
-mv %{buildroot}/usr/lib/lua/%{lua_version}/* %{buildroot}%{lua_archdir}
-%endif
+%luarocks_install "%{mod_name}-%{rock_version}.linux-%{luarock_arch}.rock"
 
 %files
-%license LICENSE
-%doc docs/*
 %{lua_archdir}
-%{lua_noarchdir}
+%{luarocks_treedir}/%{mod_name}
+%docdir %{luarocks_treedir}/%{mod_name}/%{rock_version}/doc
+%license %{luarocks_treedir}/%{mod_name}/%{rock_version}/doc/LICENSE
 
 %changelog