rpm/rrdtool
SHA256
1
0
Fork 0
forked from pool/rrdtool
Code Pull Requests Activity

Accepting request 1135102 from home:michals

Browse Source 
- 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
This commit is contained in:
Martin Pluskal 2023-12-25 21:10:41 +00:00 committed by Git OBS Bridge
parent 8fa839f676
commit 489c3271dc
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rrdtool-tclsegfault.patch
View File

@ -1,7 +1,7 @@
Index: bindings/tcl/tclrrd.c Index: bindings/tcl/tclrrd.c
=================================================================== ===================================================================
--- bindings/tcl/tclrrd.c.orig --- a/bindings/tcl/tclrrd.c
+++ bindings/tcl/tclrrd.c +++ b/bindings/tcl/tclrrd.c
@@ -472,6 +472,12 @@ static int Rrd_Graph( @@ -472,6 +472,12 @@ static int Rrd_Graph(
char **argv2; char **argv2;
CONST84 char *save; CONST84 char *save;

5
rrdtool.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Dec 25 16:26:00 UTC 2023 - Michal Suchanek <msuchanek@suse.com>
- Use autosetup
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Mar 22 12:56:56 UTC 2023 - Adam Majer <adam.majer@suse.de> Wed Mar 22 12:56:56 UTC 2023 - Adam Majer <adam.majer@suse.de>

8
rrdtool.spec
View File

@ -50,6 +50,7 @@ Patch1: e59f703bbcc0af949ee365206426b6394c340c6f.patch
Patch3: rrdtool-tclsegfault.patch Patch3: rrdtool-tclsegfault.patch
# PATCH-FIX-UPSTREAM -- bnc#793636 # PATCH-FIX-UPSTREAM -- bnc#793636
Patch12: rrdtool-zero_vs_nothing.patch Patch12: rrdtool-zero_vs_nothing.patch
Patch14: harden_rrdcached.service.patch
# Needed for tests # Needed for tests
BuildRequires: bc BuildRequires: bc
BuildRequires: cairo-devel >= 1.2 BuildRequires: cairo-devel >= 1.2
@ -68,7 +69,6 @@ BuildRequires: python-rpm-macros
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
BuildRequires: zlib-devel BuildRequires: zlib-devel
Requires: dejavu Requires: dejavu
Patch14: harden_rrdcached.service.patch
%if %{with python} %if %{with python}
BuildRequires: %{python}-devel BuildRequires: %{python}-devel
BuildRequires: %{python}-setuptools 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. daemon was written to alleviate these problems.
%prep %prep
%setup -q %autosetup -p1
%patch1 -p1
%patch3
%patch12 -p1
%patch14 -p1
# rrd_tool/rrd_cgi: use the date of the last change # rrd_tool/rrd_cgi: use the date of the last change
modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")" modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")"