pool/apache2
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 829974 from Apache

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/829974
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache2?expand=0&rev=170
This commit is contained in:
Dominique Leuenberger 2020-08-27 12:42:09 +00:00 committed by Git OBS Bridge
commit d4fc6e7df9
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apache2.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Aug 27 11:33:07 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
- Install firewalld service files to %{_prefix}/lib/firewalld, NOT
%{_libexecdir}/firewalld (boo#1174075).
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Aug 7 12:25:58 UTC 2020 - pgajdos@suse.com Fri Aug 7 12:25:58 UTC 2020 - pgajdos@suse.com

12
apache2.spec
View File

@ -697,8 +697,8 @@ popd
# install firewall information file # install firewall information file
%if %{use_firewalld} %if %{use_firewalld}
install -D -m 644 %{SOURCE49} %{buildroot}%{_libexecdir}/firewalld/services/%{name}.xml install -D -m 644 %{SOURCE49} %{buildroot}%{_prefix}/lib/firewalld/services/%{name}.xml
install -D -m 644 %{SOURCE50} %{buildroot}%{_libexecdir}/firewalld/services/%{name}-ssl.xml install -D -m 644 %{SOURCE50} %{buildroot}%{_prefix}/lib/firewalld/services/%{name}-ssl.xml
%else %else
install -d %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ install -d %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/
install -m 644 %{SOURCE51} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name} install -m 644 %{SOURCE51} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
@ -885,10 +885,10 @@ rm %{buildroot}/%{sysconfdir}/*.test
%{_datadir}/%{name}/script-helpers %{_datadir}/%{name}/script-helpers
%{_datadir}/%{name}/sysconf_addword %{_datadir}/%{name}/sysconf_addword
%if %{use_firewalld} %if %{use_firewalld}
%dir %{_libexecdir}/firewalld %dir %{_prefix}/lib/firewalld
%dir %{_libexecdir}/firewalld/services %dir %{_prefix}/lib/firewalld/services
%{_libexecdir}/firewalld/services/%{name}.xml %{_prefix}/lib/firewalld/services/%{name}.xml
%{_libexecdir}/firewalld/services/%{name}-ssl.xml %{_prefix}/lib/firewalld/services/%{name}-ssl.xml
%else %else
%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name} %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}-ssl %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}-ssl