SHA256
1
0
forked from pool/rrdtool

Accepting request 1073788 from server:database

- Decouple e59f703bbcc0af949ee365206426b6394c340c6f.patch from
  github url

- Follow upstream, disable the following, failing tests: rpn1
  https://github.com/oetiker/rrdtool-1.x/blob/master/.travis.yml#L30

OBS-URL: https://build.opensuse.org/request/show/1073788
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rrdtool?expand=0&rev=76
This commit is contained in:
Dominique Leuenberger 2023-03-24 14:18:25 +00:00 committed by Git OBS Bridge
commit 8d02535f43
2 changed files with 21 additions and 3 deletions

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Wed Mar 22 12:56:56 UTC 2023 - Adam Majer <adam.majer@suse.de>
- Decouple e59f703bbcc0af949ee365206426b6394c340c6f.patch from
github url
-------------------------------------------------------------------
Tue Mar 21 18:55:20 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
- Follow upstream, disable the following, failing tests: rpn1
https://github.com/oetiker/rrdtool-1.x/blob/master/.travis.yml#L30
-------------------------------------------------------------------
Wed Apr 13 08:27:59 UTC 2022 - Guillaume GARDET <guillaume.gardet@opensuse.org>

View File

@ -1,7 +1,7 @@
#
# spec file for package rrdtool
#
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -44,7 +44,8 @@ Source4: rrdcached-systemd-pre
Source5: rrdcached.service
Source99: %{name}.changes
# PATCH-FIX-UPSTREAM -- Fix BUILD_DATE in rrdtool help output (fix segfault)
Patch1: https://github.com/oetiker/rrdtool-1.x/commit/e59f703bbcc0af949ee365206426b6394c340c6f.patch
# https://github.com/oetiker/rrdtool-1.x/commit/e59f703bbcc0af949ee365206426b6394c340c6f.patch
Patch1: e59f703bbcc0af949ee365206426b6394c340c6f.patch
# PATCH-FIX-UPSTREAM -- Prevent possible segfault
Patch3: rrdtool-tclsegfault.patch
# PATCH-FIX-UPSTREAM -- bnc#793636
@ -316,7 +317,12 @@ mkdir -p %{buildroot}%{_sbindir}
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcrrdcached
%check
make %{?_smp_mflags} 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 \
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"
%pre cached
getent group %{rrdcached_group} >/dev/null || groupadd %{rrdcached_group}