[bontmia] Add patch to fix cp issue (#1152534)
terjeros
terjeros at fedoraproject.org
Tue Oct 14 17:08:14 UTC 2014
commit 4c90533b038c35a895db79df846bcf30721cfb96
Author: Terje Røsten <terje.rosten at ntnu.no>
Date: Tue Oct 14 19:08:05 2014 +0200
Add patch to fix cp issue (#1152534)
- Clean up
bontmia-0.14-cp-al.patch | 13 +++++++++++++
bontmia.spec | 23 +++++++++++------------
2 files changed, 24 insertions(+), 12 deletions(-)
---
diff --git a/bontmia-0.14-cp-al.patch b/bontmia-0.14-cp-al.patch
new file mode 100644
index 0000000..e2c7155
--- /dev/null
+++ b/bontmia-0.14-cp-al.patch
@@ -0,0 +1,13 @@
+diff --git a/bontmia b/bontmia
+index a1d9fc0..1075b1f 100755
+--- a/bontmia
++++ b/bontmia
+@@ -270,7 +270,7 @@ make_hard-link_copy_of_last_backup()
+ unlock_destination
+ exit 1
+ }
+- cp -lR "${last_backup}/"* "${tmpdir}/unfinished_backup/${this_backup}" >/dev/null 2>&1 || {
++ cp -al "${last_backup}/"* "${tmpdir}/unfinished_backup/${this_backup}" >/dev/null 2>&1 || {
+ echo " WARNING: The last backup had NO files!"
+ echo " Or tmpdir is not on the same volume as destination"
+ }
diff --git a/bontmia.spec b/bontmia.spec
index 777d020..1844b5e 100644
--- a/bontmia.spec
+++ b/bontmia.spec
@@ -1,12 +1,13 @@
Summary: Backup over network to multiple incremental archives
Name: bontmia
Version: 0.14
-Release: 12%{?dist}
+Release: 13%{?dist}
License: GPLv2
Group: Applications/Archiving
URL: http://folk.uio.no/johnen/bontmia/
Source0: http://folk.uio.no/johnen/%{name}/%{name}-%{version}.tar.gz
Patch0: bontmia-0.14-mktemp.patch
+Patch1: bontmia-0.14-cp-al.patch
Requires: bind-utils
Requires: coreutils
Requires: findutils
@@ -17,8 +18,6 @@ Requires: perl
Requires: rsync
Requires: sed
BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
%description
A disk based backup system which provides a complete snapshot of
backed up directories. Using a clever hardlink and rsync trick,
@@ -27,23 +26,23 @@ the backup is fast and space efficient.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
+
%build
+#empty
%install
-%{__rm} -rf %{buildroot}
-
-%{__install} -d %{buildroot}%{_bindir}/
-%{__install} -p -m 0755 bontmia %{buildroot}%{_bindir}/%{name}
-
-%clean
-%{__rm} -rf %{buildroot}
+install -D -p -m 0755 bontmia %{buildroot}%{_bindir}/bontmia
%files
-%defattr(-, root, root, -)
%doc COPYING README
-%{_bindir}/%{name}
+%{_bindir}/bontmia
%changelog
+* Tue Oct 14 2014 Terje Rosten <terje.rosten at ntnu.no> - 0.14-13
+- Add patch to fix cp issue (#1152534)
+- Clean up
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
More information about the scm-commits
mailing list