From f2c31df8ab451fc8444102532bf204422ea7412debde496f2579acef70a81cb8 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 6 Dec 2016 12:05:05 +0000 Subject: [PATCH] Accepting request 443080 from home:luizluca:branches:devel:languages:python Updated to 1.6.0 As since upstream now supports lua since 5.0 (tested until 5.2), maybe it should remove the fixed requirement lua51-devel OBS-URL: https://build.opensuse.org/request/show/443080 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/rrdtool?expand=0&rev=71 --- rrdtool-1.5.4-lua-5.2.patch | 31 ------------------------------- rrdtool-1.5.5.tar.gz | 3 --- rrdtool-1.6.0.tar.gz | 3 +++ rrdtool-tclsegfault.patch | 4 +++- rrdtool-zero_vs_nothing.patch | 10 +++++----- rrdtool.changes | 24 ++++++++++++++++++++++++ rrdtool.spec | 13 ++----------- 7 files changed, 37 insertions(+), 51 deletions(-) delete mode 100644 rrdtool-1.5.4-lua-5.2.patch delete mode 100644 rrdtool-1.5.5.tar.gz create mode 100644 rrdtool-1.6.0.tar.gz 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 1a6a25f..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.5.tar.gz b/rrdtool-1.5.5.tar.gz deleted file mode 100644 index 0f94f7f..0000000 --- a/rrdtool-1.5.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3a286d449c05d657e3fc3adcaa5cb4f0cfac8f465324b14f364a45d4ff8ca6f6 -size 2187685 diff --git a/rrdtool-1.6.0.tar.gz b/rrdtool-1.6.0.tar.gz new file mode 100644 index 0000000..52231d0 --- /dev/null +++ b/rrdtool-1.6.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cd948e89cd2d8825fab4a6fb0323f810948d934af7d92c9ee8b5e9e1350e52d7 +size 2186538 diff --git a/rrdtool-tclsegfault.patch b/rrdtool-tclsegfault.patch index a77e80a..c8b8ab4 100644 --- a/rrdtool-tclsegfault.patch +++ b/rrdtool-tclsegfault.patch @@ -1,4 +1,6 @@ ---- bindings/tcl/tclrrd.c +Index: bindings/tcl/tclrrd.c +=================================================================== +--- bindings/tcl/tclrrd.c.orig +++ bindings/tcl/tclrrd.c @@ -472,6 +472,12 @@ static int Rrd_Graph( char **argv2; diff --git a/rrdtool-zero_vs_nothing.patch b/rrdtool-zero_vs_nothing.patch index a2931cc..b6d7a5b 100644 --- a/rrdtool-zero_vs_nothing.patch +++ b/rrdtool-zero_vs_nothing.patch @@ -1,8 +1,8 @@ -Index: rrdtool-1.4.7/src/rrd_gfx.c +Index: rrdtool-1.6.0/src/rrd_gfx.c =================================================================== ---- rrdtool-1.4.7.orig/src/rrd_gfx.c -+++ rrdtool-1.4.7/src/rrd_gfx.c -@@ -293,10 +293,10 @@ void gfx_line_fit( +--- rrdtool-1.6.0.orig/src/rrd_gfx.c ++++ rrdtool-1.6.0/src/rrd_gfx.c +@@ -329,10 +329,10 @@ void gfx_line_fit( line_width = cairo_get_line_width(cr); line_height = line_width; cairo_user_to_device_distance(cr, &line_width, &line_height); @@ -17,7 +17,7 @@ Index: rrdtool-1.4.7/src/rrd_gfx.c cairo_device_to_user(cr, x, y); } -@@ -312,7 +312,7 @@ void gfx_area_fit( +@@ -348,7 +348,7 @@ void gfx_area_fit( if (!im->gridfit) return; cairo_user_to_device(cr, x, y); diff --git a/rrdtool.changes b/rrdtool.changes index 4ad6a12..6ff33ba 100644 --- a/rrdtool.changes +++ b/rrdtool.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Thu Dec 1 16:44:25 UTC 2016 - luizluca@tre-sc.jus.br + +- Update to 1.6.0 + + Features + * librrd is now fully thread-safe. librrd_th is gone + * make lua bindings work with lua 5.1 + * configure option to disable doc building --enable-docs=no + * new CDEF function SMIN: a,b,c,3,SMIN -> min(a,b,c) + * new CDEF function SMAX: a,b,c,3,SMAX -> max(a,b,c) + * new CDEF function STDEV: a,b,c,3,STDEV -> stdev(a,b,c) + * new CDEF function POW: a,b,POW -> a**b + * new CDEF function PERCENT: a,b,c,95,3,PERCENT -> find 95percentile of a,b,c + * re-introducted --showtime option on rrdxport + * be more careful in determining the locales idea of first day of the week + * lots of spelling fixes all around + +- Removed rrdtool-1.5.4-lua-5.2.patch as upstream already supports lua 5.2 since + https://github.com/oetiker/rrdtool-1.x/commit/7af5f76227330504d4d16234488c1118d4409621 + However, spec still requires explicitily lua51-devel (but lua52-devel also works) +- librrd_th* references are gone +- Patches refreshed + ------------------------------------------------------------------- Wed Nov 25 12:40:01 UTC 2015 - aj@ajaissle.de diff --git a/rrdtool.spec b/rrdtool.spec index 9637d8b..a899e2d 100644 --- a/rrdtool.spec +++ b/rrdtool.spec @@ -1,7 +1,7 @@ # # spec file for package rrdtool # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,7 +26,7 @@ %bcond_with rados Name: rrdtool -Version: 1.5.5 +Version: 1.6.0 Release: 0 Summary: Round Robin Database Tool to store and display time-series data License: GPL-2.0+ and LGPL-2.0+ @@ -41,8 +41,6 @@ Source99: %{name}.changes Patch3: rrdtool-tclsegfault.patch # PATCH-FIX-UPSTREAM -- bnc#793636 Patch12: rrdtool-zero_vs_nothing.patch -# PATCH-FIX-UPSTREAM -- lua >= 5.2 uses lua_callk -Patch13: rrdtool-1.5.4-lua-5.2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cairo-devel >= 1.2 @@ -132,7 +130,6 @@ server load average). This package contains documentation on using RRD. This package contains the Lua bindings. %endif - %if %{with python} %package -n python-%{name} Summary: Python bindings for RRDtool @@ -145,7 +142,6 @@ Requires: python >= %{python_version} Python RRDtool bindings. %endif - %if %{with ruby} %package -n ruby-%{name} Summary: Ruby bindings for RRDtool @@ -162,7 +158,6 @@ server load average). This package contains documentation on using RRD. This package contains the Ruby bindings. %endif - %if %{with tcl} %package -n tcl-%{name} Summary: Tcl bindings for RRDtool @@ -179,7 +174,6 @@ server load average). This package contains documentation on using RRD. This package contains the Tcl bindings. %endif - %package cached %define rrdcached_user rrdcached %define rrdcached_group rrdcached @@ -201,7 +195,6 @@ daemon was written to alleviate these problems. %setup -q %patch3 %patch12 -p1 -%patch13 -p1 # rrd_tool/rrd_cgi: use the date of the last change modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")" @@ -333,12 +326,10 @@ systemd-tmpfiles --create %{_tmpfilesdir}/rddcached.conf >/dev/null 2>&1 || : %{_bindir}/* %exclude %{_bindir}/rrdcached %{_libdir}/librrd.so.* -%{_libdir}/librrd_th.so.* %files devel %defattr(-,root,root,-) %{_includedir}/*.h -%{_libdir}/librrd_th.so %{_libdir}/librrd.so %{_libdir}/pkgconfig/librrd.pc