From 3f8c025ea7ff18ae1f93daf854b911b85fcab94f221aa12275abe3e1f520e4b9 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Tue, 29 Mar 2022 17:45:17 +0000
Subject: [PATCH] Accepting request 965682 from
 home:dspinella:branches:devel:languages:python

- Update to 1.8.0:
  For the list of changes, please have a look here:
  https://github.com/oetiker/rrdtool-1.x/blob/master/CHANGES
- Remove unneeded python3.patch

OBS-URL: https://build.opensuse.org/request/show/965682
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/rrdtool?expand=0&rev=94
---
 python3.patch        | 18 ------------------
 rrdtool-1.7.2.tar.gz |  3 ---
 rrdtool-1.8.0.tar.gz |  3 +++
 rrdtool.changes      |  8 ++++++++
 rrdtool.spec         |  8 ++------
 5 files changed, 13 insertions(+), 27 deletions(-)
 delete mode 100644 python3.patch
 delete mode 100644 rrdtool-1.7.2.tar.gz
 create mode 100644 rrdtool-1.8.0.tar.gz

diff --git a/python3.patch b/python3.patch
deleted file mode 100644
index c1c3b1c..0000000
--- a/python3.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: rrdtool-1.7.0/m4/acinclude.m4
-===================================================================
---- rrdtool-1.7.0.orig/m4/acinclude.m4
-+++ rrdtool-1.7.0/m4/acinclude.m4
-@@ -426,12 +426,7 @@ AC_DEFUN([AM_CHECK_PYTHON_HEADERS],
- [AC_REQUIRE([AM_PATH_PYTHON])
- AC_MSG_CHECKING(for headers required to compile python extensions)
- dnl deduce PYTHON_INCLUDES
--py_prefix=`$PYTHON -c "import sys; print(sys.prefix)"`
--py_exec_prefix=`$PYTHON -c "import sys; print(sys.exec_prefix)"`
--PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
--if test "$py_prefix" != "$py_exec_prefix"; then
--  PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
--fi
-+PYTHON_INCLUDES="-I"`$PYTHON -c "import sysconfig; print(sysconfig.get_path('include'))"`
- AC_SUBST(PYTHON_INCLUDES)
- dnl check if the headers exist:
- save_CPPFLAGS="$CPPFLAGS"
diff --git a/rrdtool-1.7.2.tar.gz b/rrdtool-1.7.2.tar.gz
deleted file mode 100644
index a1d76f1..0000000
--- a/rrdtool-1.7.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a199faeb7eff7cafc46fac253e682d833d08932f3db93a550a4a5af180ca58db
-size 2883737
diff --git a/rrdtool-1.8.0.tar.gz b/rrdtool-1.8.0.tar.gz
new file mode 100644
index 0000000..641d9ea
--- /dev/null
+++ b/rrdtool-1.8.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bd37614137d7a8dc523359648eb2a81631a34fd91a82ed5581916a52c08433f4
+size 2955398
diff --git a/rrdtool.changes b/rrdtool.changes
index 9c29e52..9b55f4d 100644
--- a/rrdtool.changes
+++ b/rrdtool.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Mar 29 13:41:16 UTC 2022 - Danilo Spinella <danilo.spinella@suse.com>
+
+- Update to 1.8.0:
+  For the list of changes, please have a look here:
+  https://github.com/oetiker/rrdtool-1.x/blob/master/CHANGES
+- Remove unneeded python3.patch
+
 -------------------------------------------------------------------
 Sun Jan 16 13:28:42 UTC 2022 - Dirk Müller <dmueller@suse.com>
 
diff --git a/rrdtool.spec b/rrdtool.spec
index 60be46a..1f7ff27 100644
--- a/rrdtool.spec
+++ b/rrdtool.spec
@@ -32,13 +32,13 @@
 %bcond_without  libwrap
 %bcond_with     rados
 Name:           rrdtool
-Version:        1.7.2
+Version:        1.8.0
 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:            https://oss.oetiker.ch/rrdtool/
-Source0:        https://oss.oetiker.ch/%{name}/pub/%{name}-%{version}.tar.gz
+Source0:        https://github.com/oetiker/%{name}-1.x/releases/download/v%{version}/%{name}-%{version}.tar.gz
 Source2:        sysconfig.rrdcached
 Source4:        rrdcached-systemd-pre
 Source5:        rrdcached.service
@@ -65,7 +65,6 @@ BuildRequires:  python-rpm-macros
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  zlib-devel
 Requires:       dejavu
-Patch13:        python3.patch
 Patch14:        harden_rrdcached.service.patch
 %if %{with python}
 BuildRequires:  %{python}-devel
@@ -215,9 +214,6 @@ daemon was written to alleviate these problems.
 %setup -q
 %patch3
 %patch12 -p1
-%if 0%{?suse_version} >= 1500
-%patch13 -p1
-%endif
 %patch14 -p1
 
 # rrd_tool/rrd_cgi: use the date of the last change