From d6a56f9932c1fdaae054f28194a73d7f37e1296f Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Tue, 30 Aug 2022 12:56:37 +0200 Subject: [PATCH] adapted suggestions --- package/snapper.changes | 6 ++++++ snapper.spec.in | 10 ++++++++++ 2 files changed, 16 insertions(+) diff --git a/package/snapper.changes b/package/snapper.changes index 3bd28904..e1367556 100644 --- a/package/snapper.changes +++ b/package/snapper.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Aug 30 10:35:28 UTC 2022 - Stefan Schubert + +- Moved logrotate files from user specific directory /etc/logrotate.d + to vendor specific directory /usr/etc/logrotate.d. + ------------------------------------------------------------------- Thu Jun 02 13:01:49 CEST 2022 - lnussel@suse.com diff --git a/snapper.spec.in b/snapper.spec.in index a6772176..5129098a 100644 --- a/snapper.spec.in +++ b/snapper.spec.in @@ -167,6 +167,10 @@ make %{?_smp_mflags} check VERBOSE=1 %if 0%{?suse_version} %service_add_pre snapper-boot.service snapper-boot.timer snapper-cleanup.service snapper-cleanup.timer snapper-timeline.service snapper-timeline.timer snapperd.service %endif +%if 0%{?suse_version} > 1500 +# Migration from /etc/logrotate.d to /usr/etc/logrotate.d +test -f /etc/logrotate.d/snapper.rpmsave && mv -v /etc/logrotate.d/snapper.rpmsave /etc/logrotate.d/snapper.rpmsave.old ||: +%endif %post %if 0%{?suse_version} @@ -183,6 +187,12 @@ fi %service_add_post snapper-boot.service snapper-boot.timer snapper-cleanup.service snapper-cleanup.timer snapper-timeline.service snapper-timeline.timer snapperd.service %endif +%if 0%{?suse_version} > 1500 +%posttrans +# Migration from /etc/logrotate.d to /usr/etc/logrotate.d +test -f /etc/logrotate.d/snapper.rpmsave && mv -v /etc/logrotate.d/snapper.rpmsave /etc/logrotate.d/snapper ||: +%endif + %preun %if 0%{?suse_version} %service_del_preun snapper-boot.service snapper-boot.timer snapper-cleanup.service snapper-cleanup.timer snapper-timeline.service snapper-timeline.timer snapperd.service -- 2.47.3