[luarocks/el6] Fix macro problem affecting EPEL builds
Michel Alexandre Salim
salimma at fedoraproject.org
Mon Nov 5 15:31:27 UTC 2012
commit 4238050c805eb97e2b080aa64a9637acd0e42460
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date: Mon Nov 5 22:31:17 2012 +0700
Fix macro problem affecting EPEL builds
luarocks.spec | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/luarocks.spec b/luarocks.spec
index b56aa45..12f8cf3 100644
--- a/luarocks.spec
+++ b/luarocks.spec
@@ -1,6 +1,8 @@
-%{!?luaver: %global luaver %(lua -e "print(string.sub(_VERSION, 5))")}
%if 0%{?rhel} <= 6
+%global luaver 5.1
%global luanext 5.2
+%else
+%{!?luaver: %global luaver %(lua -e "print(string.sub(_VERSION, 5))")}
%endif
%global luapkgdir %{_datadir}/lua/%{luaver}
@@ -13,11 +15,11 @@
Name: luarocks
Version: 2.0.12
-Release: 1%{?dist}
+Release: 1%{?dist}.1
Summary: A deployment and management system for Lua modules
License: MIT
-%if 0%{?rhel}
+%if 0%{?rhel} <= 6
# RHEL 5's rpm requires this field
# RHEL 6's rpmlint warns if it is unspecified
Group: Development/Tools
@@ -31,11 +33,11 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
%endif
BuildRequires: lua-devel
-%if ! 0%{?rhel} <= 6
-Requires: lua(abi) = %{luaver}
-%else # for RHEL 5 and 6
+%if 0%{?rhel} <= 6
Requires: lua >= %{luaver}
Requires: lua < %{luanext}
+%else
+Requires: lua(abi) = %{luaver}
%endif
%description
@@ -86,6 +88,9 @@ make install DESTDIR=$RPM_BUILD_ROOT
%changelog
+* Mon Nov 5 2012 Michel Salim <salimma at fedoraproject.org> - 2.0.12-1.1
+- Fix macro problem affecting EPEL builds
+
* Mon Nov 5 2012 Michel Salim <salimma at fedoraproject.org> - 2.0.12-1
- Update to 2.0.12
More information about the scm-commits
mailing list