lua 5.2
This commit is contained in:
parent
e05c56a4c5
commit
0b426d6186
29
rrdtool-1.4.7-lua-5.2.patch
Normal file
29
rrdtool-1.4.7-lua-5.2.patch
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
diff -up rrdtool-1.4.7/bindings/lua/rrdlua.c.lua-52 rrdtool-1.4.7/bindings/lua/rrdlua.c
|
||||||
|
--- rrdtool-1.4.7/bindings/lua/rrdlua.c.lua-52 2013-05-15 11:38:28.152336459 -0400
|
||||||
|
+++ rrdtool-1.4.7/bindings/lua/rrdlua.c 2013-05-15 11:38:48.291336762 -0400
|
||||||
|
@@ -342,7 +342,7 @@ set_info (lua_State * L)
|
||||||
|
|
||||||
|
/**********************************************************/
|
||||||
|
|
||||||
|
-static const struct luaL_reg rrd[] = {
|
||||||
|
+static const struct luaL_Reg rrd[] = {
|
||||||
|
{"create", lua_rrd_create},
|
||||||
|
{"dump", lua_rrd_dump},
|
||||||
|
{"fetch", lua_rrd_fetch},
|
||||||
|
diff -up rrdtool-1.4.7/configure.ac.lua-52 rrdtool-1.4.7/configure.ac
|
||||||
|
--- rrdtool-1.4.7/configure.ac.lua-52 2013-05-15 11:35:49.074334072 -0400
|
||||||
|
+++ rrdtool-1.4.7/configure.ac 2013-05-15 11:35:49.077334073 -0400
|
||||||
|
@@ -744,7 +744,12 @@ LUA_EOF
|
||||||
|
LIBS=
|
||||||
|
lua_havelib=no
|
||||||
|
LUA_HAVE_COMPAT51=DONT_HAVE_COMPAT51
|
||||||
|
- AC_SEARCH_LIBS(lua_call, lua$lua_vdot lua$lua_vndot lua,
|
||||||
|
+ if test "$lua_vndot" = "52"; then
|
||||||
|
+ CALL_FUNC=lua_callk
|
||||||
|
+ else
|
||||||
|
+ CALL_FUNC=lua_call
|
||||||
|
+ fi
|
||||||
|
+ AC_SEARCH_LIBS($CALL_FUNC, lua$lua_vdot lua$lua_vndot lua,
|
||||||
|
[AC_SEARCH_LIBS(luaL_register, lua$lua_vdot lua$lua_vndot lua,
|
||||||
|
[lua_havelib=LUA$lua_vndot],
|
||||||
|
[AC_SEARCH_LIBS(luaL_module, lualib$lua_vndot lualib$lua_vdot lualib,
|
@ -18,7 +18,7 @@
|
|||||||
Summary: Round Robin Database Tool to store and display time-series data
|
Summary: Round Robin Database Tool to store and display time-series data
|
||||||
Name: rrdtool
|
Name: rrdtool
|
||||||
Version: 1.4.7
|
Version: 1.4.7
|
||||||
Release: 15%{?dist}
|
Release: 16%{?dist}
|
||||||
License: GPLv2+ with exceptions
|
License: GPLv2+ with exceptions
|
||||||
Group: Applications/Databases
|
Group: Applications/Databases
|
||||||
URL: http://oss.oetiker.ch/rrdtool/
|
URL: http://oss.oetiker.ch/rrdtool/
|
||||||
@ -30,6 +30,7 @@ Patch2: rrdtool-1.4.7-ruby-2-fix.patch
|
|||||||
# disable logo for php 5.5.
|
# disable logo for php 5.5.
|
||||||
Patch3: rrdtool-1.4.7-php55.patch
|
Patch3: rrdtool-1.4.7-php55.patch
|
||||||
Patch4: rrdtool-1.4.7-autoconf-fix.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)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
Requires: dejavu-sans-mono-fonts
|
Requires: dejavu-sans-mono-fonts
|
||||||
@ -148,7 +149,7 @@ The %{name}-ruby package includes RRDtool bindings for Ruby.
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %{with_lua}
|
%if %{with_lua}
|
||||||
%define luaver 5.1
|
%define luaver 5.2
|
||||||
%define lualibdir %{_libdir}/lua/%{luaver}
|
%define lualibdir %{_libdir}/lua/%{luaver}
|
||||||
%define luapkgdir %{_datadir}/lua/%{luaver}
|
%define luapkgdir %{_datadir}/lua/%{luaver}
|
||||||
|
|
||||||
@ -171,6 +172,7 @@ The %{name}-lua package includes RRDtool bindings for Lua.
|
|||||||
%endif
|
%endif
|
||||||
%patch2 -p1 -b .ruby-2-fix
|
%patch2 -p1 -b .ruby-2-fix
|
||||||
%patch4 -p1 -b .autoconf-fix
|
%patch4 -p1 -b .autoconf-fix
|
||||||
|
%patch5 -p1 -b .lua-52
|
||||||
|
|
||||||
# Fix to find correct python dir on lib64
|
# 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' \
|
%{__perl} -pi -e 's|get_python_lib\(0,0,prefix|get_python_lib\(1,0,prefix|g' \
|
||||||
@ -384,6 +386,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n \
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed May 15 2013 Tom Callaway <spot@fedoraproject.org> - 1.4.7-16
|
||||||
|
- lua 5.2
|
||||||
|
|
||||||
* Tue May 7 2013 Jaroslav Škarvada <jskarvad@redhat.com> - 1.4.7-15
|
* Tue May 7 2013 Jaroslav Škarvada <jskarvad@redhat.com> - 1.4.7-15
|
||||||
- Removed unneccassary dejavu-lgc-sans-mono-fonts requirement
|
- Removed unneccassary dejavu-lgc-sans-mono-fonts requirement
|
||||||
Resolves: rhbz#922467
|
Resolves: rhbz#922467
|
||||||
|
Loading…
Reference in New Issue
Block a user