From 489c3271dc2fe13d917ff73032a7adea3594c509926e394db7a39664fb0c6768 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Mon, 25 Dec 2023 21:10:41 +0000 Subject: [PATCH] Accepting request 1135102 from home:michals - Use autosetup OBS-URL: https://build.opensuse.org/request/show/1135102 OBS-URL: https://build.opensuse.org/package/show/server:database/rrdtool?expand=0&rev=6 --- rrdtool-tclsegfault.patch | 4 ++-- rrdtool.changes | 5 +++++ rrdtool.spec | 8 ++------ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/rrdtool-tclsegfault.patch b/rrdtool-tclsegfault.patch index c8b8ab4..b3d48f5 100644 --- a/rrdtool-tclsegfault.patch +++ b/rrdtool-tclsegfault.patch @@ -1,7 +1,7 @@ Index: bindings/tcl/tclrrd.c =================================================================== ---- bindings/tcl/tclrrd.c.orig -+++ 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; diff --git a/rrdtool.changes b/rrdtool.changes index 463a5e4..95a0e0f 100644 --- a/rrdtool.changes +++ b/rrdtool.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Dec 25 16:26:00 UTC 2023 - Michal Suchanek + +- Use autosetup + ------------------------------------------------------------------- Wed Mar 22 12:56:56 UTC 2023 - Adam Majer diff --git a/rrdtool.spec b/rrdtool.spec index 7ed9169..781bd8e 100644 --- a/rrdtool.spec +++ b/rrdtool.spec @@ -50,6 +50,7 @@ Patch1: e59f703bbcc0af949ee365206426b6394c340c6f.patch Patch3: rrdtool-tclsegfault.patch # PATCH-FIX-UPSTREAM -- bnc#793636 Patch12: rrdtool-zero_vs_nothing.patch +Patch14: harden_rrdcached.service.patch # Needed for tests BuildRequires: bc BuildRequires: cairo-devel >= 1.2 @@ -68,7 +69,6 @@ BuildRequires: python-rpm-macros BuildRequires: systemd-rpm-macros BuildRequires: zlib-devel Requires: dejavu -Patch14: harden_rrdcached.service.patch %if %{with python} BuildRequires: %{python}-devel BuildRequires: %{python}-setuptools @@ -214,11 +214,7 @@ big setups in mind which usually runs into I/O related problems. This daemon was written to alleviate these problems. %prep -%setup -q -%patch1 -p1 -%patch3 -%patch12 -p1 -%patch14 -p1 +%autosetup -p1 # rrd_tool/rrd_cgi: use the date of the last change modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")"