[tar/f19] spec: rely on rpmbuild with config.{guess, sub} substitution
Pavel Raiskup
praiskup at fedoraproject.org
Fri May 31 19:00:38 UTC 2013
commit eef30f00fdf861cf5c8ce9175d4fe88b80023f36
Author: Pavel Raiskup <praiskup at redhat.com>
Date: Fri May 31 17:15:57 2013 +0200
spec: rely on rpmbuild with config.{guess,sub} substitution
(cherry pick from fc20)
Related: #926610
Version: 1.26-23
tar.spec | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
---
diff --git a/tar.spec b/tar.spec
index 441df0f..edc4d9c 100644
--- a/tar.spec
+++ b/tar.spec
@@ -88,16 +88,12 @@ Patch12: tar-1.26-pax-big-sparse-files.patch
# ~> upstream (beca89bc)
Patch13: tar-1.26-allow-extract-single-volume.patch
-# Allow to build on aarch64 also
-# ~> #926610 (downstream)
-Patch14: tar-1.26-arm-config-sub-guess.patch
-
# Do not print xattrs/selinux/acls when --no-xattrs/--no-acls/--no-selinux
# options are used during -tvv output. (TODO: merge this with xattrs patch
# once becomes upstream)
# ~> downstream (yet)
# ~> proposal: http://lists.gnu.org/archive/html/bug-tar/2013-05/msg00020.html
-Patch15: tar-1.26-xattrs-printing.patch
+Patch14: tar-1.26-xattrs-printing.patch
# Silence gcc warnings
# ~> upstream tar: 17f99bc6f, 5bb0433
@@ -150,8 +146,7 @@ the rmt package.
%patch11 -p1 -b .big_uid_gid
%patch12 -p1 -b .pax-sparse-big-files
%patch13 -p1 -b .extract-single-volume
-%patch14 -p1 -b .arm-config-guess-sub
-%patch15 -p1 -b .print-xattrs-fix
+%patch14 -p1 -b .print-xattrs-fix
%patch999 -p1 -b .silence-gcc
autoreconf -v
@@ -211,6 +206,8 @@ fi
* Thu May 30 2013 Pavel Raiskup <praiskup at redhat.com> - 2:1.26-23
- use /usr/bin/ssh as the default remote shell binary (#969015)
- do not verbose-print xattrs when --no-xattrs option is used
+- do not override the config.{guess,sub} twice, this is already done by the
+ redhat-rpm-config package (#951442)
* Tue May 28 2013 Pavel Raiskup <praiskup at redhat.com> - 2:1.26-22
- again search for 'rmt' binary in %%{_sbindir} on target host
More information about the scm-commits
mailing list