Accepting request 750798 from server:monitoring

OBS-URL: https://build.opensuse.org/request/show/750798
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/golang-github-prometheus-prometheus?expand=0&rev=7

golang-github-prometheus-prometheus.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Nov 25 14:59:24 UTC 2019 - Joao Cavalheiro <jcavalheiro@suse.com>
+
+- Patch macros on spec file to support builds on SLE 12 
+
+-------------------------------------------------------------------
+Thu Nov 21 13:29:22 UTC 2019 - Jan Fajerski <jan.fajerski@suse.com>
+
+- Remove prometheus.firewall.xml source file
+
 -------------------------------------------------------------------
 Wed Nov 20 22:33:20 UTC 2019 - Michał Rostecki <mrostecki@opensuse.org>
 

golang-github-prometheus-prometheus.spec

@@ -20,6 +20,15 @@
 %global prometheus_user prometheus
 %global prometheus_group %{prometheus_user}
 
+# Compatibility with systems older than Nov 2017
+# See https://en.opensuse.org/openSUSE:Packaging_Conventions_RPM_Macros
+%if ! %{defined _fillupdir}
+%define _fillupdir /var/adm/fillup-templates
+%endif
+%if 0%{?suse_version} < 1500
+%define _sharedstatedir /var/lib
+%endif
+
 %{go_nostrip}
 
 Name:           golang-github-prometheus-prometheus
@@ -33,7 +42,6 @@ Source:         prometheus-%{version}.tar.xz
 Source1:        prometheus.service
 Source2:        prometheus.yml
 Source3:        prometheus.sysconfig
-Source4:        prometheus.firewall.xml
 Patch1:         0001-Do-not-force-the-pure-Go-name-resolver.patch
 # Lifted from Debian's prometheus package
 Patch2:         0002-Default-settings.patch

prometheus.firewall.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<service>
-    <short>Prometheus</short>
-    <description>Prometheus monitoring system and time series database.</description>
-    <port protocol="tcp" port="9090"/>
-</service>