1
0
forked from pool/hiawatha

Accepting request 827805 from home:gmbr3:libexecdir

- Fixes for %_libexecdir changing to /usr/libexec (bsc#1174075)

OBS-URL: https://build.opensuse.org/request/show/827805
OBS-URL: https://build.opensuse.org/package/show/server:http/hiawatha?expand=0&rev=105
This commit is contained in:
Mariusz Fik 2020-10-26 20:34:05 +00:00 committed by Git OBS Bridge
parent f160143bd7
commit 91169263b4
2 changed files with 11 additions and 6 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Aug 19 09:26:18 UTC 2020 - Callum Farmer <callumjfarmer13@gmail.com>
- Fixes for %_libexecdir changing to /usr/libexec (bsc#1174075)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jul 16 20:10:30 UTC 2020 - Mariusz Fik <fisiu@opensuse.org> Thu Jul 16 20:10:30 UTC 2020 - Mariusz Fik <fisiu@opensuse.org>

View File

@ -117,9 +117,9 @@ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
sed "s/#ServerId = www-data/ServerId = wwwrun/" -i %{buildroot}%{_sysconfdir}/hiawatha/hiawatha.conf sed "s/#ServerId = www-data/ServerId = wwwrun/" -i %{buildroot}%{_sysconfdir}/hiawatha/hiawatha.conf
install -D -m 0644 %{SOURCE102} \ install -D -m 0644 %{SOURCE102} \
%{buildroot}%{_libexecdir}/firewalld/services/%{name}.xml %{buildroot}%{_prefix}/lib/firewalld/services/%{name}.xml
install -D -m 0644 %{SOURCE103} \ install -D -m 0644 %{SOURCE103} \
%{buildroot}%{_libexecdir}/firewalld/services/%{name}-ssl.xml %{buildroot}%{_prefix}/lib/firewalld/services/%{name}-ssl.xml
%pre %pre
%service_add_pre %{name}.service %service_add_pre %{name}.service
@ -150,10 +150,10 @@ install -D -m 0644 %{SOURCE103} \
%config(noreplace) %{_sysconfdir}/%{name}/index.xslt %config(noreplace) %{_sysconfdir}/%{name}/index.xslt
%config(noreplace) %{_sysconfdir}/%{name}/error.xslt %config(noreplace) %{_sysconfdir}/%{name}/error.xslt
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%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
%{_mandir}/man1/{cgi-wrapper,hiawatha,ssi-cgi,wigwam}.1%{ext_man} %{_mandir}/man1/{cgi-wrapper,hiawatha,ssi-cgi,wigwam}.1%{ext_man}
%dir %{webroot}/%{name} %dir %{webroot}/%{name}
%dir %{webroot}/%{name}/htdocs %dir %{webroot}/%{name}/htdocs