From add6099fd9f67207ada5a2b940c1da747a3e27b3 Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Fri, 28 Sep 2018 18:04:26 +0000 Subject: [PATCH] Use RPM macros from lua-devel This cleans up the spec file by using existing macros, rather than redefining them. As a side-effect, this improves rebuilding this package for Flatpak inclusion with prefix=/app, since the canonical versions are more robust against running without the lua interpreter in the path -they use a lua macro rather than shell expansion. --- lua-posix.spec | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/lua-posix.spec b/lua-posix.spec index e22b6bf..4ca73c0 100644 --- a/lua-posix.spec +++ b/lua-posix.spec @@ -6,7 +6,7 @@ Name: lua-posix Version: 33.3.1 -Release: 14%{?dist} +Release: 15%{?dist} Summary: A POSIX library for Lua License: MIT URL: http://luaforge.net/projects/luaposix/ @@ -16,11 +16,7 @@ BuildRequires: lua-devel BuildRequires: ncurses-devel BuildRequires: lua-lunit BuildRequires: perl-interpreter -%if 0%{?fedora} || 0%{?rhel} >= 7 -Requires: lua(abi) = %{luaver} -%else -Requires: lua >= %{luaver} -%endif +%{?lua_requires} %description This is a POSIX library for Lua which provides access to many POSIX features @@ -31,7 +27,7 @@ to Lua programs. %build -%configure --libdir=%{lualibdir} --datadir=/%{luapkgdir} +%configure --libdir=%{lua_libdir} --datadir=/%{lua_pkgdir} make V=1 %{?_smp_mflags} @@ -47,12 +43,15 @@ make V=1 check %license COPYING %doc AUTHORS ChangeLog NEWS README %{_defaultdocdir}/luaposix/ -%{lualibdir}/* -%{luapkgdir}/*.lua -%{luapkgdir}/posix/ +%{lua_libdir}/* +%{lua_pkgdir}/*.lua +%{lua_pkgdir}/posix/ %changelog +* Wed Jan 22 2020 Owen Taylor - 33.3.1-15 +- Use RPM macros from lua-devel + * Thu Jul 25 2019 Fedora Release Engineering - 33.3.1-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild