From 1b48191ffe24515e9728ea5a89f882cdb766645d8c76dbc14acfb5ada9ff025b Mon Sep 17 00:00:00 2001 From: Witek Bedyk Date: Thu, 24 Feb 2022 09:29:11 +0000 Subject: [PATCH] Accepting request 957021 from home:witekbedyk:branches:server:monitoring Fix Firewalld configuration file location (bsc#1196300) Systemwide Firewalld service configuration files are expected in `/usr/lib/firewalld/services/` instead of current `/usr/lib64/firewalld/services`. OBS-URL: https://build.opensuse.org/request/show/957021 OBS-URL: https://build.opensuse.org/package/show/server:monitoring/golang-github-prometheus-prometheus?expand=0&rev=52 --- golang-github-prometheus-prometheus.changes | 5 +++++ golang-github-prometheus-prometheus.spec | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/golang-github-prometheus-prometheus.changes b/golang-github-prometheus-prometheus.changes index 9d24e53..c9e58d8 100644 --- a/golang-github-prometheus-prometheus.changes +++ b/golang-github-prometheus-prometheus.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 22 15:27:25 UTC 2022 - Witek Bedyk + +- Fix Firewalld configuration file location (bsc#1196300) + ------------------------------------------------------------------- Fri Feb 18 15:09:09 UTC 2022 - Witek Bedyk diff --git a/golang-github-prometheus-prometheus.spec b/golang-github-prometheus-prometheus.spec index 54bce0c..dd68aac 100644 --- a/golang-github-prometheus-prometheus.spec +++ b/golang-github-prometheus-prometheus.spec @@ -97,8 +97,8 @@ install -m 0755 -d %{buildroot}%{_fillupdir} install -m 0644 %{SOURCE4} %{buildroot}%{_fillupdir}/sysconfig.prometheus %if 0%{?suse_version} == 1500 && 0%{?sle_version} < 150300 -install -m 0755 -d %{buildroot}%{_libdir}/firewalld/services/ -install -m 0644 %{SOURCE5} %{buildroot}%{_libdir}/firewalld/services/prometheus.xml +install -m 0755 -d %{buildroot}%{_prefix}/lib/firewalld/services/ +install -m 0644 %{SOURCE5} %{buildroot}%{_prefix}/lib/firewalld/services/prometheus.xml %endif install -Dd -m 0750 %{buildroot}%{_localstatedir}/lib/prometheus @@ -144,9 +144,9 @@ install -Dd -m 0750 %{buildroot}%{_localstatedir}/lib/prometheus/metrics %config(noreplace) %{_sysconfdir}/prometheus/prometheus.yml %if 0%{?suse_version} == 1500 && 0%{?sle_version} < 150300 -%dir %{_libdir}/firewalld -%dir %{_libdir}/firewalld/services -%{_libdir}/firewalld/services/prometheus.xml +%dir %{_prefix}/lib/firewalld +%dir %{_prefix}/lib/firewalld/services +%{_prefix}/lib/firewalld/services/prometheus.xml %endif %changelog