.gitignore

@@ -1,2 +1,2 @@
-SOURCES/lpeg-1.0.1.tar.gz
 /lpeg-1.0.1.tar.gz
+/lpeg-1.0.2.tar.gz

.lua-lpeg.metadata

@@ -0,0 +1 @@
+d6a7048a32d5d2bcf542c7d141070654dc66a17a lpeg-1.0.2.tar.gz

0001-Enable-execshield-ldflags.patch

@@ -1,25 +0,0 @@
-From 98ff554e5604b99aa5653e37b207d9e31df6637f Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Fri, 21 Sep 2018 12:55:14 +0200
-Subject: [PATCH] Enable execshield ldflags
-
----
- makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/makefile b/makefile
-index 7a8463e..a1e09ed 100644
---- a/makefile
-+++ b/makefile
-@@ -29,7 +29,7 @@ FILES = lpvm.o lpcap.o lptree.o lpcode.o lpprint.o
- 
- # For Linux
- linux:
--	make lpeg.so "DLLFLAGS = -shared -fPIC"
-+	make lpeg.so "DLLFLAGS = -shared -fPIC -Wl,-z,now"
- 
- # For Mac OS
- macosx:
--- 
-2.17.1
-

0001-inject-ldflags.patch

@@ -0,0 +1,10 @@
+--- lpeg-1.0.2/makefile	2019-10-24 10:24:58.012896992 +0200
++++ lpeg-1.0.2/makefile	2019-10-24 10:25:38.698367119 +0200
+@@ -36,7 +36,7 @@
+ 	$(MAKE) lpeg.so "DLLFLAGS = -bundle -undefined dynamic_lookup"
+
+ lpeg.so: $(FILES)
+-	env $(CC) $(DLLFLAGS) $(FILES) -o lpeg.so
++	env $(CC) $(DLLFLAGS) $(LDFLAGS) $(FILES) -o lpeg.so
+
+ $(FILES): makefile

lua-lpeg.spec

@@ -1,72 +1,132 @@
+%global lua_pkg_name lpeg
 
-%{!?luaver: %global luaver %(test -x /usr/bin/lua && lua -e "print(string.sub(_VERSION, 5))" || echo 5.3)}
+%global lua_version 5.4
-%global lualibdir %{_libdir}/lua/%{luaver}
+%global lua_libdir %{_libdir}/lua/%{lua_version}
-%global luapkgdir %{_datadir}/lua/%{luaver}
+%global lua_pkgdir %{_datadir}/lua/%{lua_version}
 
-Name:           lua-lpeg
+%global lua_compat_version 5.1
-Version:        1.0.1
+%global lua_compat_libdir %{_libdir}/lua/%{lua_compat_version}
+%global lua_compat_pkgdir %{_datadir}/lua/%{lua_compat_version}
+%global lua_compat_builddir %{_builddir}/lua%{lua_compat_version}-%{lua_pkg_name}-%{version}-%{release}
+
+Name:           lua-%{lua_pkg_name}
+Version:        1.0.2
 Release:        6%{?dist}
 Summary:        Parsing Expression Grammars for Lua
 
-Group:          Development/Libraries
 License:        MIT
-URL:            http://www.inf.puc-rio.br/~roberto/lpeg/
+URL:            http://www.inf.puc-rio.br/~roberto/%{lua_pkg_name}/
-Source0:        http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-%{version}.tar.gz
+Source0:        http://www.inf.puc-rio.br/~roberto/%{lua_pkg_name}/%{lua_pkg_name}-%{version}.tar.gz
-%if 0%{?el5}
+Patch1:         0001-inject-ldflags.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%endif
 
-BuildRequires:  lua-devel
+BuildRequires:  gcc
+BuildRequires:  lua-devel >= %{lua_version}
 %if 0%{?fedora} || 0%{?rhel} >= 7
-Requires:       lua(abi) = %{luaver}
+Requires:       lua(abi) = %{lua_version}
 %else
-Requires:       lua >= %{luaver}
+Requires:       lua >= %{lua_version}
 %endif
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=1630592
-Patch0: 0001-Enable-execshield-ldflags.patch
-
 %description
 LPeg is a new pattern-matching library for Lua, based on Parsing Expression
 Grammars (PEGs).
 
+%package -n lua%{lua_compat_version}-%{lua_pkg_name}
+Summary:        Parsing Expression Grammars for Lua %{lua_compat_version}
+Provides:       compat-%{name}
+BuildRequires:  compat-lua-devel >= %{lua_compat_version}
+BuildRequires: make
+%if 0%{?fedora} || 0%{?rhel} >= 7
+Requires:       lua(abi) = %{lua_compat_version}
+%else
+Requires:       lua >= %{lua_compat_version}
+%endif
+
+%description -n lua%{lua_compat_version}-%{lua_pkg_name}
+LPeg is a new pattern-matching library for Lua %{lua_compat_version}
+
 %prep
