From f4b0d26bb2fe26db56c52c1aae09e0d8ccf237c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 20 Apr 2016 10:40:04 +0200 Subject: [PATCH] New version Resolves: rhbz#1328651 - Dropped lua-5.2 and arm-crash-fix patches (upstreamed) - Updated ruby-2-fix patch --- rrdtool-1.5.3-arm-crash-fix.patch | 13 -------- rrdtool-1.5.4-lua-5.2.patch | 31 ------------------- ...ix.patch => rrdtool-1.6.0-ruby-2-fix.patch | 2 +- rrdtool.spec | 18 ++++++----- sources | 2 +- 5 files changed, 12 insertions(+), 54 deletions(-) delete mode 100644 rrdtool-1.5.3-arm-crash-fix.patch delete mode 100644 rrdtool-1.5.4-lua-5.2.patch rename rrdtool-1.5.4-ruby-2-fix.patch => rrdtool-1.6.0-ruby-2-fix.patch (96%) diff --git a/rrdtool-1.5.3-arm-crash-fix.patch b/rrdtool-1.5.3-arm-crash-fix.patch deleted file mode 100644 index 2acde93..0000000 --- a/rrdtool-1.5.3-arm-crash-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 6d74a26..6b5742c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -248,6 +248,8 @@ AC_FUNC_VPRINTF - - AC_C_BIGENDIAN - -+AC_TYPE_LONG_LONG_INT -+ - dnl for each function found we get a definition in config.h - dnl of the form HAVE_FUNCTION - diff --git a/rrdtool-1.5.4-lua-5.2.patch b/rrdtool-1.5.4-lua-5.2.patch deleted file mode 100644 index a731728..0000000 --- a/rrdtool-1.5.4-lua-5.2.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/bindings/lua/rrdlua.c b/bindings/lua/rrdlua.c -index bfbc174..b54f787 100644 ---- a/bindings/lua/rrdlua.c -+++ b/bindings/lua/rrdlua.c -@@ -350,7 +350,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 --git a/configure.ac b/configure.ac -index 1a84037..4575f00 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -813,7 +813,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" -ge "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, diff --git a/rrdtool-1.5.4-ruby-2-fix.patch b/rrdtool-1.6.0-ruby-2-fix.patch similarity index 96% rename from rrdtool-1.5.4-ruby-2-fix.patch rename to rrdtool-1.6.0-ruby-2-fix.patch index 20bc367..5f80630 100644 --- a/rrdtool-1.5.4-ruby-2-fix.patch +++ b/rrdtool-1.6.0-ruby-2-fix.patch @@ -22,5 +22,5 @@ index 54f5c23..ee85c23 100644 + $(RUBY_MAKE_OPTIONS) hdrdir="$(includedir)" \ + rubyhdrdir="$(includedir)" includedir="$(includedir)" RUBYARCHDIR= ) - # rules for building the pyton module + # rules for building the python module python: diff --git a/rrdtool.spec b/rrdtool.spec index f3eb32e..ae22207 100644 --- a/rrdtool.spec +++ b/rrdtool.spec @@ -16,7 +16,7 @@ Summary: Round Robin Database Tool to store and display time-series data Name: rrdtool -Version: 1.5.6 +Version: 1.6.0 Release: 1%{?dist} License: GPLv2+ with exceptions Group: Applications/Databases @@ -26,11 +26,9 @@ Source1: php4-%{svnrev}.tar.gz Patch1: rrdtool-1.4.4-php54.patch # disable logo for php 5.5. Patch2: rrdtool-1.4.7-php55.patch -Patch3: rrdtool-1.5.4-ruby-2-fix.patch -Patch4: rrdtool-1.5.4-lua-5.2.patch +Patch3: rrdtool-1.6.0-ruby-2-fix.patch # enable php bindings on ppc -Patch5: rrdtool-1.4.8-php-ppc-fix.patch -Patch6: rrdtool-1.5.3-arm-crash-fix.patch +Patch4: rrdtool-1.4.8-php-ppc-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: dejavu-sans-mono-fonts @@ -175,9 +173,7 @@ The %{name}-lua package includes RRDtool bindings for Lua. %if %{?rhel} %{?!rhel:7} > 6 %patch3 -p1 -b .ruby-2-fix %endif -%patch4 -p1 -b .lua-52 -%patch5 -p1 -b .php-ppc-fix -%patch6 -p1 -b .arm-crash-fix +%patch4 -p1 -b .php-ppc-fix # 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' \ @@ -397,6 +393,12 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n \ %endif %changelog +* Wed Apr 20 2016 Jaroslav Škarvada - 1.6.0-1 +- New version + Resolves: rhbz#1328651 +- Dropped lua-5.2 and arm-crash-fix patches (upstreamed) +- Updated ruby-2-fix patch + * Tue Apr 19 2016 Jaroslav Škarvada - 1.5.6-1 - New version diff --git a/sources b/sources index 5ddab39..ebfa1de 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 28074a9c368af013462631959ab90558 php4-r1190.tar.gz -c3703bca0472e43930e3ddaa848446fc rrdtool-1.5.6.tar.gz +4ff52cc44b935b02d2742e6875094da5 rrdtool-1.6.0.tar.gz