From: Jan Rękorajski <baggins@pld-linux.org>
Date: Thu, 26 Dec 2019 15:42:07 +0000 (+0900)
Subject: - requires lua 5.3
X-Git-Tag: auto/th/rpm-4.16.0-0.1~39
X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=commitdiff_plain;h=5c767dc142a88bb4e087da2d0db52050db41bf5d

- requires lua 5.3
---

diff --git a/rpm-lua.patch b/rpm-lua.patch
index e253eb6..4e92e7b 100644
--- a/rpm-lua.patch
+++ b/rpm-lua.patch
@@ -5,7 +5,7 @@
  AS_IF([test "$with_lua" != no],[
    PKG_CHECK_MODULES([LUA],
 -    [lua >= 5.1],
-+    [lua51 >= 5.1],
++    [lua5.3 >= 5.3],
      [AC_DEFINE(WITH_LUA, 1, [Build with lua support?])],
      [AC_MSG_ERROR([lua not present (--without-lua to disable)])])
    AC_SUBST(LUA_CFLAGS)
diff --git a/rpm.spec b/rpm.spec
index fb7b770..3c079d9 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -136,7 +136,7 @@ BuildRequires:	libtool >= 1:1.4.2-9
 BuildRequires:	libxml2-devel
 BuildRequires:	neon-devel >= 0.25.5
 %endif
-BuildRequires:	lua52-devel >= 5.2.2
+BuildRequires:	lua53-devel >= 5.3.5
 BuildRequires:	ossp-uuid-devel
 BuildRequires:	patch >= 2.2
 BuildRequires:	popt-devel >= %{reqpopt_ver}
@@ -730,7 +730,7 @@ sed -i \
 	-e 's|@host_os@|%{_target_os}|' \
 	macros.in
 
-CPPFLAGS="-I/usr/include/lua51 %{rpmcppflags}"
+CPPFLAGS="-I/usr/include/lua53 %{rpmcppflags}"
 %configure \
 	WITH_PERL_VERSION=no \
 	__GST_INSPECT=%{_bindir}/gst-inspect-1.0 \
@@ -765,9 +765,7 @@ CPPFLAGS="-I/usr/include/lua51 %{rpmcppflags}"
 	--with-xz=external \
 	--with-zlib=external
 
-%{__make} -j1
-
-%{?with_apidocs:%{__make} apidocs}
+%{__make}
 
 %{__cc} %{rpmcflags} -I/usr/include/db%{reqdb_ver} tools/rpmdb_checkversion.c \
 	-o tools/rpmdb_checkversion -ldb-%{reqdb_ver}
@@ -926,7 +924,6 @@ EOF
 # Squash Extra Blank Lines
 %{__sed} -i -e '/./,/^$/!d' $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
 
-%{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/vpkg-provides*
 %{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/find-{prov,req}.pl
 %{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/find-{provides,requires}.perl
 %{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/find-lang.sh