From 1ffeccc9d180b195d73440fc05b6567cae8108f27cbcccea65db7e76cb5fdddf Mon Sep 17 00:00:00 2001
From: Lars Vogdt <lrupp@suse.com>
Date: Wed, 29 Jun 2022 17:58:03 +0000
Subject: [PATCH] Accepting request 985848 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/985848
OBS-URL: https://build.opensuse.org/package/show/network/vsftpd?expand=0&rev=161
---
 vsftpd.changes | 6 ++++++
 vsftpd.spec    | 9 +++++++++
 2 files changed, 15 insertions(+)

diff --git a/vsftpd.changes b/vsftpd.changes
index 60d45b3..2272416 100644
--- a/vsftpd.changes
+++ b/vsftpd.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jun 29 13:53:16 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.
+
 -------------------------------------------------------------------
 Tue Mar  3 16:44:28 UTC 2022 - Peter Simons <psimons@suse.com>
 
diff --git a/vsftpd.spec b/vsftpd.spec
index d0c55f3..e91f7ec 100644
--- a/vsftpd.spec
+++ b/vsftpd.spec
@@ -150,7 +150,12 @@ install -D -m 600 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}.conf
 install -D -m 600 xinetd.d/%{name} %{buildroot}%{_sysconfdir}/xinetd.d/%{name}
 %endif
 install -D -m 644 $RPM_SOURCE_DIR/%{name}.pam %{buildroot}%{_sysconfdir}/pam.d/%{name}
+%if 0%{?suse_version} > 1500
+mkdir -p %{buildroot}%{_distconfdir}/logrotate.d
+install -D -m 644 $RPM_SOURCE_DIR/%{name}.logrotate %{buildroot}%{_distconfdir}/logrotate.d/%{name}
+%else
 install -D -m 644 $RPM_SOURCE_DIR/%{name}.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
+%endif
 install -D -m 644 %{name}.conf.5 %{buildroot}/%{_mandir}/man5/%{name}.conf.5
 install -D -m 644 %{name}.8 %{buildroot}/%{_mandir}/man8/%{name}.8
 %if %{with_systemd}
@@ -218,7 +223,11 @@ getent passwd ftpsecure >/dev/null || useradd -r -g nobody -s /bin/false -c "Sec
 %endif
 %config(noreplace) %{_sysconfdir}/%{name}.conf
 %config %{_sysconfdir}/pam.d/%{name}
+%if 0%{?suse_version} > 1500
+%{_distconfdir}/logrotate.d/%{name}
+%else
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+%endif
 %{_mandir}/man5/%{name}.conf.*
 %{_mandir}/man8/%{name}.*
 %license LICENSE