From 8554d9a44bb45922fc5129b79c54899fc189b65a828d11276b0862330db48d92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 23 Sep 2019 07:23:32 +0000 Subject: [PATCH] Accepting request 732521 from home:AndreasStieger:branches:devel:languages:python rrdtool 1.7.2 OBS-URL: https://build.opensuse.org/request/show/732521 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/rrdtool?expand=0&rev=89 --- rrdtool-1.7.1-compile_fix.patch | 29 ----------------------------- rrdtool-1.7.1.tar.gz | 3 --- rrdtool-1.7.2.tar.gz | 3 +++ rrdtool.changes | 10 ++++++++++ rrdtool.spec | 30 ++++++++++++++---------------- 5 files changed, 27 insertions(+), 48 deletions(-) delete mode 100644 rrdtool-1.7.1-compile_fix.patch delete mode 100644 rrdtool-1.7.1.tar.gz create mode 100644 rrdtool-1.7.2.tar.gz diff --git a/rrdtool-1.7.1-compile_fix.patch b/rrdtool-1.7.1-compile_fix.patch deleted file mode 100644 index ddba929..0000000 --- a/rrdtool-1.7.1-compile_fix.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/etc/Makefile.am b/etc/Makefile.am -index ab763dc..7d18178 100644 ---- a/etc/Makefile.am -+++ b/etc/Makefile.am -@@ -3,6 +3,6 @@ EXTRA_DIST = rrdcached-default-redhat rrdcached-init-redhat rrdcached-default-ls - - if HAVE_SYSTEMD - systemdsystemunit_DATA = \ -- etc/rrdcached.socket \ -- etc/rrdcached.service -+ rrdcached.socket \ -+ rrdcached.service - endif -\ No newline at end of file -diff --git a/etc/Makefile.in b/etc/Makefile.in -index 74b914b..d512fd5 100644 ---- a/etc/Makefile.in -+++ b/etc/Makefile.in -@@ -368,8 +368,8 @@ EXTRA_DIST = rrdcached-default-redhat rrdcached-init-redhat rrdcached-default-ls - rrdcached.socket.in rrdcached.service.in - - @HAVE_SYSTEMD_TRUE@systemdsystemunit_DATA = \ --@HAVE_SYSTEMD_TRUE@ etc/rrdcached.socket \ --@HAVE_SYSTEMD_TRUE@ etc/rrdcached.service -+@HAVE_SYSTEMD_TRUE@ rrdcached.socket \ -+@HAVE_SYSTEMD_TRUE@ rrdcached.service - - all: all-am - diff --git a/rrdtool-1.7.1.tar.gz b/rrdtool-1.7.1.tar.gz deleted file mode 100644 index 899b8ec..0000000 --- a/rrdtool-1.7.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:989b778eda6967aa5192c73abafe43e7b10e6100776971a7e79d249942781aae -size 2881346 diff --git a/rrdtool-1.7.2.tar.gz b/rrdtool-1.7.2.tar.gz new file mode 100644 index 0000000..a1d76f1 --- /dev/null +++ b/rrdtool-1.7.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a199faeb7eff7cafc46fac253e682d833d08932f3db93a550a4a5af180ca58db +size 2883737 diff --git a/rrdtool.changes b/rrdtool.changes index 2c2ef3b..f141f7c 100644 --- a/rrdtool.changes +++ b/rrdtool.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sun Sep 22 16:40:00 UTC 2019 - Andreas Stieger + +- rrdtool 1.7.2: + * fix segfault on non-existent RRD file when using rrdcached + * fix bounds handling, documentation and checking on rrdtool xport + * Fix %s/%S unit autoscaling in gprint for json/xml + * Optimized PDP Calculation +- drop rrdtool-1.7.1-compile_fix.patch, upstream + ------------------------------------------------------------------- Wed Feb 13 10:09:13 UTC 2019 - kstreitova@suse.com diff --git a/rrdtool.spec b/rrdtool.spec index 9104b72..3d69c69 100644 --- a/rrdtool.spec +++ b/rrdtool.spec @@ -12,15 +12,18 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # +%define python python +%if 0%{?suse_version} >= 1500 + %define python python3 +%endif #Compat macro for new _fillupdir macro introduced in Nov 2017 %if ! %{defined _fillupdir} - %define _fillupdir /var/adm/fillup-templates + %define _fillupdir %{_localstatedir}/adm/fillup-templates %endif - %bcond_without lua %bcond_without python %bcond_without ruby @@ -28,18 +31,14 @@ %bcond_without libdbi %bcond_without libwrap %bcond_with rados -%define python python -%if 0%{?suse_version} >= 1500 - %define python python3 -%endif Name: rrdtool -Version: 1.7.1 +Version: 1.7.2 Release: 0 Summary: Round Robin Database Tool to store and display time-series data License: GPL-2.0-or-later AND LGPL-2.0-or-later Group: Productivity/Scientific/Math -Url: http://oss.oetiker.ch/rrdtool/ -Source0: http://oss.oetiker.ch/%{name}/pub/%{name}-%{version}.tar.gz +URL: https://oss.oetiker.ch/rrdtool/ +Source0: https://oss.oetiker.ch/%{name}/pub/%{name}-%{version}.tar.gz Source2: sysconfig.rrdcached Source4: rrdcached-systemd-pre Source5: rrdcached.service @@ -48,10 +47,6 @@ Source99: %{name}.changes Patch3: rrdtool-tclsegfault.patch # PATCH-FIX-UPSTREAM -- bnc#793636 Patch12: rrdtool-zero_vs_nothing.patch -%if 0%{?suse_version} >= 1500 -Patch13: python3.patch -%endif -Patch14: rrdtool-1.7.1-compile_fix.patch # Needed for tests BuildRequires: bc BuildRequires: cairo-devel >= 1.2 @@ -69,6 +64,9 @@ BuildRequires: pango-devel >= 1.14 BuildRequires: systemd-rpm-macros BuildRequires: zlib-devel Requires: dejavu +%if 0%{?suse_version} >= 1500 +Patch13: python3.patch +%endif %if %{with python} BuildRequires: %{python}-devel BuildRequires: %{python}-setuptools @@ -220,7 +218,6 @@ daemon was written to alleviate these problems. %if 0%{?suse_version} >= 1500 %patch13 -p1 %endif -%patch14 -p1 # rrd_tool/rrd_cgi: use the date of the last change modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")" @@ -379,7 +376,8 @@ getent passwd %{rrdcached_user} >/dev/null || useradd -s /sbin/nologin -g %{rrdc %if %{with python} %files -n %{python}-%{name} -%doc bindings/python/COPYING bindings/python/README.md +%license bindings/python/COPYING +%doc bindings/python/README.md %if 0%{?suse_version} >= 1500 %{python3_sitearch}/* %else