From 36f130c841c4e1cb7b85f9a44a89644338c683d8bdcd7a0e0db551f107142cad Mon Sep 17 00:00:00 2001 From: Jan Fajerski Date: Wed, 25 Sep 2019 06:49:15 +0000 Subject: [PATCH] Accepting request 733036 from home:mrostecki:branches:server:monitoring - Do not install the firewalld config file on Tumbleweed (on versions newer than Leap 15.1). It's installed in the main firewalld package. OBS-URL: https://build.opensuse.org/request/show/733036 OBS-URL: https://build.opensuse.org/package/show/server:monitoring/golang-github-prometheus-prometheus?expand=0&rev=21 --- golang-github-prometheus-prometheus.changes | 7 +++++++ golang-github-prometheus-prometheus.spec | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/golang-github-prometheus-prometheus.changes b/golang-github-prometheus-prometheus.changes index 2dc6e29..1743861 100644 --- a/golang-github-prometheus-prometheus.changes +++ b/golang-github-prometheus-prometheus.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Sep 23 10:19:03 UTC 2019 - Michał Rostecki + +- Do not install the firewalld config file on Tumbleweed (on + versions newer than Leap 15.1). It's installed in the main + firewalld package. + ------------------------------------------------------------------- Fri Aug 16 06:46:24 UTC 2019 - Jan Fajerski diff --git a/golang-github-prometheus-prometheus.spec b/golang-github-prometheus-prometheus.spec index e55d02f..db02a18 100644 --- a/golang-github-prometheus-prometheus.spec +++ b/golang-github-prometheus-prometheus.spec @@ -86,8 +86,10 @@ cp -fr console_libraries/ consoles/ %{buildroot}%{_datarootdir}/prometheus install -m 0755 -d %{buildroot}%{_fillupdir} install -m 0644 %{SOURCE3} %{buildroot}%{_fillupdir}/sysconfig.prometheus +%if 0%{?suse_version} > 1510 install -m 0755 -d %{buildroot}%{_libdir}/firewalld/services/ install -m 0644 %{SOURCE4} %{buildroot}%{_libdir}/firewalld/services/prometheus.xml +%endif install -Dd -m 0750 %{buildroot}%{_localstatedir}/lib/prometheus install -Dd -m 0750 %{buildroot}%{_localstatedir}/lib/prometheus/data @@ -128,8 +130,10 @@ getent passwd %{prometheus_user} >/dev/null || %{_sbindir}/useradd -r -g %{prome %dir %attr(0700,%{prometheus_user},%{prometheus_group}) %{_sharedstatedir}/prometheus/metrics %dir %{_sysconfdir}/prometheus %config(noreplace) %{_sysconfdir}/prometheus/prometheus.yml +%if 0%{?suse_version} > 1510 %dir %{_libdir}/firewalld %dir %{_libdir}/firewalld/services %{_libdir}/firewalld/services/prometheus.xml +%endif %changelog