Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package storeBackup for openSUSE:Factory checked in at 2021-07-16 00:00:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/storeBackup (Old) and /work/SRC/openSUSE:Factory/.storeBackup.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "storeBackup" Fri Jul 16 00:00:34 2021 rev:35 rq:906417 version:3.5 Changes: -------- --- /work/SRC/openSUSE:Factory/storeBackup/storeBackup.changes 2020-02-24 15:53:36.287631978 +0100 +++ /work/SRC/openSUSE:Factory/.storeBackup.new.2625/storeBackup.changes 2021-07-16 00:02:38.172631879 +0200 @@ -1,0 +2,12 @@ +Thu Jul 8 07:54:56 UTC 2021 - [email protected] + +- Improve config detection for storeBackup-run-all script +- Remove storeBackup-3.5.diff + +------------------------------------------------------------------- +Wed Jul 7 15:34:13 UTC 2021 - [email protected] + +- Migrate from cron to systemd timers (bsc#1115457) + * Add a simple script to replace cron-storeBackup + +------------------------------------------------------------------- Old: ---- storeBackup-3.5.diff New: ---- storeBackup-run-all storeBackup.service storeBackup.timer ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ storeBackup.spec ++++++ --- /var/tmp/diff_new_pack.HI0qA6/_old 2021-07-16 00:02:38.836626558 +0200 +++ /var/tmp/diff_new_pack.HI0qA6/_new 2021-07-16 00:02:38.840626526 +0200 @@ -1,7 +1,7 @@ # # spec file for package storeBackup # -# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,23 +25,25 @@ Source0: storeBackup-%{version}.tar.bz2 Source1: storeBackup-%{version}.config.default Source2: storeBackup-README.SUSE -Patch0: storeBackup-%{version}.diff +Source3: storeBackup.service +Source4: storeBackup.timer +Source5: storeBackup-run-all # PATCH-FIX-UPSTREAM earlier_execute_precommand.patch http://savannah.nongnu.org/bugs/?46605 -Patch1: earlier_execute_precommand.patch +Patch0: earlier_execute_precommand.patch # PATCH-FIX-OPENSUSE fix-rpmlint-env-script-interpreter.patch -Patch2: fix-rpmlint-env-script-interpreter.patch +Patch1: fix-rpmlint-env-script-interpreter.patch # PATCH-FIX-UPSTREAM fix-tmp-lock-file-race-condition.patch CVE-2020-7040 bsc#1156767 -Patch3: fix-tmp-lock-file-race-condition.patch -Url: http://storebackup.org/ +Patch2: fix-tmp-lock-file-race-condition.patch +URL: http://storebackup.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch +BuildRequires: systemd-rpm-macros Requires: bzip2 Requires: e2fsprogs Requires: fileutils Requires: sh-utils Requires: textutils Requires: which -Recommends: cron %description storeBackup is a disk-to-disk backup tool. The backuped files can be @@ -62,10 +64,9 @@ %prep %setup -n storeBackup -%patch0 -p 1 -%patch1 -p 0 +%patch0 -p 0 +%patch1 -p 1 %patch2 -p 1 -%patch3 -p 1 %build # make @@ -76,15 +77,15 @@ %{buildroot}/usr/lib/storeBackup/ \ %{buildroot}/usr/bin/ \ %{buildroot}/usr/share/doc/packages/storeBackup/ \ - %{buildroot}/etc/cron.daily/ \ %{buildroot}/etc/storebackup.d/ \ + %{buildroot}%{_sbindir}/ \ + %{buildroot}/%{_unitdir}/ \ %{buildroot}/%{_mandir}/man1 # cp -a %{S:1} ./doc/storebackup.config.default cp -a %{S:2} ./doc/README.SUSE cp -a _ATTENTION_ correct.sh ./doc/ cp -aRpv bin/ lib/ %{buildroot}/usr/lib/storeBackup/ -cp -a cron-storebackup %{buildroot}/etc/cron.daily/storebackup ln -sf /usr/lib/storeBackup/bin/storeBackup.pl %{buildroot}/usr/bin/storeBackup.pl ln -sf /usr/lib/storeBackup/bin/storeBackup.pl %{buildroot}/usr/bin/storeBackup ln -sf /usr/lib/storeBackup/bin/storeBackupCheckBackup.pl %{buildroot}/usr/bin/storeBackupCheckBackup.pl @@ -104,8 +105,24 @@ # install -m 644 man/man1/*.1 %{buildroot}/%{_mandir}/man1 ln -sf storeBackup.pl.1 %{buildroot}/%{_mandir}/man1/storeBackup.1 +install -m 644 %{S:3} %{buildroot}/%{_unitdir}/%{name}.service +install -m 644 %{S:4} %{buildroot}/%{_unitdir}/%{name}.timer +ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} +install -m 755 %{S:5} %{buildroot}/%{_prefix}/lib/%{name}/%{name}-run-all %{?suse_check} +%pre +%service_add_pre %{name}.service %{name}.timer + +%post +%service_add_post %{name}.service %{name}.timer + +%preun +%service_del_preun %{name}.service %{name}.timer + +%postun +%service_del_postun %{name}.service %{name}.timer + %files %defattr(-,root,root) %doc doc/* @@ -115,7 +132,8 @@ %dir /etc/storebackup.d/ # %attr(755, root, root) %config(noreplace) /etc/storebackup.d/storebackup.config %attr(755, root, root) /usr/bin/* -%attr(755, root, root) %dir /etc/cron.daily -%attr(755, root, root) /etc/cron.daily/storebackup +%{_sbindir}/rc%{name} +%{_unitdir}/%{name}.service +%{_unitdir}/%{name}.timer %changelog ++++++ storeBackup-run-all ++++++ #! /bin/sh -e # run storeBackup on all files in /etc/storebackup.d/ sequentially PATH=/bin:/sbin:/usr/bin:/usr/sbin error=0 configs=$(find /etc/storebackup.d/ -type f \( ! -iname "*~" ! -iname "*.swp" ! -iname "*.udf" \)) for file in $configs do if ! nice storeBackup -f "$file" then echo Error running backup for \"$file\" error=1 fi done exit $error ++++++ storeBackup.service ++++++ [Unit] Description=Backup tool Documentation=man:storeBackup(1) ConditionPathExists=/etc/storebackup.d [Service] Type=oneshot ExecStart=/usr/lib/storeBackup/storeBackup-run-all ++++++ storeBackup.timer ++++++ [Unit] Description=Daily backup Documentation=man:storeBackup(1) [Timer] OnCalendar=daily AccuracySec=12h Persistent=True [Install] WantedBy=timers.target
