Attachment 1541218 Details for Bug 1685783 – lua-lpeg.compat.patch

[patch] lua-lpeg.compat.patch

lua-lpeg-compat.patch (text/plain), 3.86 KB, created by Aron Griffis on 2019-03-06 03:55:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Aron Griffis

Created: 2019-03-06 03:55:30 UTC

Size: 3.86 KB

patch

obsolete

>From 0a4f6bd897eb5c76393e70a0156561072a31617f Mon Sep 17 00:00:00 2001
>From: Aron Griffis <aron@scampersand.com>
>Date: Tue, 5 Mar 2019 22:54:36 -0500
>Subject: [PATCH] Add compat 5.1 build for neovim, rhbz #1685783
>
>---
> lua-lpeg.spec | 72 +++++++++++++++++++++++++++++++++++++--------------
> 1 file changed, 52 insertions(+), 20 deletions(-)
>
>diff --git a/lua-lpeg.spec b/lua-lpeg.spec
>index deb30a1..a311d29 100644
>--- a/lua-lpeg.spec
>+++ b/lua-lpeg.spec
>@@ -1,44 +1,69 @@
>+%global lua_version 5.3
>+%global lua_libdir %{_libdir}/lua/%{lua_version}
>+%global lua_pkgdir %{_datadir}/lua/%{lua_version}
> 
>-%{!?luaver: %global luaver %(test -x /usr/bin/lua && lua -e "print(string.sub(_VERSION, 5))" || echo 5.3)}
>-%global lualibdir %{_libdir}/lua/%{luaver}
>-%global luapkgdir %{_datadir}/lua/%{luaver}
>+%global lua_compat_version 5.1
>+%global lua_compat_libdir %{_libdir}/lua/%{lua_compat_version}
>+%global lua_compat_pkgdir %{_datadir}/lua/%{lua_compat_version}
>+%global lua_compat_builddir %{_builddir}/compat-lua-%{name}-%{version}-%{release}
> 
> Name:           lua-lpeg
> Version:        1.0.1
>-Release:        7%{?dist}
>+Release:        8%{?dist}
> Summary:        Parsing Expression Grammars for Lua
> 
> License:        MIT
> URL:            http://www.inf.puc-rio.br/~roberto/lpeg/
> Source0:        http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-%{version}.tar.gz
>-%if 0%{?el5}
>-%endif
> 
> BuildRequires:  gcc
>-BuildRequires:  lua-devel
>-%if 0%{?fedora} || 0%{?rhel} >= 7
>-Requires:       lua(abi) = %{luaver}
>-%else
>-Requires:       lua >= %{luaver}
>-%endif
>+BuildRequires:  lua-devel >= %{lua_version}
>+Requires:       lua(abi) = %{lua_version}
> 
> %description
> LPeg is a new pattern-matching library for Lua, based on Parsing Expression
> Grammars (PEGs).
> 
>+%package compat
>+Summary:        Parsing Expression Grammars for Lua 5.1
>+Group:          Development/Libraries
>+BuildRequires:  compat-lua-devel >= %{lua_compat_version}
>+Requires:       lua(abi) = %{lua_compat_version}
>+
>+%description compat
>+LPeg is a new pattern-matching library for Lua 5.1
>+
> %prep
> %autosetup -n lpeg-%{version}
> 
>+rm -rf %{lua_compat_builddir}
>+cp -a . %{lua_compat_builddir}
>+
> %build
>-make %{?_smp_mflags} COPT="%{optflags}"
>+%define cflags %{optflags} -std=c99 -shared -fPIC %{?__global_ldflags}
>+
>+make %{?_smp_mflags} CC="gcc %{cflags}"
>+
>+%define compat_cflags -I%{_includedir}/lua-%{lua_compat_version} -L%{lua_compat_libdir}
>+pushd %{lua_compat_builddir}
>+make %{?_smp_mflags} CC="gcc %{compat_cflags} %{cflags}"
>+popd
> 
> %install
> %{__rm} -rf %{buildroot}
>-%{__mkdir_p} %{buildroot}%{lualibdir}
>-%{__mkdir_p} %{buildroot}%{luapkgdir}
>-%{__install} -p lpeg.so %{buildroot}%{lualibdir}/lpeg.so.%{version}
>-%{__ln_s} lpeg.so.%{version} %{buildroot}%{lualibdir}/lpeg.so
>-%{__install} -p -m 0644 re.lua %{buildroot}%{luapkgdir}
>+%{__mkdir_p} %{buildroot}%{lua_libdir}
>+%{__mkdir_p} %{buildroot}%{lua_pkgdir}
>+%{__install} -p lpeg.so %{buildroot}%{lua_libdir}/lpeg.so.%{version}
>+%{__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
>@@ -46,11 +71,18 @@ lua test.lua
> 
> %files
> %doc HISTORY lpeg.html re.html lpeg-128.gif test.lua
>-%{lualibdir}/*
>-%{luapkgdir}/*
>+%{lua_libdir}/*
>+%{lua_pkgdir}/*
>+
>+%files compat
>+%{lua_compat_libdir}/*
>+%{lua_compat_pkgdir}/*
> 
> 
> %changelog
>+* Tue Mar 05 2019 Aron Griffis <aron@scampersand.com> - 1.0.1-8
>+- Add compat 5.1 build for neovim
>+
> * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-7
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
> 
>-- 
>2.20.1
>

Actions: View | Diff

Attachments on bug 1685783: 1541218