- 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:
YaST Team Bot
2018-01-12 15:19:28 +00:00
committed by Git OBS Bridge
parent bdb8eb8c2d
commit 2962894ab4
17 changed files with 81 additions and 32 deletions

View File

@@ -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