From 63cd03010cfe7c23a69de188020c863be1c080684a300e1f1e27d279a198254c Mon Sep 17 00:00:00 2001 From: Mia Herkt Date: Sun, 6 Dec 2020 08:37:58 +0000 Subject: [PATCH] Accepting request 849872 from home:xenonpk - Allow go plugin to build for Tumbleweed OBS-URL: https://build.opensuse.org/request/show/849872 OBS-URL: https://build.opensuse.org/package/show/network/netdata?expand=0&rev=68 --- netdata.changes | 5 +++++ netdata.spec | 10 +++++----- vendor.tar.gz | 4 ++-- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/netdata.changes b/netdata.changes index b8bef91..25edcf8 100644 --- a/netdata.changes +++ b/netdata.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Nov 21 17:11:02 UTC 2020 - Duarte Pousa + +- Allow go plugin to build for Tumbleweed + ------------------------------------------------------------------- Wed Oct 14 23:35:47 UTC 2020 - Mia Herkt diff --git a/netdata.spec b/netdata.spec index 65aea29..4a1ebad 100644 --- a/netdata.spec +++ b/netdata.spec @@ -38,7 +38,7 @@ BuildRequires: dos2unix BuildRequires: fdupes BuildRequires: git-core # suse_version is set to 1500 even for 15.2 -%if 0%{?sle_version} >= 150200 +%if 0%{?sle_version} >= 150200 || 0%{?suse_version} > 1500 BuildRequires: go >= 1.13 BuildRequires: python3 %else @@ -60,7 +60,7 @@ Recommends: curl Recommends: iproute-tc Recommends: lm_sensors Recommends: nmap-ncat curl openssl(cli) -%if 0%{?sle_version} >= 150200 +%if 0%{?sle_version} >= 150200 || 0%{?suse_version} > 1500 Recommends: python3 Recommends: python3-PyMySQL Recommends: python3-psycopg2 @@ -87,7 +87,7 @@ using interactive web dashboards. %patch2 -p1 sed -i 's,/usr/bin/env bash,/bin/bash,' claim/%{name}-claim.sh.in -%if 0%{?sle_version} >= 150200 +%if 0%{?sle_version} >= 150200 || 0%{?suse_version} > 1500 sed -i 's,^pybinary=.*,pybinary=/usr/bin/python3,' collectors/python.d.plugin/python.d.plugin.in tar xf %{S:1} @@ -110,7 +110,7 @@ export GOFLAGS=-mod=vendor %{?conf} %make_build -%if 0%{?sle_version} >= 150200 +%if 0%{?sle_version} >= 150200 || 0%{?suse_version} > 1500 cd go.d.plugin-%{godplugin_version} go vet ./... @@ -143,7 +143,7 @@ sed -i 's|/usr/lib|%{_libdir}|' %{buildroot}%{_libexecdir}/%{name}/edit-config # Hence, disable statistics by default. touch %{buildroot}%{_sysconfdir}/%{name}/.opt-out-from-anonymous-statistics -%if 0%{?sle_version} >= 150200 +%if 0%{?sle_version} >= 150200 || 0%{?suse_version} > 1500 pushd go.d.plugin-%{godplugin_version} install -d -m 0755 %{buildroot}/%{_libdir}/%{name}/conf.d diff --git a/vendor.tar.gz b/vendor.tar.gz index 441c176..5732f1f 100644 --- a/vendor.tar.gz +++ b/vendor.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5a74982396a361876b4abb3812129b8710b8c183d649e25062abfca38020cb12 -size 3168106 +oid sha256:e4f4a747128f15a544010aa4906ac368f69c0f2a37557ece386c4c7ba71bc6be +size 3169009