rrdtool: Update to 1.8.0

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
deleted file mode 100644 (file)
index 9d45aa7..0000000
--- a/rrdtool/patches/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/rrdtool.nm b/rrdtool/rrdtool.nm
index b3421c2a49f4e9a6c92c2c66e31f70d40b6a743d..c9fa29602bb1c2d674483339ae2e4b05eae38fd3 100644 (file)
--- a/rrdtool/rrdtool.nm
+++ b/rrdtool/rrdtool.nm
@@ -4,23 +4,23 @@
 ###############################################################################
 
 name       = rrdtool
-version    = 1.7.1
+version    = 1.8.0
 release    = 1
 
 groups     = Applications/Databases
 url        = https://oss.oetiker.ch/rrdtool/
 license    = GPLv2+ with exceptions
-summary    = Round Robin Database Tool to store and display time-series data.
+summary    = Round Robin Database Tool to store and display time-series data
 
 description
-       RRD is the Acronym for Round Robin Database. RRD is a system to \
-       store and display time-series data. It stores the data in a \
-       very compact way that will not expand over time, and it presents \
-       useful graphs by processing the data to enforce a certain data \
+       RRD is the Acronym for Round Robin Database. RRD is a system to
+       store and display time-series data. It stores the data in a
+       very compact way that will not expand over time, and it presents
+       useful graphs by processing the data to enforce a certain data
        density.
 end
 
-source_dl  = https://oss.oetiker.ch/rrdtool/pub/
+source_dl  = https://github.com/oetiker/rrdtool-1.x/releases/download/v%{version}/
 
 build
        requires
@@ -34,8 +34,8 @@ build
                openssl-devel
                pango-devel
                pkg-config
-               python-devel
-               python-setuptools
+               python3-devel
+               python3-setuptools
                systemd-devel
                zlib-devel
        end
@@ -48,7 +48,8 @@ build
                --disable-static \
                --enable-python \
                --disable-rrdcached \
-               --with-pic
+               --with-pic \
+               PYTHON=%{python3}
 
        prepare_cmds
                # Remove rpath
@@ -75,15 +76,8 @@ packages
                requires += dejavu-fonts-sans-mono-fonts
        end
 
-       package python-%{name}
-               summary = Python bindings for rrdtool %{thisver}.
-               description = %{summary}
-
-               requires = %{name}-libs = %{thisver}
-
-               files
-                       /usr/lib*/python*
-               end
+       package python3-%{name}
+               template PYTHON3
        end
 
        package %{name}-devel