From ad1e2d904057f5af32dd0ab46adc599a5f043e91 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Fri, 31 May 2013 17:15:57 +0200 Subject: [PATCH] spec: rely on rpmbuild with config.{guess,sub} substitution Related: #926610 Version: 1.26-24 --- tar.spec | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/tar.spec b/tar.spec index 0e46acf..e03aaec 100644 --- a/tar.spec +++ b/tar.spec @@ -94,16 +94,12 @@ Patch13: tar-1.26-allow-extract-single-volume.patch # ~> upstream: 7b5e803963 Patch14: tar-1.26-command-args.patch -# Allow to build on aarch64 also -# ~> #926610 (downstream) -Patch15: 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 -Patch16: tar-1.26-xattrs-printing.patch +Patch15: tar-1.26-xattrs-printing.patch # Silence gcc warnings # ~> upstream tar: 17f99bc6f, 5bb0433 @@ -157,8 +153,7 @@ the rmt package. %patch12 -p1 -b .pax-sparse-big-files %patch13 -p1 -b .extract-single-volume %patch14 -p1 -b .command-args -%patch15 -p1 -b .arm-config-guess-sub -%patch16 -p1 -b .print-xattrs-fix +%patch15 -p1 -b .print-xattrs-fix %patch999 -p1 -b .silence-gcc autoreconf -v @@ -221,6 +216,8 @@ fi * Thu May 30 2013 Pavel Raiskup - 2:1.26-24 - 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 - 2:1.26-23 - again search for 'rmt' binary in %%{_sbindir} on target host