rrdtool: Update to 1.7.1

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/rrdtool/patches/rrdtool-1.7.1-compile-fix.patch b/rrdtool/patches/rrdtool-1.7.1-compile-fix.patch
new file mode 100644 (file)
index 0000000..9d45aa7
--- /dev/null
+++ b/rrdtool/patches/rrdtool-1.7.1-compile-fix.patch
@@ -0,0 +1,29 @@
+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/rrdtool.nm b/rrdtool/rrdtool.nm
index c9e514155bfdccce217fcd04e15871eec3353542..b3421c2a49f4e9a6c92c2c66e31f70d40b6a743d 100644 (file)
--- a/rrdtool/rrdtool.nm
+++ b/rrdtool/rrdtool.nm
@@ -4,11 +4,11 @@
 ###############################################################################
 
 name       = rrdtool
-version    = 1.5.4
+version    = 1.7.1
 release    = 1
 
 groups     = Applications/Databases
-url        = http://oss.oetiker.ch/rrdtool/
+url        = https://oss.oetiker.ch/rrdtool/
 license    = GPLv2+ with exceptions
 summary    = Round Robin Database Tool to store and display time-series data.
 
@@ -20,7 +20,7 @@ description
        density.
 end
 
-source_dl  = http://oss.oetiker.ch/rrdtool/pub/
+source_dl  = https://oss.oetiker.ch/rrdtool/pub/
 
 build
        requires
@@ -35,6 +35,7 @@ build
                pango-devel
                pkg-config
                python-devel
+               python-setuptools
                systemd-devel
                zlib-devel
        end
@@ -46,6 +47,7 @@ build
                --disable-ruby \
                --disable-static \
                --enable-python \
+               --disable-rrdcached \
                --with-pic
 
        prepare_cmds