From 2962894ab4ceb12548c9eae75daeb50762b483a60b22953a31b7fb7e46529293 Mon Sep 17 00:00:00 2001 From: YaST Team Bot Date: Fri, 12 Jan 2018 15:19:28 +0000 Subject: [PATCH] - Switched from cron to systemd timers (spec file based distributions) (fate#324529) - 0.5.3 OBS-URL: https://build.opensuse.org/package/show/filesystems:snapper/snapper?expand=0&rev=131 --- README.packaging | 12 ++++++++++++ debian.tar.gz | 4 ++-- snapper-0.5.2.tar.bz2 | 3 --- snapper-0.5.3.tar.bz2 | 3 +++ snapper-Debian_7.0.dsc | 4 ++-- snapper-Debian_8.0.dsc | 4 ++-- snapper-Debian_9.0.dsc | 4 ++-- snapper-xUbuntu_14.04.dsc | 4 ++-- snapper-xUbuntu_14.10.dsc | 4 ++-- snapper-xUbuntu_15.04.dsc | 4 ++-- snapper-xUbuntu_15.10.dsc | 4 ++-- snapper-xUbuntu_16.04.dsc | 4 ++-- snapper-xUbuntu_16.10.dsc | 4 ++-- snapper-xUbuntu_17.04.dsc | 4 ++-- snapper-xUbuntu_17.10.dsc | 4 ++-- snapper.changes | 7 +++++++ snapper.spec | 40 ++++++++++++++++++++++++++++++++++----- 17 files changed, 81 insertions(+), 32 deletions(-) create mode 100644 README.packaging delete mode 100644 snapper-0.5.2.tar.bz2 create mode 100644 snapper-0.5.3.tar.bz2 diff --git a/README.packaging b/README.packaging new file mode 100644 index 0000000..30422eb --- /dev/null +++ b/README.packaging @@ -0,0 +1,12 @@ +This package should use just the content of the git tree. If you need +to make changes, make them in git and update the package from git +(you can send merge request if you don't have write access). + +The online repository is at: +http://github.com/openSUSE/snapper + +For building the package from git run the service directly: +osc service disabledrun + +Note that snapper.spec and snapper.changes are part of the git +repo. diff --git a/debian.tar.gz b/debian.tar.gz index da514db..3231ccc 100644 --- a/debian.tar.gz +++ b/debian.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:46f5530c44e8e5c8927f064c9d5a7a693d8d1ee9357aa764344450818dff0387 -size 3046 +oid sha256:14c2fc27b7d713b4f4c41a22708f135aa7d2097419c070e83c11b82d22b45683 +size 3061 diff --git a/snapper-0.5.2.tar.bz2 b/snapper-0.5.2.tar.bz2 deleted file mode 100644 index 5a0d831..0000000 --- a/snapper-0.5.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:691de6999d79dae849d187a185c0dcd1db2cb84d614106970cb7a8f2fb7ec007 -size 572215 diff --git a/snapper-0.5.3.tar.bz2 b/snapper-0.5.3.tar.bz2 new file mode 100644 index 0000000..4f6e24b --- /dev/null +++ b/snapper-0.5.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9be0289f211f7857f533a21c56f8801d41f77849a88f5e08fc81c0dc7623656d +size 572508 diff --git a/snapper-Debian_7.0.dsc b/snapper-Debian_7.0.dsc index 1bd5611..3aacbc0 100644 --- a/snapper-Debian_7.0.dsc +++ b/snapper-Debian_7.0.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.5.2 +Version: 0.5.3 Binary: snapper Maintainer: Arvin Schnell Architecture: any @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, g++, libboost-dev, libboost-threa # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -8281a27700a19daaf070077d35160b58 572215 snapper-0.5.2.tar.bz2 +6fc8101c05280dd8d2e8206647f2c16f 572508 snapper-0.5.3.tar.bz2 diff --git a/snapper-Debian_8.0.dsc b/snapper-Debian_8.0.dsc index 1bd5611..3aacbc0 100644 --- a/snapper-Debian_8.0.dsc +++ b/snapper-Debian_8.0.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.5.2 +Version: 0.5.3 Binary: snapper Maintainer: Arvin Schnell Architecture: any @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, g++, libboost-dev, libboost-threa # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -8281a27700a19daaf070077d35160b58 572215 snapper-0.5.2.tar.bz2 +6fc8101c05280dd8d2e8206647f2c16f 572508 snapper-0.5.3.tar.bz2 diff --git a/snapper-Debian_9.0.dsc b/snapper-Debian_9.0.dsc index 1bd5611..3aacbc0 100644 --- a/snapper-Debian_9.0.dsc +++ b/snapper-Debian_9.0.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.5.2 +Version: 0.5.3 Binary: snapper Maintainer: Arvin Schnell Architecture: any @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, g++, libboost-dev, libboost-threa # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -8281a27700a19daaf070077d35160b58 572215 snapper-0.5.2.tar.bz2 +6fc8101c05280dd8d2e8206647f2c16f 572508 snapper-0.5.3.tar.bz2 diff --git a/snapper-xUbuntu_14.04.dsc b/snapper-xUbuntu_14.04.dsc index add4326..bd14634 100644 --- a/snapper-xUbuntu_14.04.dsc +++ b/snapper-xUbuntu_14.04.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.5.2 +Version: 0.5.3 Binary: snapper Maintainer: Arvin Schnell Architecture: any @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, g++, libboost-dev, libboost-threa # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -8281a27700a19daaf070077d35160b58 572215 snapper-0.5.2.tar.bz2 +6fc8101c05280dd8d2e8206647f2c16f 572508 snapper-0.5.3.tar.bz2 diff --git a/snapper-xUbuntu_14.10.dsc b/snapper-xUbuntu_14.10.dsc index add4326..bd14634 100644 --- a/snapper-xUbuntu_14.10.dsc +++ b/snapper-xUbuntu_14.10.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.5.2 +Version: 0.5.3 Binary: snapper Maintainer: Arvin Schnell Architecture: any @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, g++, libboost-dev, libboost-threa # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -8281a27700a19daaf070077d35160b58 572215 snapper-0.5.2.tar.bz2 +6fc8101c05280dd8d2e8206647f2c16f 572508 snapper-0.5.3.tar.bz2 diff --git a/snapper-xUbuntu_15.04.dsc b/snapper-xUbuntu_15.04.dsc index add4326..bd14634 100644 --- a/snapper-xUbuntu_15.04.dsc +++ b/snapper-xUbuntu_15.04.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.5.2 +Version: 0.5.3 Binary: snapper Maintainer: Arvin Schnell Architecture: any @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, g++, libboost-dev, libboost-threa # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -8281a27700a19daaf070077d35160b58 572215 snapper-0.5.2.tar.bz2 +6fc8101c05280dd8d2e8206647f2c16f 572508 snapper-0.5.3.tar.bz2 diff --git a/snapper-xUbuntu_15.10.dsc b/snapper-xUbuntu_15.10.dsc index add4326..bd14634 100644 --- a/snapper-xUbuntu_15.10.dsc +++ b/snapper-xUbuntu_15.10.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.5.2 +Version: 0.5.3 Binary: snapper Maintainer: Arvin Schnell Architecture: any @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, g++, libboost-dev, libboost-threa # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -8281a27700a19daaf070077d35160b58 572215 snapper-0.5.2.tar.bz2 +6fc8101c05280dd8d2e8206647f2c16f 572508 snapper-0.5.3.tar.bz2 diff --git a/snapper-xUbuntu_16.04.dsc b/snapper-xUbuntu_16.04.dsc index add4326..bd14634 100644 --- a/snapper-xUbuntu_16.04.dsc +++ b/snapper-xUbuntu_16.04.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.5.2 +Version: 0.5.3 Binary: snapper Maintainer: Arvin Schnell Architecture: any @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, g++, libboost-dev, libboost-threa # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -8281a27700a19daaf070077d35160b58 572215 snapper-0.5.2.tar.bz2 +6fc8101c05280dd8d2e8206647f2c16f 572508 snapper-0.5.3.tar.bz2 diff --git a/snapper-xUbuntu_16.10.dsc b/snapper-xUbuntu_16.10.dsc index add4326..bd14634 100644 --- a/snapper-xUbuntu_16.10.dsc +++ b/snapper-xUbuntu_16.10.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.5.2 +Version: 0.5.3 Binary: snapper Maintainer: Arvin Schnell Architecture: any @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, g++, libboost-dev, libboost-threa # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -8281a27700a19daaf070077d35160b58 572215 snapper-0.5.2.tar.bz2 +6fc8101c05280dd8d2e8206647f2c16f 572508 snapper-0.5.3.tar.bz2 diff --git a/snapper-xUbuntu_17.04.dsc b/snapper-xUbuntu_17.04.dsc index add4326..bd14634 100644 --- a/snapper-xUbuntu_17.04.dsc +++ b/snapper-xUbuntu_17.04.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.5.2 +Version: 0.5.3 Binary: snapper Maintainer: Arvin Schnell Architecture: any @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, g++, libboost-dev, libboost-threa # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -8281a27700a19daaf070077d35160b58 572215 snapper-0.5.2.tar.bz2 +6fc8101c05280dd8d2e8206647f2c16f 572508 snapper-0.5.3.tar.bz2 diff --git a/snapper-xUbuntu_17.10.dsc b/snapper-xUbuntu_17.10.dsc index add4326..bd14634 100644 --- a/snapper-xUbuntu_17.10.dsc +++ b/snapper-xUbuntu_17.10.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.5.2 +Version: 0.5.3 Binary: snapper Maintainer: Arvin Schnell Architecture: any @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, g++, libboost-dev, libboost-threa # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -8281a27700a19daaf070077d35160b58 572215 snapper-0.5.2.tar.bz2 +6fc8101c05280dd8d2e8206647f2c16f 572508 snapper-0.5.3.tar.bz2 diff --git a/snapper.changes b/snapper.changes index bbf6fc7..bb98a04 100644 --- a/snapper.changes +++ b/snapper.changes @@ -3,6 +3,13 @@ Wed Jan 10 14:33:11 CET 2018 - aschnell@suse.com - use python3 instead of python2 (bsc#1070324) +------------------------------------------------------------------- +Wed Dec 6 16:49:06 CET 2017 - kukuk@suse.de + +- Switched from cron to systemd timers (spec file based + distributions) (fate#324529) +- 0.5.3 + ------------------------------------------------------------------- Thu Nov 23 13:51:45 UTC 2017 - rbrown@suse.com diff --git a/snapper.spec b/snapper.spec index 1a795b2..7cf5ddd 100644 --- a/snapper.spec +++ b/snapper.spec @@ -22,7 +22,7 @@ %endif Name: snapper -Version: 0.5.2 +Version: 0.5.3 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: snapper-%{version}.tar.bz2 @@ -75,7 +75,7 @@ BuildRequires: pam-devel Requires: diffutils Requires: libsnapper4 = %version %if 0%{?suse_version} -Recommends: cron logrotate snapper-zypp-plugin +Recommends: logrotate snapper-zypp-plugin Supplements: btrfsprogs %endif Summary: Tool for filesystem snapshot management @@ -108,6 +108,8 @@ make %{?_smp_mflags} %install %make_install rm -f "%{buildroot}/%{_libdir}"/*.la "%{buildroot}/%{_lib}/security/pam_snapper.la" +rm -f %{buildroot}/etc/cron.hourly/suse.de-snapper +rm -f %{buildroot}/etc/cron.daily/suse.de-snapper %if 0%{?suse_version} install -D -m 644 data/sysconfig.snapper "%{buildroot}%{_fillupdir}/sysconfig.snapper" @@ -120,6 +122,36 @@ install -D -m 644 data/sysconfig.snapper "%{buildroot}/etc/sysconfig/snapper" %check make check +%pre +%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 +%endif + +%post +%if 0%{?suse_version} +# special hack, since the macros were added much later than +# the systemd timer +if [ -f /etc/cron.hourly/suse.de-snapper ]; then + systemctl preset snapper-timeline.timer || : + systemctl is-enabled -q snapper-timeline.timer && systemctl start snapper-timeline.timer || : +fi +if [ -f /etc/cron.daily/suse.de-snapper ]; then + systemctl preset snapper-cleanup.timer || : + systemctl is-enabled -q snapper-cleanup.timer && systemctl start snapper-cleanup.timer || : +fi +%service_add_post snapper-boot.service snapper-boot.timer snapper-cleanup.service snapper-cleanup.timer snapper-timeline.service snapper-timeline.timer +%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 +%endif + +%postun +%if 0%{?suse_version} +%service_del_postun snapper-boot.service snapper-boot.timer snapper-cleanup.service snapper-cleanup.timer snapper-timeline.service snapper-timeline.timer +%endif + %files -f snapper.lang %defattr(-,root,root) %{_bindir}/snapper @@ -135,9 +167,7 @@ make check %doc %{_mandir}/*/mksubvolume.8* %endif %config(noreplace) %{_sysconfdir}/logrotate.d/snapper -/etc/cron.hourly/suse.de-snapper -/etc/cron.daily/suse.de-snapper -/usr/lib/systemd/system/snapper-*.* +%{_unitdir}/snapper-*.* %config /etc/dbus-1/system.d/org.opensuse.Snapper.conf %{_datadir}/dbus-1/system-services/org.opensuse.Snapper.service