1
0
Dominique Leuenberger 2022-02-26 16:01:53 +00:00 committed by Git OBS Bridge
commit 3cbdad4dba
2 changed files with 10 additions and 5 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Feb 22 15:27:25 UTC 2022 - Witek Bedyk <witold.bedyk@suse.com>
- Fix Firewalld configuration file location (bsc#1196300)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Feb 18 15:09:09 UTC 2022 - Witek Bedyk <witold.bedyk@suse.com> Fri Feb 18 15:09:09 UTC 2022 - Witek Bedyk <witold.bedyk@suse.com>

View File

@ -97,8 +97,8 @@ install -m 0755 -d %{buildroot}%{_fillupdir}
install -m 0644 %{SOURCE4} %{buildroot}%{_fillupdir}/sysconfig.prometheus install -m 0644 %{SOURCE4} %{buildroot}%{_fillupdir}/sysconfig.prometheus
%if 0%{?suse_version} == 1500 && 0%{?sle_version} < 150300 %if 0%{?suse_version} == 1500 && 0%{?sle_version} < 150300
install -m 0755 -d %{buildroot}%{_libdir}/firewalld/services/ install -m 0755 -d %{buildroot}%{_prefix}/lib/firewalld/services/
install -m 0644 %{SOURCE5} %{buildroot}%{_libdir}/firewalld/services/prometheus.xml install -m 0644 %{SOURCE5} %{buildroot}%{_prefix}/lib/firewalld/services/prometheus.xml
%endif %endif
install -Dd -m 0750 %{buildroot}%{_localstatedir}/lib/prometheus 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 %config(noreplace) %{_sysconfdir}/prometheus/prometheus.yml
%if 0%{?suse_version} == 1500 && 0%{?sle_version} < 150300 %if 0%{?suse_version} == 1500 && 0%{?sle_version} < 150300
%dir %{_libdir}/firewalld %dir %{_prefix}/lib/firewalld
%dir %{_libdir}/firewalld/services %dir %{_prefix}/lib/firewalld/services
%{_libdir}/firewalld/services/prometheus.xml %{_prefix}/lib/firewalld/services/prometheus.xml
%endif %endif
%changelog %changelog