Accepting request 985724 from home:schubi2

- Moved logrotate files from user specific directory /etc/logrotate.d
  to vendor specific directory /usr/etc/logrotate.d.

OBS-URL: https://build.opensuse.org/request/show/985724
OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=672
This commit is contained in:
David Anes 2022-06-29 09:30:56 +00:00 committed by Git OBS Bridge
parent e36de76227
commit 484c8c353a
2 changed files with 15 additions and 0 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Jun 28 14:39:26 UTC 2022 - Stefan Schubert <schubi@intern>
- Moved logrotate files from user specific directory /etc/logrotate.d
to vendor specific directory /usr/etc/logrotate.d.
-------------------------------------------------------------------
Wed Jun 8 11:26:13 UTC 2022 - pgajdos@suse.com

View File

@ -513,8 +513,13 @@ cat > %{buildroot}/%{_libexecdir}/apache2_MMN <<-EOF
echo %{apache_mmn}
EOF
%if 0%{?suse_version} > 1500
mkdir -p %{buildroot}%{_distconfdir}/logrotate.d
install -m 644 %{SOURCE31} %{buildroot}/%{_distconfdir}/logrotate.d/apache2
%else
mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
install -m 644 %{SOURCE31} %{buildroot}/%{_sysconfdir}/logrotate.d/apache2
%endif
make DESTDIR=%{buildroot} install-suexec -j1
@ -852,7 +857,11 @@ exit 0
%dir %{sysconfdir}/conf.d
%dir %{sysconfdir}/vhosts.d
%{_fillupdir}/sysconfig.apache2
%if 0%{?suse_version} > 1500
%{_distconfdir}/logrotate.d/apache2
%else
%config(noreplace) %{_sysconfdir}/logrotate.d/apache2
%endif
%{_unitdir}/apache2.service
%{_unitdir}/apache2@.service
%{_unitdir}/apache2.target