Accepting request 750018 from home:mrostecki:branches:server:monitoring

- Remove firewalld files. They are installed in the main firewalld
  package.

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

golang-github-prometheus-prometheus.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Nov 20 22:33:20 UTC 2019 - Michał Rostecki <mrostecki@opensuse.org>
+
+- Remove firewalld files. They are installed in the main firewalld
+  package.
+
 -------------------------------------------------------------------
 Wed Nov 20 15:32:20 UTC 2019 - Joao Cavalheiro <jcavalheiro@suse.com>
 

golang-github-prometheus-prometheus.spec

@@ -86,11 +86,6 @@ 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
 install -Dd -m 0750 %{buildroot}%{_localstatedir}/lib/prometheus/metrics
@@ -130,10 +125,5 @@ 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