Accepting request 962681 from home:witekbedyk:branches:server:monitoring

Create firewalld-prometheus-config subpackage (bsc#1197042)

This is to prevent file conflicts between Firewalld and Prometheus packages in case Prometheus package is built on a different system than the target one (as it is the case for SUSE Manager).

OBS-URL: https://build.opensuse.org/request/show/962681
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/golang-github-prometheus-prometheus?expand=0&rev=56

golang-github-prometheus-prometheus.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Mar 18 12:20:59 UTC 2022 - Witek Bedyk <witold.bedyk@suse.com>
+
+- Create firewalld-prometheus-config subpackage (bsc#1197042)
+
 -------------------------------------------------------------------
 Mon Mar  7 16:40:16 UTC 2022 - Witek Bedyk <witold.bedyk@suse.com>
 

golang-github-prometheus-prometheus.spec

@@ -57,6 +57,7 @@ BuildRequires:  golang-github-prometheus-promu
 BuildRequires:  golang-packaging
 BuildRequires:  golang(API) >= 1.16
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Requires:       firewalld-prometheus-config
 Requires(pre):  user(prometheus)
 Requires(pre):  group(prometheus)
 Requires(post): %fillup_prereq
@@ -146,6 +147,18 @@ install -Dd -m 0750 %{buildroot}%{_localstatedir}/lib/prometheus/metrics
 %dir %{_sysconfdir}/prometheus
 %config(noreplace) %{_sysconfdir}/prometheus/prometheus.yml
 
+%package -n firewalld-prometheus-config
+Summary:        Firewalld configuration file for Prometheus
+Group:          Productivity/Networking/Security
+Version:        0.1
+Release:        0
+License:        GPL-2.0-or-later
+
+%description -n firewalld-prometheus-config
+This package contains configuration file for Prometheus for older versions of
+Firewalld which do not provide this in own package.
+
+%files -n firewalld-prometheus-config
 %if 0%{?suse_version} == 1500 && 0%{?sle_version} < 150300
 %dir %{_prefix}/lib/firewalld
 %dir %{_prefix}/lib/firewalld/services