adapted suggestions

diff --git a/package/snapper.changes b/package/snapper.changes
index 3bd289044327f43d821285b4cc7e9db38a9c6479..e136755605f5158b46de332cdcd70d9a744365b1 100644 (file)
--- a/package/snapper.changes
+++ b/package/snapper.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Aug 30 10:35:28 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.
+
 -------------------------------------------------------------------
 Thu Jun 02 13:01:49 CEST 2022 - lnussel@suse.com
 

diff --git a/snapper.spec.in b/snapper.spec.in
index a67721765610bc7d89ac2ef2e388e2c116e7eae4..5129098a14022e195eff3a4709044a3abc89185d 100644 (file)
--- 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