diff --git a/debian.tar.gz b/debian.tar.gz index 02c1b60..7928f4d 100644 --- a/debian.tar.gz +++ b/debian.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c480ae90610bf3e55344948beae5c9484fceb576117eff01c3821e2c4d52e037 -size 3053 +oid sha256:222af284a16c318c8278d1af6b06abf838f8eb35e2c40df77d8f8df565b30271 +size 2532 diff --git a/snapper-0.5.2.tar.bz2 b/snapper-0.5.2.tar.bz2 deleted file mode 100644 index 5ff007d..0000000 --- a/snapper-0.5.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:df54da980fd2fd31d46bce880be0a2c9f867a23394106acb38f1c060bb3e78b6 -size 571670 diff --git a/snapper-0.5.3.tar.bz2 b/snapper-0.5.3.tar.bz2 new file mode 100644 index 0000000..b84d841 --- /dev/null +++ b/snapper-0.5.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:59255f10d8ebed493c28dca366793ef2a07bbe523917765c6b544390589e9138 +size 578441 diff --git a/snapper-Debian_7.0.dsc b/snapper-Debian_7.0.dsc index 49c7ea9..750d1c4 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: -0bbe0351479be03d56415c4287050ead 571670 snapper-0.5.2.tar.bz2 +6744b7031ba5cc972c3363cd5b8b2d81 578441 snapper-0.5.3.tar.bz2 diff --git a/snapper-Debian_8.0.dsc b/snapper-Debian_8.0.dsc index 49c7ea9..750d1c4 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: -0bbe0351479be03d56415c4287050ead 571670 snapper-0.5.2.tar.bz2 +6744b7031ba5cc972c3363cd5b8b2d81 578441 snapper-0.5.3.tar.bz2 diff --git a/snapper-Debian_9.0.dsc b/snapper-Debian_9.0.dsc new file mode 100644 index 0000000..750d1c4 --- /dev/null +++ b/snapper-Debian_9.0.dsc @@ -0,0 +1,14 @@ +Format: 1.0 +Source: snapper +Version: 0.5.3 +Binary: snapper +Maintainer: Arvin Schnell +Architecture: any +Build-Depends: debhelper (>= 4.1.16), acl-dev, g++, libboost-dev, libboost-thread-dev, libboost-system-dev, libboost-test-dev, libxml2-dev, libz-dev, libdbus-1-dev, libpam-dev, xsltproc, docbook-xsl, locales-all +# +# The 'Files' line is generated during 'make package': +# Files: +# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz +# +Files: +6744b7031ba5cc972c3363cd5b8b2d81 578441 snapper-0.5.3.tar.bz2 diff --git a/snapper-xUbuntu_14.04.dsc b/snapper-xUbuntu_14.04.dsc index 6a3f5fb..7ed3e79 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: -0bbe0351479be03d56415c4287050ead 571670 snapper-0.5.2.tar.bz2 +6744b7031ba5cc972c3363cd5b8b2d81 578441 snapper-0.5.3.tar.bz2 diff --git a/snapper-xUbuntu_14.10.dsc b/snapper-xUbuntu_14.10.dsc index 6a3f5fb..7ed3e79 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: -0bbe0351479be03d56415c4287050ead 571670 snapper-0.5.2.tar.bz2 +6744b7031ba5cc972c3363cd5b8b2d81 578441 snapper-0.5.3.tar.bz2 diff --git a/snapper-xUbuntu_15.04.dsc b/snapper-xUbuntu_15.04.dsc index 6a3f5fb..7ed3e79 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: -0bbe0351479be03d56415c4287050ead 571670 snapper-0.5.2.tar.bz2 +6744b7031ba5cc972c3363cd5b8b2d81 578441 snapper-0.5.3.tar.bz2 diff --git a/snapper-xUbuntu_15.10.dsc b/snapper-xUbuntu_15.10.dsc index 6a3f5fb..7ed3e79 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: -0bbe0351479be03d56415c4287050ead 571670 snapper-0.5.2.tar.bz2 +6744b7031ba5cc972c3363cd5b8b2d81 578441 snapper-0.5.3.tar.bz2 diff --git a/snapper-xUbuntu_16.04.dsc b/snapper-xUbuntu_16.04.dsc index 6a3f5fb..7ed3e79 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: -0bbe0351479be03d56415c4287050ead 571670 snapper-0.5.2.tar.bz2 +6744b7031ba5cc972c3363cd5b8b2d81 578441 snapper-0.5.3.tar.bz2 diff --git a/snapper-xUbuntu_16.10.dsc b/snapper-xUbuntu_16.10.dsc index 6a3f5fb..7ed3e79 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: -0bbe0351479be03d56415c4287050ead 571670 snapper-0.5.2.tar.bz2 +6744b7031ba5cc972c3363cd5b8b2d81 578441 snapper-0.5.3.tar.bz2 diff --git a/snapper-xUbuntu_17.04.dsc b/snapper-xUbuntu_17.04.dsc index 6a3f5fb..7ed3e79 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: -0bbe0351479be03d56415c4287050ead 571670 snapper-0.5.2.tar.bz2 +6744b7031ba5cc972c3363cd5b8b2d81 578441 snapper-0.5.3.tar.bz2 diff --git a/snapper-xUbuntu_17.10.dsc b/snapper-xUbuntu_17.10.dsc new file mode 100644 index 0000000..7ed3e79 --- /dev/null +++ b/snapper-xUbuntu_17.10.dsc @@ -0,0 +1,14 @@ +Format: 1.0 +Source: snapper +Version: 0.5.3 +Binary: snapper +Maintainer: Arvin Schnell +Architecture: any +Build-Depends: debhelper (>= 4.1.16), acl-dev, g++, libboost-dev, libboost-thread-dev, libboost-system-dev, libboost-test-dev, libxml2-dev, libz-dev, libdbus-1-dev, libpam-dev, xsltproc, docbook-xsl, language-pack-en, language-pack-de +# +# The 'Files' line is generated during 'make package': +# Files: +# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz +# +Files: +6744b7031ba5cc972c3363cd5b8b2d81 578441 snapper-0.5.3.tar.bz2 diff --git a/snapper.changes b/snapper.changes index 1c4a9e7..bb98a04 100644 --- a/snapper.changes +++ b/snapper.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +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 488b379..7cf5ddd 100644 --- a/snapper.spec +++ b/snapper.spec @@ -1,7 +1,7 @@ # # spec file for package snapper # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -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 @@ -211,10 +241,9 @@ libsnapper. %package -n snapper-zypp-plugin BuildArch: noarch -Requires: dbus-1-python -Requires: python-xml +Requires: python3-dbus-python +Requires: python3-zypp-plugin Requires: snapper = %version -Requires: zypp-plugin-python Requires: libzypp(plugin:commit) = 1 Summary: A zypp commit plugin for calling snapper Group: System/Packages