Attachment 898334 Details for Bug 1100238 – Patch adding -compat package for lua-expat built against compat-lua

[patch] Patch adding -compat package for lua-expat built against compat-lua

lua-expat-compat-lua.patch (text/plain), 2.54 KB, created by Jan Kaluža on 2014-05-22 10:53:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Kaluža

Created: 2014-05-22 10:53:10 UTC

Size: 2.54 KB

patch

obsolete

>diff --git a/lua-expat.spec b/lua-expat.spec
>index 8603044..90b091c 100644
>--- a/lua-expat.spec
>+++ b/lua-expat.spec
>@@ -1,6 +1,10 @@
> %define luaver 5.2
> %define lualibdir %{_libdir}/lua/%{luaver}
> %define luapkgdir %{_datadir}/lua/%{luaver}
>+%define luacompatver 5.1
>+%define luacompatlibdir %{_libdir}/lua/%{luacompatver}
>+%define luacompatpkgdir %{_datadir}/lua/%{luacompatver}
>+%define lua51dir %{_builddir}/lua51-%{name}-%{version}-%{release}
> 
> Name:           lua-expat
> Version:        1.3.0
>@@ -17,21 +21,48 @@ BuildRequires:  lua >= %{luaver}, lua-devel >= %{luaver}
> BuildRequires:  expat-devel
> Requires:       lua >= %{luaver}
> 
>+%if 0%{?fedora} >= 20
>+BuildRequires:  compat-lua >= %{luacompatver}, compat-lua-devel >= %{luacompatver}
>+%endif
>+
> %description
> LuaExpat is a SAX XML parser based on the Expat library.
> 
>+%if 0%{?fedora} >= 20
>+%package compat
>+Summary:        SAX XML parser based on the Expat library for Lua 5.1
>+Group:          Development/Libraries
>+
>+%description compat
>+LuaExpat is a SAX XML parser based on the Expat library for Lua 5.1.
>+%endif
>+
> %prep
> %setup -q -n luaexpat-%{version}
> 
>+%if 0%{?fedora} >= 20
>+rm -rf %{lua51dir}
>+cp -a . %{lua51dir}
>+%endif
> 
> %build
>-make %{?_smp_mflags} LUA_CDIR=%{lualibdir} LUA_LDIR=%{luapkgdir} LUA_INC=-I%{_includedir} EXPAT_INC=-I%{_includedir} CFLAGS="%{optflags} -fPIC"
>+make %{?_smp_mflags} LUA_V=%{luaver} LUA_CDIR=%{lualibdir} LUA_LDIR=%{luapkgdir} LUA_INC=-I%{_includedir} EXPAT_INC=-I%{_includedir} CFLAGS="%{optflags} -fPIC"
> 
>+%if 0%{?fedora} >= 20
>+pushd %{lua51dir}
>+make %{?_smp_mflags} LUA_V=%{luacompatver} LUA_CDIR=%{luacompatlibdir} LUA_LDIR=%{luacompatpkgdir} LUA_INC=-I%{_includedir}/lua-%{luacompatver} EXPAT_INC=-I%{_includedir} CFLAGS="%{optflags} -fPIC"
>+popd
>+%endif
> 
> %install
> rm -rf %{buildroot}
> make install DESTDIR=%{buildroot} LUA_CDIR=%{lualibdir} LUA_LDIR=%{luapkgdir} INSTALL='install -p'
> 
>+%if 0%{?fedora} >= 20
>+pushd %{lua51dir}
>+make install DESTDIR=%{buildroot} LUA_CDIR=%{luacompatlibdir} LUA_LDIR=%{luacompatpkgdir} INSTALL='install -p'
>+popd
>+%endif
> 
> %check
> lua -e 'package.cpath="./src/?.so;"..package.cpath; dofile("tests/test.lua");'
>@@ -47,8 +78,18 @@ rm -rf %{buildroot}
> %{lualibdir}/*
> %{luapkgdir}/*
> 
>+%if 0%{?fedora} >= 20
>+%files compat
>+%defattr(-,root,root,-)
>+%doc README doc/us/*
>+%{luacompatlibdir}/*
>+%{luacompatpkgdir}/*
>+%endif
> 
> %changelog
>+* Thu May 22 2014 Jan Kaluza <jkaluza@redhat.com> - 1.3.0-1
>+- build -compat subpackage against compat-lua
>+
> * Wed Apr 23 2014 Robert Scheck <robert@fedoraproject.org> - 1.3.0-1
> - New upstream release
>

Actions: View | Diff

Attachments on bug 1100238: 898334