From 60f7f1c13e761ab530e3c7b95bb87db0c2ec8709cf847fcd249d562cdebd978e Mon Sep 17 00:00:00 2001 From: YaST Team Bot Date: Fri, 2 Sep 2022 10:49:28 +0000 Subject: [PATCH] - Moved logrotate files from user specific directory /etc/logrotate.d to vendor specific directory /usr/etc/logrotate.d. OBS-URL: https://build.opensuse.org/package/show/filesystems:snapper/snapper?expand=0&rev=452 --- snapper-0.10.2.tar.bz2 | 4 ++-- snapper-Debian_10.0.dsc | 2 +- snapper-Debian_11.0.dsc | 2 +- snapper-Debian_Unstable.dsc | 2 +- snapper-xUbuntu_18.04.dsc | 2 +- snapper-xUbuntu_18.10.dsc | 2 +- snapper-xUbuntu_19.04.dsc | 2 +- snapper-xUbuntu_19.10.dsc | 2 +- snapper-xUbuntu_20.04.dsc | 2 +- snapper-xUbuntu_20.10.dsc | 2 +- snapper-xUbuntu_21.04.dsc | 2 +- snapper-xUbuntu_21.10.dsc | 2 +- snapper-xUbuntu_22.04.dsc | 2 +- snapper.changes | 6 ++++++ snapper.spec | 20 ++++++++++++++++++++ 15 files changed, 40 insertions(+), 14 deletions(-) diff --git a/snapper-0.10.2.tar.bz2 b/snapper-0.10.2.tar.bz2 index ac28af4..88e494b 100644 --- a/snapper-0.10.2.tar.bz2 +++ b/snapper-0.10.2.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:193246a86cc750606e080c3817300e90e5d44f2c53801ee3b63b338fdcdc071f -size 669272 +oid sha256:706b03ef7435dfa28f7f1552fae153b59dd023f921734a370fb47e86f4af953f +size 669430 diff --git a/snapper-Debian_10.0.dsc b/snapper-Debian_10.0.dsc index 2bf4a4c..e6482a8 100644 --- a/snapper-Debian_10.0.dsc +++ b/snapper-Debian_10.0.dsc @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -6638ff422326e4b10e46bd66bea7dd1a 669272 snapper-0.10.2.tar.bz2 +defb8dc33beccb0026ecbdc691aa4d91 669430 snapper-0.10.2.tar.bz2 diff --git a/snapper-Debian_11.0.dsc b/snapper-Debian_11.0.dsc index 2bf4a4c..e6482a8 100644 --- a/snapper-Debian_11.0.dsc +++ b/snapper-Debian_11.0.dsc @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -6638ff422326e4b10e46bd66bea7dd1a 669272 snapper-0.10.2.tar.bz2 +defb8dc33beccb0026ecbdc691aa4d91 669430 snapper-0.10.2.tar.bz2 diff --git a/snapper-Debian_Unstable.dsc b/snapper-Debian_Unstable.dsc index 2bf4a4c..e6482a8 100644 --- a/snapper-Debian_Unstable.dsc +++ b/snapper-Debian_Unstable.dsc @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -6638ff422326e4b10e46bd66bea7dd1a 669272 snapper-0.10.2.tar.bz2 +defb8dc33beccb0026ecbdc691aa4d91 669430 snapper-0.10.2.tar.bz2 diff --git a/snapper-xUbuntu_18.04.dsc b/snapper-xUbuntu_18.04.dsc index 01657e4..367f15b 100644 --- a/snapper-xUbuntu_18.04.dsc +++ b/snapper-xUbuntu_18.04.dsc @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -6638ff422326e4b10e46bd66bea7dd1a 669272 snapper-0.10.2.tar.bz2 +defb8dc33beccb0026ecbdc691aa4d91 669430 snapper-0.10.2.tar.bz2 diff --git a/snapper-xUbuntu_18.10.dsc b/snapper-xUbuntu_18.10.dsc index 01657e4..367f15b 100644 --- a/snapper-xUbuntu_18.10.dsc +++ b/snapper-xUbuntu_18.10.dsc @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -6638ff422326e4b10e46bd66bea7dd1a 669272 snapper-0.10.2.tar.bz2 +defb8dc33beccb0026ecbdc691aa4d91 669430 snapper-0.10.2.tar.bz2 diff --git a/snapper-xUbuntu_19.04.dsc b/snapper-xUbuntu_19.04.dsc index 01657e4..367f15b 100644 --- a/snapper-xUbuntu_19.04.dsc +++ b/snapper-xUbuntu_19.04.dsc @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -6638ff422326e4b10e46bd66bea7dd1a 669272 snapper-0.10.2.tar.bz2 +defb8dc33beccb0026ecbdc691aa4d91 669430 snapper-0.10.2.tar.bz2 diff --git a/snapper-xUbuntu_19.10.dsc b/snapper-xUbuntu_19.10.dsc index 01657e4..367f15b 100644 --- a/snapper-xUbuntu_19.10.dsc +++ b/snapper-xUbuntu_19.10.dsc @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -6638ff422326e4b10e46bd66bea7dd1a 669272 snapper-0.10.2.tar.bz2 +defb8dc33beccb0026ecbdc691aa4d91 669430 snapper-0.10.2.tar.bz2 diff --git a/snapper-xUbuntu_20.04.dsc b/snapper-xUbuntu_20.04.dsc index 01657e4..367f15b 100644 --- a/snapper-xUbuntu_20.04.dsc +++ b/snapper-xUbuntu_20.04.dsc @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -6638ff422326e4b10e46bd66bea7dd1a 669272 snapper-0.10.2.tar.bz2 +defb8dc33beccb0026ecbdc691aa4d91 669430 snapper-0.10.2.tar.bz2 diff --git a/snapper-xUbuntu_20.10.dsc b/snapper-xUbuntu_20.10.dsc index 01657e4..367f15b 100644 --- a/snapper-xUbuntu_20.10.dsc +++ b/snapper-xUbuntu_20.10.dsc @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -6638ff422326e4b10e46bd66bea7dd1a 669272 snapper-0.10.2.tar.bz2 +defb8dc33beccb0026ecbdc691aa4d91 669430 snapper-0.10.2.tar.bz2 diff --git a/snapper-xUbuntu_21.04.dsc b/snapper-xUbuntu_21.04.dsc index 01657e4..367f15b 100644 --- a/snapper-xUbuntu_21.04.dsc +++ b/snapper-xUbuntu_21.04.dsc @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -6638ff422326e4b10e46bd66bea7dd1a 669272 snapper-0.10.2.tar.bz2 +defb8dc33beccb0026ecbdc691aa4d91 669430 snapper-0.10.2.tar.bz2 diff --git a/snapper-xUbuntu_21.10.dsc b/snapper-xUbuntu_21.10.dsc index 01657e4..367f15b 100644 --- a/snapper-xUbuntu_21.10.dsc +++ b/snapper-xUbuntu_21.10.dsc @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -6638ff422326e4b10e46bd66bea7dd1a 669272 snapper-0.10.2.tar.bz2 +defb8dc33beccb0026ecbdc691aa4d91 669430 snapper-0.10.2.tar.bz2 diff --git a/snapper-xUbuntu_22.04.dsc b/snapper-xUbuntu_22.04.dsc index 01657e4..367f15b 100644 --- a/snapper-xUbuntu_22.04.dsc +++ b/snapper-xUbuntu_22.04.dsc @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -6638ff422326e4b10e46bd66bea7dd1a 669272 snapper-0.10.2.tar.bz2 +defb8dc33beccb0026ecbdc691aa4d91 669430 snapper-0.10.2.tar.bz2 diff --git a/snapper.changes b/snapper.changes index 111a27b..25d75d9 100644 --- a/snapper.changes +++ b/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 b/snapper.spec index 62e85ed..6ad39ba 100644 --- a/snapper.spec +++ b/snapper.spec @@ -152,6 +152,12 @@ install -D -m 644 data/sysconfig.snapper "%{buildroot}%{_fillupdir}/sysconfig.sn install -D -m 644 data/sysconfig.snapper "%{buildroot}/etc/sysconfig/snapper" %endif +# move logrotate files from /etc/logrotate.d to /usr/etc/logrotate.d +%if 0%{?suse_version} > 1500 +mkdir -p %{buildroot}%{_distconfdir}/logrotate.d +mv %{buildroot}/%{_sysconfdir}/logrotate.d/snapper %{buildroot}%{_distconfdir}/logrotate.d +%endif + %{find_lang} snapper %check @@ -161,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} @@ -177,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 @@ -202,7 +218,11 @@ fi %if 0%{?suse_version} > 1310 %doc %{_mandir}/*/mksubvolume.8* %endif +%if 0%{?suse_version} > 1500 +%{_distconfdir}/logrotate.d/snapper +%else %config(noreplace) %{_sysconfdir}/logrotate.d/snapper +%endif %{_unitdir}/snapper*.* %if 0%{?suse_version} <= 1500 %dir %{_datadir}/dbus-1/system.d