From bdb9594915319ab389c94dfb49a4ea3a7bef1387f9e57dd4c454fc704dc5f455 Mon Sep 17 00:00:00 2001
From: Peter Wullinger <wullinger@rz.uni-kiel.de>
Date: Wed, 29 Jun 2022 14:37:00 +0000
Subject: [PATCH] Accepting request 985853 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/985853
OBS-URL: https://build.opensuse.org/package/show/server:mail/exim?expand=0&rev=261
---
 exim.changes |  6 ++++++
 exim.spec    | 22 +++++++++++++++++-----
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/exim.changes b/exim.changes
index 22014ad..8594063 100644
--- a/exim.changes
+++ b/exim.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jun 29 14:20:50 UTC 2022 - Stefan Schubert <schubi@suse.com>
+
+- Moved logrotate files from user specific directory /etc/logrotate.d
+  to vendor specific directory /usr/etc/logrotate.d.
+
 Mon Jun 27 08:33:59 UTC 2022 - Peter Wullinger <wullinger@rz.uni-kiel.de>
 
 - update to exim 4.96
diff --git a/exim.spec b/exim.spec
index 72c648a..7b0e10a 100644
--- a/exim.spec
+++ b/exim.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package exim
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -75,7 +75,7 @@ Requires(pre):  group(mail)
 Requires(pre):  fileutils textutils
 %endif
 Version:        4.96
-Release:        1
+Release:        0
 %if %{with_mysql}
 BuildRequires:  mysql-devel
 %endif
@@ -307,7 +307,11 @@ mkdir -p $RPM_BUILD_ROOT/%{_unitdir}
 %else
 mkdir -p $RPM_BUILD_ROOT/etc/init.d
 %endif
-mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
+%if 0%{?suse_version} > 1500
+mkdir -p $RPM_BUILD_ROOT%{_distconfdir}/logrotate.d
+%else
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
+%endif
 mkdir -p $RPM_BUILD_ROOT/usr/{bin,sbin,lib}
 mkdir -p $RPM_BUILD_ROOT/var/log/exim
 mkdir -p $RPM_BUILD_ROOT/var/spool/mail/
@@ -344,7 +348,11 @@ ln -sv ../../etc/init.d/exim $RPM_BUILD_ROOT/usr/sbin/rcexim
 %endif
 mv $RPM_BUILD_ROOT/usr/sbin/eximon* $RPM_BUILD_ROOT/usr/bin/
 cp -p %{S:1} $RPM_BUILD_ROOT%{_fillupdir}/sysconfig.exim
-install -m 0644 %{S:2} $RPM_BUILD_ROOT/etc/logrotate.d/exim
+%if 0%{?suse_version} > 1500
+install -m 0644 %{S:2} $RPM_BUILD_ROOT%{_distconfdir}/logrotate.d/exim
+%else
+install -m 0644 %{S:2} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/exim
+%endif
 # man pages
 mv doc/exim.8 $RPM_BUILD_ROOT/%{_mandir}/man8/
 cp $RPM_SOURCE_DIR/exim_db.8.gz $RPM_BUILD_ROOT/%{_mandir}/man8
@@ -476,7 +484,11 @@ exit 0
 %else
 %config /etc/init.d/exim
 %endif
-%config(noreplace) /etc/logrotate.d/exim
+%if 0%{?suse_version} > 1500
+%{_distconfdir}/logrotate.d/exim
+%else
+%config(noreplace) %{_sysconfdir}/logrotate.d/exim
+%endif
 %if %{?suse_version:%suse_version}%{?!suse_version:99999} < 1000
 %config(noreplace) /etc/permissions.d/exim
 %endif