From 484c8c353a7020ce0dcc8a2afd880cbf91c9e399082df6b67b4e6a03ab80a669 Mon Sep 17 00:00:00 2001
From: David Anes <david.anes@suse.com>
Date: Wed, 29 Jun 2022 09:30:56 +0000
Subject: [PATCH] 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
---
 apache2.changes | 6 ++++++
 apache2.spec    | 9 +++++++++
 2 files changed, 15 insertions(+)

diff --git a/apache2.changes b/apache2.changes
index 067faef..bd2cfd3 100644
--- a/apache2.changes
+++ b/apache2.changes
@@ -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
 
diff --git a/apache2.spec b/apache2.spec
index 9edd7ed..48549d1 100644
--- a/apache2.spec
+++ b/apache2.spec
@@ -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