[packages/lua-doc] - revert switch to unversioned lua binary, this code is too old for this

baggins baggins at pld-linux.org
Sat Oct 24 19:11:31 CEST 2020


commit 62ea50c9148190c702e88e7966983707ab5e8348
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Oct 24 19:11:07 2020 +0200

    - revert switch to unversioned lua binary, this code is too old for this

 lua-doc.spec | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)
---
diff --git a/lua-doc.spec b/lua-doc.spec
index 8cdb2b3..0de5296 100644
--- a/lua-doc.spec
+++ b/lua-doc.spec
@@ -3,17 +3,16 @@ Summary(hu.UTF-8):	LuaDoc egy dokumentációs eszköz Lua forráskódokhoz
 Summary(pl.UTF-8):	Narzędzie do dokumentowania kodu źródłowego Lua
 Name:		lua-doc
 Version:	3.0.1
-Release:	8
+Release:	9
 License:	BSD-like
 Group:		Development/Languages
 Source0:	http://luaforge.net/frs/download.php/3185/luadoc-%{version}.tar.gz
 # Source0-md5:	ec3a0c0b9413e401a2d466cc0930d505
 URL:		http://luaforge.net/projects/luadoc/
 BuildRequires:	sed >= 4.0
-BuildRequires:	/usr/bin/lua
 Requires:	lua-filesystem
 Requires:	lua-logging
-Requires:	/usr/bin/lua
+Requires:	lua51
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -23,27 +22,19 @@ LuaDoc is a documentation tool for Lua source code.
 LuaDoc egy dokumentációs eszköz Lua forráskódokhoz.
 
 %description -l pl.UTF-8
-LuaDoc jest narzędziem służącym do generowania dokumentacji
-na podstawie kodu źródłowego Lua.
+LuaDoc jest narzędziem służącym do generowania dokumentacji na podstawie kodu
+źródłowego Lua.
 
 %prep
 %setup -q -n luadoc-%{version}
-
-%{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+lua(\s|$),#!%{__lua},' src/luadoc.lua.in
+%{__sed} -i -e '1s,lua,lua51,' src/luadoc.lua.in
 
 %build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
-VERSION=$(echo 'print(_VERSION)' | %{__lua} | %{__sed} 's|Lua \(.*\)|\1|')
-
 %{__make} install \
-	PREFIX=$RPM_BUILD_ROOT%{_prefix} \
-	LUA_LIBDIR=$RPM_BUILD_ROOT%{_libdir}/lua/$VERSION \
-	LUA_DIR=$RPM_BUILD_ROOT%{_datadir}/lua/$VERSION \
-	SYS_BINDIR=$RPM_BUILD_ROOT%{_bindir} \
-	LUA_INTERPRETER=%{__lua}
+	PREFIX=$RPM_BUILD_ROOT%{_prefix}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -51,6 +42,6 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc README doc/us/*
-%dir %{_datadir}/lua/*/luadoc
-%{_datadir}/lua/*/luadoc/*
+%dir %{_datadir}/lua/5.1/luadoc
+%{_datadir}/lua/5.1/luadoc/*
 %attr(755,root,root) %{_bindir}/luadoc
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/lua-doc.git/commitdiff/62ea50c9148190c702e88e7966983707ab5e8348



More information about the pld-cvs-commit mailing list