- 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
This commit is contained in:
parent
bdb8eb8c2d
commit
2962894ab4
12
README.packaging
Normal file
12
README.packaging
Normal file
@ -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.
|
@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:46f5530c44e8e5c8927f064c9d5a7a693d8d1ee9357aa764344450818dff0387
|
oid sha256:14c2fc27b7d713b4f4c41a22708f135aa7d2097419c070e83c11b82d22b45683
|
||||||
size 3046
|
size 3061
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:691de6999d79dae849d187a185c0dcd1db2cb84d614106970cb7a8f2fb7ec007
|
|
||||||
size 572215
|
|
3
snapper-0.5.3.tar.bz2
Normal file
3
snapper-0.5.3.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:9be0289f211f7857f533a21c56f8801d41f77849a88f5e08fc81c0dc7623656d
|
||||||
|
size 572508
|
@ -1,6 +1,6 @@
|
|||||||
Format: 1.0
|
Format: 1.0
|
||||||
Source: snapper
|
Source: snapper
|
||||||
Version: 0.5.2
|
Version: 0.5.3
|
||||||
Binary: snapper
|
Binary: snapper
|
||||||
Maintainer: Arvin Schnell <aschnell@suse.com>
|
Maintainer: Arvin Schnell <aschnell@suse.com>
|
||||||
Architecture: any
|
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
|
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
|
||||||
#
|
#
|
||||||
Files:
|
Files:
|
||||||
8281a27700a19daaf070077d35160b58 572215 snapper-0.5.2.tar.bz2
|
6fc8101c05280dd8d2e8206647f2c16f 572508 snapper-0.5.3.tar.bz2
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
Format: 1.0
|
Format: 1.0
|
||||||
Source: snapper
|
Source: snapper
|
||||||
Version: 0.5.2
|
Version: 0.5.3
|
||||||
Binary: snapper
|
Binary: snapper
|
||||||
Maintainer: Arvin Schnell <aschnell@suse.com>
|
Maintainer: Arvin Schnell <aschnell@suse.com>
|
||||||
Architecture: any
|
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
|
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
|
||||||
#
|
#
|
||||||
Files:
|
Files:
|
||||||
8281a27700a19daaf070077d35160b58 572215 snapper-0.5.2.tar.bz2
|
6fc8101c05280dd8d2e8206647f2c16f 572508 snapper-0.5.3.tar.bz2
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
Format: 1.0
|
Format: 1.0
|
||||||
Source: snapper
|
Source: snapper
|
||||||
Version: 0.5.2
|
Version: 0.5.3
|
||||||
Binary: snapper
|
Binary: snapper
|
||||||
Maintainer: Arvin Schnell <aschnell@suse.com>
|
Maintainer: Arvin Schnell <aschnell@suse.com>
|
||||||
Architecture: any
|
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
|
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
|
||||||
#
|
#
|
||||||
Files:
|
Files:
|
||||||
8281a27700a19daaf070077d35160b58 572215 snapper-0.5.2.tar.bz2
|
6fc8101c05280dd8d2e8206647f2c16f 572508 snapper-0.5.3.tar.bz2
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
Format: 1.0
|
Format: 1.0
|
||||||
Source: snapper
|
Source: snapper
|
||||||
Version: 0.5.2
|
Version: 0.5.3
|
||||||
Binary: snapper
|
Binary: snapper
|
||||||
Maintainer: Arvin Schnell <aschnell@suse.com>
|
Maintainer: Arvin Schnell <aschnell@suse.com>
|
||||||
Architecture: any
|
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
|
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
|
||||||
#
|
#
|
||||||
Files:
|
Files:
|
||||||
8281a27700a19daaf070077d35160b58 572215 snapper-0.5.2.tar.bz2
|
6fc8101c05280dd8d2e8206647f2c16f 572508 snapper-0.5.3.tar.bz2
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
Format: 1.0
|
Format: 1.0
|
||||||
Source: snapper
|
Source: snapper
|
||||||
Version: 0.5.2
|
Version: 0.5.3
|
||||||
Binary: snapper
|
Binary: snapper
|
||||||
Maintainer: Arvin Schnell <aschnell@suse.com>
|
Maintainer: Arvin Schnell <aschnell@suse.com>
|
||||||
Architecture: any
|
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
|
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
|
||||||
#
|
#
|
||||||
Files:
|
Files:
|
||||||
8281a27700a19daaf070077d35160b58 572215 snapper-0.5.2.tar.bz2
|
6fc8101c05280dd8d2e8206647f2c16f 572508 snapper-0.5.3.tar.bz2
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
Format: 1.0
|
Format: 1.0
|
||||||
Source: snapper
|
Source: snapper
|
||||||
Version: 0.5.2
|
Version: 0.5.3
|
||||||
Binary: snapper
|
Binary: snapper
|
||||||
Maintainer: Arvin Schnell <aschnell@suse.com>
|
Maintainer: Arvin Schnell <aschnell@suse.com>
|
||||||
Architecture: any
|
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
|
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
|
||||||
#
|
#
|
||||||
Files:
|
Files:
|
||||||
8281a27700a19daaf070077d35160b58 572215 snapper-0.5.2.tar.bz2
|
6fc8101c05280dd8d2e8206647f2c16f 572508 snapper-0.5.3.tar.bz2
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
Format: 1.0
|
Format: 1.0
|
||||||
Source: snapper
|
Source: snapper
|
||||||
Version: 0.5.2
|
Version: 0.5.3
|
||||||
Binary: snapper
|
Binary: snapper
|
||||||
Maintainer: Arvin Schnell <aschnell@suse.com>
|
Maintainer: Arvin Schnell <aschnell@suse.com>
|
||||||
Architecture: any
|
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
|
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
|
||||||
#
|
#
|
||||||
Files:
|
Files:
|
||||||
8281a27700a19daaf070077d35160b58 572215 snapper-0.5.2.tar.bz2
|
6fc8101c05280dd8d2e8206647f2c16f 572508 snapper-0.5.3.tar.bz2
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
Format: 1.0
|
Format: 1.0
|
||||||
Source: snapper
|
Source: snapper
|
||||||
Version: 0.5.2
|
Version: 0.5.3
|
||||||
Binary: snapper
|
Binary: snapper
|
||||||
Maintainer: Arvin Schnell <aschnell@suse.com>
|
Maintainer: Arvin Schnell <aschnell@suse.com>
|
||||||
Architecture: any
|
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
|
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
|
||||||
#
|
#
|
||||||
Files:
|
Files:
|
||||||
8281a27700a19daaf070077d35160b58 572215 snapper-0.5.2.tar.bz2
|
6fc8101c05280dd8d2e8206647f2c16f 572508 snapper-0.5.3.tar.bz2
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
Format: 1.0
|
Format: 1.0
|
||||||
Source: snapper
|
Source: snapper
|
||||||
Version: 0.5.2
|
Version: 0.5.3
|
||||||
Binary: snapper
|
Binary: snapper
|
||||||
Maintainer: Arvin Schnell <aschnell@suse.com>
|
Maintainer: Arvin Schnell <aschnell@suse.com>
|
||||||
Architecture: any
|
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
|
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
|
||||||
#
|
#
|
||||||
Files:
|
Files:
|
||||||
8281a27700a19daaf070077d35160b58 572215 snapper-0.5.2.tar.bz2
|
6fc8101c05280dd8d2e8206647f2c16f 572508 snapper-0.5.3.tar.bz2
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
Format: 1.0
|
Format: 1.0
|
||||||
Source: snapper
|
Source: snapper
|
||||||
Version: 0.5.2
|
Version: 0.5.3
|
||||||
Binary: snapper
|
Binary: snapper
|
||||||
Maintainer: Arvin Schnell <aschnell@suse.com>
|
Maintainer: Arvin Schnell <aschnell@suse.com>
|
||||||
Architecture: any
|
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
|
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
|
||||||
#
|
#
|
||||||
Files:
|
Files:
|
||||||
8281a27700a19daaf070077d35160b58 572215 snapper-0.5.2.tar.bz2
|
6fc8101c05280dd8d2e8206647f2c16f 572508 snapper-0.5.3.tar.bz2
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
Format: 1.0
|
Format: 1.0
|
||||||
Source: snapper
|
Source: snapper
|
||||||
Version: 0.5.2
|
Version: 0.5.3
|
||||||
Binary: snapper
|
Binary: snapper
|
||||||
Maintainer: Arvin Schnell <aschnell@suse.com>
|
Maintainer: Arvin Schnell <aschnell@suse.com>
|
||||||
Architecture: any
|
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
|
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
|
||||||
#
|
#
|
||||||
Files:
|
Files:
|
||||||
8281a27700a19daaf070077d35160b58 572215 snapper-0.5.2.tar.bz2
|
6fc8101c05280dd8d2e8206647f2c16f 572508 snapper-0.5.3.tar.bz2
|
||||||
|
@ -3,6 +3,13 @@ Wed Jan 10 14:33:11 CET 2018 - aschnell@suse.com
|
|||||||
|
|
||||||
- use python3 instead of python2 (bsc#1070324)
|
- 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
|
Thu Nov 23 13:51:45 UTC 2017 - rbrown@suse.com
|
||||||
|
|
||||||
|
40
snapper.spec
40
snapper.spec
@ -22,7 +22,7 @@
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
Name: snapper
|
Name: snapper
|
||||||
Version: 0.5.2
|
Version: 0.5.3
|
||||||
Release: 0
|
Release: 0
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
Source: snapper-%{version}.tar.bz2
|
Source: snapper-%{version}.tar.bz2
|
||||||
@ -75,7 +75,7 @@ BuildRequires: pam-devel
|
|||||||
Requires: diffutils
|
Requires: diffutils
|
||||||
Requires: libsnapper4 = %version
|
Requires: libsnapper4 = %version
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
Recommends: cron logrotate snapper-zypp-plugin
|
Recommends: logrotate snapper-zypp-plugin
|
||||||
Supplements: btrfsprogs
|
Supplements: btrfsprogs
|
||||||
%endif
|
%endif
|
||||||
Summary: Tool for filesystem snapshot management
|
Summary: Tool for filesystem snapshot management
|
||||||
@ -108,6 +108,8 @@ make %{?_smp_mflags}
|
|||||||
%install
|
%install
|
||||||
%make_install
|
%make_install
|
||||||
rm -f "%{buildroot}/%{_libdir}"/*.la "%{buildroot}/%{_lib}/security/pam_snapper.la"
|
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}
|
%if 0%{?suse_version}
|
||||||
install -D -m 644 data/sysconfig.snapper "%{buildroot}%{_fillupdir}/sysconfig.snapper"
|
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
|
%check
|
||||||
make 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
|
%files -f snapper.lang
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%{_bindir}/snapper
|
%{_bindir}/snapper
|
||||||
@ -135,9 +167,7 @@ make check
|
|||||||
%doc %{_mandir}/*/mksubvolume.8*
|
%doc %{_mandir}/*/mksubvolume.8*
|
||||||
%endif
|
%endif
|
||||||
%config(noreplace) %{_sysconfdir}/logrotate.d/snapper
|
%config(noreplace) %{_sysconfdir}/logrotate.d/snapper
|
||||||
/etc/cron.hourly/suse.de-snapper
|
%{_unitdir}/snapper-*.*
|
||||||
/etc/cron.daily/suse.de-snapper
|
|
||||||
/usr/lib/systemd/system/snapper-*.*
|
|
||||||
%config /etc/dbus-1/system.d/org.opensuse.Snapper.conf
|
%config /etc/dbus-1/system.d/org.opensuse.Snapper.conf
|
||||||
%{_datadir}/dbus-1/system-services/org.opensuse.Snapper.service
|
%{_datadir}/dbus-1/system-services/org.opensuse.Snapper.service
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user