-%autosetup -p1 -n lpeg-%{version}
+%autosetup -n %{lua_pkg_name}-%{version}
+
+rm -rf %{lua_compat_builddir}
+cp -a . %{lua_compat_builddir}
 
 %build
-make %{?_smp_mflags} COPT="%{optflags}"
+%make_build COPT="%{optflags}" LDFLAGS="%{build_ldflags}"
+
+pushd %{lua_compat_builddir}
+%make_build COPT="-I%{_includedir}/lua-%{lua_compat_version} %{optflags}" LDFLAGS="-L%{lua_compat_libdir} %{build_ldflags}"
+popd
 
 %install
 %{__rm} -rf %{buildroot}
-%{__mkdir_p} %{buildroot}%{lualibdir}
+
-%{__mkdir_p} %{buildroot}%{luapkgdir}
+%{__mkdir_p} %{buildroot}%{lua_libdir}
-%{__install} -p lpeg.so %{buildroot}%{lualibdir}/lpeg.so.%{version}
+%{__mkdir_p} %{buildroot}%{lua_pkgdir}
-%{__ln_s} lpeg.so.%{version} %{buildroot}%{lualibdir}/lpeg.so
+%{__install} -p lpeg.so %{buildroot}%{lua_libdir}/lpeg.so.%{version}
-%{__install} -p -m 0644 re.lua %{buildroot}%{luapkgdir}
+%{__ln_s} lpeg.so.%{version} %{buildroot}%{lua_libdir}/lpeg.so
+%{__install} -p -m 0644 re.lua %{buildroot}%{lua_pkgdir}
+
+pushd %{lua_compat_builddir}
+%{__mkdir_p} %{buildroot}%{lua_compat_libdir}
+%{__mkdir_p} %{buildroot}%{lua_compat_pkgdir}
+%{__install} -p lpeg.so %{buildroot}%{lua_compat_libdir}/lpeg.so.%{version}
+%{__ln_s} lpeg.so.%{version} %{buildroot}%{lua_compat_libdir}/lpeg.so
+%{__install} -p -m 0644 re.lua %{buildroot}%{lua_compat_pkgdir}
+popd
 
 
 %check
 lua test.lua
 
-
-%if 0%{?rhel}
-%clean
-%{__rm} -rf %{buildroot}
-%endif
-
-
 %files
-%defattr(-,root,root,-)
 %doc HISTORY lpeg.html re.html lpeg-128.gif test.lua
-%{lualibdir}/*
+%{lua_libdir}/*
-%{luapkgdir}/*
+%{lua_pkgdir}/*
+
+%files -n lua%{lua_compat_version}-%{lua_pkg_name}
+%{lua_compat_libdir}/*
+%{lua_compat_pkgdir}/*
 
 
 %changelog
-* Fri Sep 21 2018 Bastien Nocera <bnocera@redhat.com> - 1.0.1-6
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-6
-+ lua-lpeg-1.0.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-- Enable execshield protection
+
-- Resolves: #1630592
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jul 13 2020 Tom Stellard <tstellar@redhat.com> - 1.0.2-4
+- Use make macros
+- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
+
+* Mon Jun 29 2020 Tom Callaway <spot@fedoraproject.org> - 1.0.2-3
+- rebuild for lua 5.4
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Oct 24 2019 Tomas Krizek <tomas.krizek@nic.cz> - 1.0.2-1
+- Update to latest upstream release (BZ#1375680)
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Tue Apr 16 2019 Tomas Krizek <tomas.krizek@nic.cz> - 1.0.1-10
+- Use lua5.1-lpeg as Lua 5.1 naming convetion
+  https://pagure.io/packaging-committee/issue/878
+
+* Mon Mar 11 2019 Aron Griffis <aron@scampersand.com> - 1.0.1-9
+- Add compat 5.1 build for neovim, rhbz #1685783
+
+* Mon Mar 11 2019 Rafael dos Santos <rdossant@redhat.com> - 1.0.1-6
+- Use standard Fedora linker flags (bug #1548714)
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
 * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

sources

@@ -1 +1 @@
-SHA512 (lpeg-1.0.1.tar.gz) = 7b43fbee7eff443000986684bc56bba6d2796a31cf860740746c70e155bdea1b62a46b93f97e2747e3ef0f63e965148778ac2985d0f2d83e1e37ec4ebbabf4aa
+SHA512 (lpeg-1.0.2.tar.gz) = 110527ddf9f8e5e8a80ef0ae8847c8ba8cd2597dba3bfe2865cba9af60daafbb885f21e74231952f5ab793d021e050b482066a821c6954d52090a5eae77e9814