[packages/lua-expat] updated to 1.3.0, uses lua 5.3

[bszx]

commit 23bf7fa142624726a29b353fe32a90189e864968
Author: Bartek Szady <bszx at bszx.eu>
Date:   Sun Apr 5 11:48:37 2020 +0200

    updated to 1.3.0, uses lua 5.3

 lua-expat.spec | 60 +++++++++++++++++++++++++++++++++++++++-------------------
 makefile.patch | 11 +++++++++++
 2 files changed, 52 insertions(+), 19 deletions(-)
---
diff --git a/lua-expat.spec b/lua-expat.spec
index 5968572..2bf981c 100644
--- a/lua-expat.spec
+++ b/lua-expat.spec
@@ -1,15 +1,28 @@
+%define		luaver 5.3
+%define		real_name luaexpat
+
+%define		luasuffix %(echo %{luaver} | tr -d .)
+%if "%{luaver}" == "5.1"
+%define		luaincludedir %{_includedir}/lua51
+%else
+%define		luaincludedir %{_includedir}/lua%{luaver}
+%endif
+%define		lualibdir %{_libdir}/lua/%{luaver}
+%define		luapkgdir %{_datadir}/lua/%{luaver}
+
 Summary:	LuaExpat is a SAX XML parser based on the Expat library
 Summary(hu.UTF-8):	LuaExpat egy SAX XML elemző az Expat könyvtárra épülve
-Name:		lua-expat
-Version:	1.2.0
+Name:		lua%{luasuffix}-expat
+Version:	1.3.0
 Release:	1
 License:	BSD-like
 Group:		Development/Languages
-Source0:	http://matthewwild.co.uk/projects/luaexpat/luaexpat-%{version}.tar.gz
-# Source0-md5:	03efe50c7f30a34580701e6527d7bfee
+Source0:	http://matthewwild.co.uk/projects/luaexpat/%{real_name}-%{version}.tar.gz
+# Source0-md5:	3c20b5795e7107f847f8da844fbfe2da
+Patch0:		makefile.patch
 URL:		http://luaforge.net/projects/luaexpat/
 BuildRequires:	expat-devel
-BuildRequires:	lua51-devel
+BuildRequires:	lua%{luasuffix}-devel
 BuildRequires:	sed >= 4.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -20,23 +33,32 @@ LuaExpat is a SAX XML parser based on the Expat library.
 LuaExpat egy SAX XML elemző az Expat könyvtárra épülve.
 
 %prep
-%setup -q -n luaexpat-%{version}
-%{__sed} -i "s at usr/local at usr@g ; s at 5\.0 at 5.1@ ; s@^LUA_INC.*@LUA_INC= %{_includedir}/lua51@ ; \
-	s at LUA_VERSION_NUM= 500 at LUA_VERSION_NUM= 501@ ; \
-	s at CFLAGS = \(.*\)@CFLAGS = -fPIC \1@" config
+%setup -q -n %{real_name}-%{version}
+%patch0 -p1
 
 %build
 %{__make} \
-	CC="%{__cc} %{rpmcflags} %{rpmcppflags}" \
-	LIB_OPTION='-shared -llua51'
+	CC="%{__cc}" \
+	CFLAGS="%{rpmcflags}" \
+	LDFLAGS="%{rpmldflags}" \
+	LUA_V="%{luaver}" \
+	LUA_INC="-I%{luaincludedir}" \
+	LUA_LDIR="%{luapkgdir}" \
+	LUA_CDIR="%{lualibdir}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_datadir},%{_libdir}}/lua/5.1
-install -p src/lxp.so* $RPM_BUILD_ROOT%{_libdir}/lua/5.1
-install -d $RPM_BUILD_ROOT%{_datadir}/lua/5.1/lxp
-cp -p src/lxp/lom.lua $RPM_BUILD_ROOT%{_datadir}/lua/5.1/lxp
-ln -s lxp.so.%{version} $RPM_BUILD_ROOT%{_libdir}/lua/5.1/lxp.so
+install -d $RPM_BUILD_ROOT{%{luapkgdir},%{lualibdir}}
+
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT \
+	CC="%{__cc}" \
+	CFLAGS="%{rpmcflags}" \
+	LDFLAGS="%{rpmldflags}" \
+	LUA_V="%{luaver}" \
+	LUA_INC="-I%{luaincludedir}" \
+	LUA_LDIR="%{luapkgdir}" \
+	LUA_CDIR="%{lualibdir}"
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -44,6 +66,6 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc README doc/us/*
-%attr(755,root,root) %{_libdir}/lua/5.1/lxp*.so*
-%dir %{_datadir}/lua/5.1/lxp
-%{_datadir}/lua/5.1/lxp/*.lua
+%attr(755,root,root) %{lualibdir}/lxp*.so*
+%dir %{luapkgdir}/lxp
+%{luapkgdir}/lxp/*.lua
diff --git a/makefile.patch b/makefile.patch
new file mode 100644
index 0000000..f2469e0
--- /dev/null
+++ b/makefile.patch
@@ -0,0 +1,11 @@
+--- luaexpat-1.3.0/Makefile.orig	2014-04-03 01:30:37.000000000 +0200
++++ luaexpat-1.3.0/Makefile	2020-04-04 20:50:28.237001076 +0200
+@@ -9,7 +9,7 @@
+ T		= lxp
+ LIBNAME		= $(T).so
+ 
+-COMMON_CFLAGS	 = -g -pedantic -Wall -O2 -fPIC -DPIC -ansi
++COMMON_CFLAGS	 = -fPIC -DPIC
+ LUA_INC		?= -I/usr/include/lua$(LUA_V)
+ EXPAT_INC	?= -I/usr/include
+ CF		 = $(LUA_INC) $(EXPAT_INC) $(COMMON_CFLAGS) $(CFLAGS)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/lua-expat.git/commitdiff/23bf7fa142624726a29b353fe32a90189e864968