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

@@ -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
 

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}