From cdb06502178294a9c1551dd42fe8252fcbff4897 Mon Sep 17 00:00:00 2001
From: Marcin Krol <hawk@tld-linux.org>
Date: Mon, 6 Mar 2023 19:57:27 +0100
Subject: [PATCH] - updated to 1.8.0

---
 rrdtool-missing.patch | 71 -------------------------------------------
 rrdtool.spec          | 14 ++++-----
 2 files changed, 7 insertions(+), 78 deletions(-)
 delete mode 100644 rrdtool-missing.patch

diff --git a/rrdtool-missing.patch b/rrdtool-missing.patch
deleted file mode 100644
index af066f2..0000000
--- a/rrdtool-missing.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- rrdtool-1.5.4/doc/rrdrados.pod.orig	1970-01-01 01:00:00.000000000 +0100
-+++ rrdtool-1.5.4/doc/rrdrados.pod	2015-09-20 11:15:15.308190828 +0200
-@@ -0,0 +1,68 @@
-+=head1 NAME
-+
-+rrdrados - Creating, updating and retrieving RRD files from Ceph
-+
-+=head1 SYNOPSIS
-+
-+E<lt>rrdfileE<gt> = B<ceph//E<lt>nameE<gt>>
-+
-+
-+=head1 DESCRIPTION
-+
-+This module adds support for creating, updating and retrieving RRD files
-+directly from a Ceph cluster using librados.
-+
-+It adds a ceph// prefix to RRD file name which is used to instruct rrdtool to
-+operate on a file that is stored in Ceph.
-+
-+Currently the module expects to find the Ceph configuration file in the default
-+location at /etc/ceph/ceph.conf. By default it uses Ceph client ID "admin" and a
-+Ceph pool named "rrd".
-+
-+
-+=head1 ENVIRONMENT VARIABLES
-+
-+=over 4
-+
-+=item B<CEPH_ID>
-+
-+Sets the Ceph Client ID to use when connecting. By default the client ID "admin"
-+is used.
-+
-+=item B<CEPH_POOL>
-+
-+Sets the name of the Ceph Pool to connect to. By default, the pool "rrd" is
-+used.
-+
-+=back
-+
-+
-+=head1 EXAMPLES
-+
-+B<Creating an RRD file on Ceph>
-+
-+ rrdtool create ceph//temperature.rrd --step 300 \
-+   DS:temp:GAUGE:600:-273:5000 \
-+   RRA:AVERAGE:0.5:1:1200 \
-+   RRA:MIN:0.5:12:2400 \
-+   RRA:MAX:0.5:12:2400 \
-+   RRA:AVERAGE:0.5:12:2400
-+
-+
-+B<Importing an existing RRD into Ceph>
-+
-+ rrdtool dump existing.rrd | rrdtool restore - ceph//new.rrd
-+
-+Or you could also copy the RRD file directly into Ceph using the rados command
-+line utility.
-+
-+
-+B<Retrieving RRD data from Ceph>
-+
-+ rrdtool fetch ceph//file.rrd AVERAGE
-+
-+
-+=head1 AUTHOR
-+
-+Simon Boulet E<lt>simon@nostalgeek.comE<gt>
-+
diff --git a/rrdtool.spec b/rrdtool.spec
index 7f75875..d67c280 100644
--- a/rrdtool.spec
+++ b/rrdtool.spec
@@ -27,15 +27,14 @@ Summary(pt_BR.UTF-8):	Round Robin Database, uma ferramenta para construção de
 Summary(ru.UTF-8):	RRDtool - база данных с "циклическим обновлением"
 Summary(uk.UTF-8):	RRDtool - це система зберігання та показу серійних даних
 Name:		rrdtool
-Version:	1.7.2
-Release:	7
+Version:	1.8.0
+Release:	1
 License:	GPL v2+ + FLOSS exception
 Group:		Applications/Databases
-Source0:	https://oss.oetiker.ch/rrdtool/pub/%{name}-%{version}.tar.gz
-# Source0-md5:	638e3a0a1609d97e9f82e8832759dcd2
+Source0:	https://github.com/oetiker/rrdtool-1.x/releases/download/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	852754364cbd0703a099b5eb32932851
 Patch0:		%{name}-tcl-path.patch
-Patch1:		%{name}-missing.patch
-Patch2:		groff.patch
+Patch1:		groff.patch
 URL:		http://oss.oetiker.ch/rrdtool/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
@@ -313,7 +312,6 @@ Rozszerzenie Tcl-a pozwalające na dostęp do biblioteki Tcl.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %{__sed} -i -e 's#\$TCL_PACKAGE_PATH#%{_prefix}/lib#g' configure.ac
 %{__sed} -i -e 's#/lib/lua/#/%{_lib}/lua/#g' configure.ac
@@ -412,8 +410,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/rrdlastupdate.1*
 %{_mandir}/man1/rrdlist.1*
 %{?with_ceph:%{_mandir}/man1/rrdrados.1*}
+%{?with_python:%{_mandir}/man1/rrdpython.1*}
 %{_mandir}/man1/rrdresize.1*
 %{_mandir}/man1/rrdrestore.1*
+%{?with_ruby:%{_mandir}/man1/rrdruby.1*}
 %{_mandir}/man1/rrdthreads.1*
 %{_mandir}/man1/rrdtool.1*
 %{_mandir}/man1/rrdtune.1*
-- 
2.44.0