From 1b3b3f2b0f808c31159f5736aeb5cc4f22631a860ef59a53ba92cb18f82e76be Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Mon, 29 Jul 2024 07:26:32 +0000
Subject: [PATCH] - Remove disabled patch rrdtool-tclsegfault.patch - Small
 spec file modernisation

OBS-URL: https://build.opensuse.org/package/show/server:database/rrdtool?expand=0&rev=10
---
 rrdtool-tclsegfault.patch | 30 ------------------------------
 rrdtool.changes           |  6 ++++++
 rrdtool.spec              |  4 ++--
 3 files changed, 8 insertions(+), 32 deletions(-)
 delete mode 100644 rrdtool-tclsegfault.patch

diff --git a/rrdtool-tclsegfault.patch b/rrdtool-tclsegfault.patch
deleted file mode 100644
index b3d48f5..0000000
--- a/rrdtool-tclsegfault.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: bindings/tcl/tclrrd.c
-===================================================================
---- a/bindings/tcl/tclrrd.c
-+++ b/bindings/tcl/tclrrd.c
-@@ -472,6 +472,12 @@ static int Rrd_Graph(
-     char    **argv2;
-     CONST84 char *save;
- 
-+    if (argc < 2) {
-+        Tcl_AppendResult(interp, "RRD Error: needs image filename",
-+                         (char *) NULL);
-+        return TCL_ERROR;
-+    }
-+
-     /*
-      * If the "filename" is a Tcl fileID, then arrange for rrd_graph() to write to
-      * that file descriptor.  Will this work with windoze?  I have no idea.
-@@ -597,6 +603,12 @@ static int Rrd_Resize(
- {
-     char    **argv2;
- 
-+    if (argc < 2) {
-+        Tcl_AppendResult(interp, "RRD Error: needs rrd filename",
-+                         (char *) NULL);
-+        return TCL_ERROR;
-+    }
-+
-     argv2 = getopt_init(argc, argv);
-     rrd_resize(argc, argv2);
-     getopt_cleanup(argc, argv2);
diff --git a/rrdtool.changes b/rrdtool.changes
index 6ec71cd..73fc993 100644
--- a/rrdtool.changes
+++ b/rrdtool.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jul 29 07:19:23 UTC 2024 - Martin Pluskal <mpluskal@suse.com>
+
+- Remove disabled patch rrdtool-tclsegfault.patch 
+- Small spec file modernisation
+
 -------------------------------------------------------------------
 Fri Jul 12 15:12:22 UTC 2024 - Martin Jambor <mjambor@suse.com>
 
diff --git a/rrdtool.spec b/rrdtool.spec
index d1f5f83..220547a 100644
--- a/rrdtool.spec
+++ b/rrdtool.spec
@@ -272,7 +272,7 @@ autoreconf -fi
         --with-gnu-ld \
         --with-systemdsystemunitdir=%{_unitdir}
 
-make %{?_smp_mflags}
+%make_build
 
 %install
 make \
@@ -320,7 +320,7 @@ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcrrdcached
 %check
 # Follow upstream, disable the following, failing tests: rpn1
 # https://github.com/oetiker/rrdtool-1.x/blob/master/.travis.yml#L30
-make %{?_smp_mflags} check TESTS="modify1 modify2 modify3 modify4 modify5 rpn2 xport1 \
+%make_build check TESTS="modify1 modify2 modify3 modify4 modify5 rpn2 xport1 \
 tune1 tune2 graph1 rrdcreate dump-restore create-with-source-1 create-with-source-2 \
 create-with-source-3 create-with-source-4 create-with-source-and-mapping-1 \
 create-from-template-1 dcounter1 vformatter1 list1 pdp-calc1"