From cc00a2904dc39fe849ea6b085cb4faf3b733ec309a170224d6dc2aa0f454db4a Mon Sep 17 00:00:00 2001 From: David Anes Date: Wed, 29 Jun 2022 07:39:37 +0000 Subject: [PATCH] Accepting request 985716 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/985716 OBS-URL: https://build.opensuse.org/package/show/network/atftp?expand=0&rev=52 --- atftp.changes | 6 ++++++ atftp.spec | 13 +++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/atftp.changes b/atftp.changes index ba0c00f..ae95e67 100644 --- a/atftp.changes +++ b/atftp.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 28 14:08:19 UTC 2022 - Stefan Schubert + +- Moved logrotate files from user specific directory /etc/logrotate.d + to vendor specific directory /usr/etc/logrotate.d. + ------------------------------------------------------------------- Wed Sep 15 13:17:41 UTC 2021 - Pedro Monreal diff --git a/atftp.spec b/atftp.spec index a31de56..91b322c 100644 --- a/atftp.spec +++ b/atftp.spec @@ -1,7 +1,7 @@ # # spec file for package atftp # -# 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 @@ -77,7 +77,12 @@ install -D -m 0644 %{SOURCE5} %{buildroot}/%{_unitdir}/atftpd.service install -D -m 0644 %{SOURCE6} %{buildroot}/%{_unitdir}/atftpd.socket ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcatftpd install -D -m 0644 %{SOURCE2} %{buildroot}%{_fillupdir}/sysconfig.atftpd +%if 0%{?suse_version} > 1500 +mkdir -p %{buildroot}%{_distconfdir}/logrotate.d +install -D -m 0644 %{SOURCE3} %{buildroot}%{_distconfdir}/logrotate.d/%{name} +%else install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} +%endif install -d -m 0755 %{buildroot}/srv/tftpboot install -d -m 0750 %{buildroot}%{_localstatedir}/log/atftpd @@ -109,7 +114,11 @@ fi %{_sbindir}/rcatftpd %{_unitdir}/atftpd.service %{_unitdir}/atftpd.socket -%config %{_sysconfdir}/logrotate.d/%{name} +%if 0%{?suse_version} > 1500 +%{_distconfdir}/logrotate.d/%{name} +%else +%config(noreplace) %{_sysconfdir}/logrotate.d/%{name} +%endif %{_fillupdir}/sysconfig.atftpd %{_mandir}/man1/atftp.1.gz %{_mandir}/man8/atftpd.8.gz