From aac3ea002d2c93ff6d4acaf06361d0fddc136577 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 24 Feb 2015 09:17:36 -0700 Subject: [PATCH] Update spec to match packaging draft, rebuild for lua 5.3 (bug #1195707) --- .gitignore | 1 + lua-posix.spec | 29 ++++++++++++++++------------- sources | 2 +- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 672ab7d..3aceb05 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /luaposix-5.1.14.tar.gz /lua-posix-5.1.28-8f80582.tar.gz /lua-posix-32-58016bb.tar.gz +/release-v32.tar.gz diff --git a/lua-posix.spec b/lua-posix.spec index c65bb49..7b17427 100644 --- a/lua-posix.spec +++ b/lua-posix.spec @@ -1,37 +1,37 @@ -%if 0%{?rhel} && 0%{?rhel} <= 7 -%define luaver 5.1 -%else -%define luaver 5.2 -%endif -%define lualibdir %{_libdir}/lua/%{luaver} -%define luapkgdir %{_datadir}/lua/%{luaver} +%{!?luaver: %global luaver %(lua -e "print(string.sub(_VERSION, 5))")} +%global lualibdir %{_libdir}/lua/%{luaver} +%global luapkgdir %{_datadir}/lua/%{luaver} %global commit 58016bbba40b063e8a98a7e9f14acfcd46f103d4 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: lua-posix Version: 32 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A POSIX library for Lua Group: Development/Libraries License: Public Domain URL: http://luaforge.net/projects/luaposix/ -Source0: https://github.com/luaposix/luaposix/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz +Source0: https://github.com/luaposix/luaposix/archive/release-v%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: lua >= %{luaver}, lua-devel >= %{luaver} +BuildRequires: lua-devel BuildRequires: ncurses-devel BuildRequires: lua-lunit +%if 0%{?fedora} || 0%{?rhel} >= 7 +Requires: lua(abi) = %{luaver} +%else Requires: lua >= %{luaver} +%endif %description This is a POSIX library for Lua which provides access to many POSIX features to Lua programs. %prep -%setup -q -n luaposix-%{commit} +%setup -q -n luaposix-release-v%{version} %build %configure --libdir=%{lualibdir} --datadir=/%{luapkgdir} -make %{?_smp_mflags} +make V=1 %{?_smp_mflags} %install @@ -40,7 +40,7 @@ make install DESTDIR=$RPM_BUILD_ROOT %check -make check +make V=1 check %clean @@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Feb 24 2015 Orion Poplawski - 32-4 +- Update spec to match packaging draft, rebuild for lua 5.3 (bug #1195707) + * Sun Aug 17 2014 Fedora Release Engineering - 32-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index 6336b73..9b7dd8f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0e5f62fa9dd4f05c6f93269bc958d03f lua-posix-32-58016bb.tar.gz +2bfede7b7cee96c5d0f6c0354e17498c release-v32.tar.gz