From 45e476ac34d3e5d59abf2a8688953c73f6ebe82896f6a3ffd848d9709ca1f0c1 Mon Sep 17 00:00:00 2001 From: Jan Fajerski Date: Mon, 7 May 2018 06:18:24 +0000 Subject: [PATCH] Accepting request 604489 from Cloud:OpenStack:Master - fix build for older distributions OBS-URL: https://build.opensuse.org/request/show/604489 OBS-URL: https://build.opensuse.org/package/show/server:monitoring/grafana?expand=0&rev=6 --- grafana.changes | 5 +++++ grafana.spec | 11 ++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/grafana.changes b/grafana.changes index f1ec1c3..206c016 100644 --- a/grafana.changes +++ b/grafana.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat May 5 09:47:06 UTC 2018 - dmueller@suse.com + +- fix build for older distributions + ------------------------------------------------------------------- Wed Mar 7 16:27:46 UTC 2018 - jengelh@inai.de diff --git a/grafana.spec b/grafana.spec index 76286c7..f758e7e 100644 --- a/grafana.spec +++ b/grafana.spec @@ -1,7 +1,7 @@ # # spec file for package grafana # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,6 +20,11 @@ %define GRAFANA_GROUP %{name} %define GRAFANA_HOME %{_datadir}/%{name} +#Compat macro for new _fillupdir macro introduced in Nov 2017 +%if ! %{defined _fillupdir} + %define _fillupdir /var/adm/fillup-templates +%endif + Name: grafana Version: 5.0.0 Release: 0 @@ -35,12 +40,12 @@ Source2: README Source3: Makefile Requires: phantomjs # Needed as a BuildRequires too, so setting up a symlink will work -BuildRequires: phantomjs BuildRequires: fdupes +BuildRequires: go >= 1.8 BuildRequires: golang-packaging BuildRequires: libgcc_s1 +BuildRequires: phantomjs BuildRequires: shadow -BuildRequires: go >= 1.8 Requires(post): %insserv_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build %{?systemd_requires}