[rrdtool/f19] compile with lua-5.1
Jaroslav Škarvada
jskarvad at fedoraproject.org
Fri May 24 10:22:44 UTC 2013
commit de1faf1ccd20fa870e91345f9a9a0163644c93d7
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date: Fri May 24 12:22:02 2013 +0200
compile with lua-5.1
Signed-off-by: Jaroslav Škarvada <jskarvad at redhat.com>
rrdtool-1.4.7-lua-5.2.patch | 31 -------------------------------
rrdtool.spec | 5 ++---
2 files changed, 2 insertions(+), 34 deletions(-)
---
diff --git a/rrdtool.spec b/rrdtool.spec
index 0092b9c..bb42ac7 100644
--- a/rrdtool.spec
+++ b/rrdtool.spec
@@ -30,7 +30,6 @@ Patch2: rrdtool-1.4.7-ruby-2-fix.patch
# disable logo for php 5.5.
Patch3: rrdtool-1.4.7-php55.patch
Patch4: rrdtool-1.4.7-autoconf-fix.patch
-Patch5: rrdtool-1.4.7-lua-5.2.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: dejavu-sans-mono-fonts
@@ -149,7 +148,7 @@ The %{name}-ruby package includes RRDtool bindings for Ruby.
%endif
%if %{with_lua}
-%define luaver 5.2
+%define luaver 5.1
%define lualibdir %{_libdir}/lua/%{luaver}
%define luapkgdir %{_datadir}/lua/%{luaver}
@@ -172,7 +171,6 @@ The %{name}-lua package includes RRDtool bindings for Lua.
%endif
%patch2 -p1 -b .ruby-2-fix
%patch4 -p1 -b .autoconf-fix
-%patch5 -p1 -b .lua-52
# Fix to find correct python dir on lib64
%{__perl} -pi -e 's|get_python_lib\(0,0,prefix|get_python_lib\(1,0,prefix|g' \
@@ -390,6 +388,7 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n \
- New version
Resolves: rhbz#966639
- Updated and defuzzified patches
+- Still use lua-5.1 (fedoras < f20)
* Mon May 20 2013 Jaroslav Škarvada <jskarvad at redhat.com> - 1.4.7-17
- Require lua abi instead of package version
More information about the scm-commits
mailing list