From e850a06dd61391c96223c51fdc514ef468d563c2 Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Jun 26 2015 13:27:21 +0000
Subject: tests: avoid two false failures related to -T


Version: 1.27.1-8

---

diff --git a/tar-1.27.1-T-tests-false-failure.patch b/tar-1.27.1-T-tests-false-failure.patch
new file mode 100644
index 0000000..f5d444b
--- /dev/null
+++ b/tar-1.27.1-T-tests-false-failure.patch
@@ -0,0 +1,47 @@
+From: Pavel Raiskup <praiskup@redhat.com>
+Date: Wed, 17 Dec 2014 07:22:28 +0100
+Subject: [PATCH 12/12] testsuite: sort (otherwise random) expected output
+
+Downstream, proposed:
+http://www.mail-archive.com/bug-tar@gnu.org/msg04798.html
+
+diff --git a/tests/T-dir00.at b/tests/T-dir00.at
+index 7f89fcf..8ff6ba8 100644
+--- a/tests/T-dir00.at
++++ b/tests/T-dir00.at
+@@ -28,13 +28,14 @@
+ AT_SETUP([recursive extraction from --files-from])
+ AT_KEYWORDS([files-from extract T-dir T-dir00])
+ AT_TAR_CHECK([
++AT_SORT_PREREQ
+ mkdir dir
+ genfile -f dir/file1
+ genfile -f dir/file2
+ tar cf archive dir
+ rm -rf dir
+ echo dir > list
+-tar xfTv archive list
++tar xfTv archive list | sort
+ ],
+ [0],
+ [dir/
+diff --git a/tests/T-dir01.at b/tests/T-dir01.at
+index 155a373..db92292 100644
+--- a/tests/T-dir01.at
++++ b/tests/T-dir01.at
+@@ -28,13 +28,14 @@
+ AT_SETUP([trailing slash in --files-from])
+ AT_KEYWORDS([files-from extract T-dir T-dir01])
+ AT_TAR_CHECK([
++AT_SORT_PREREQ
+ mkdir dir
+ genfile -f dir/file1
+ genfile -f dir/file2
+ tar cf archive dir
+ rm -rf dir
+ echo dir/ > list
+-tar xfTv archive list
++tar xfTv archive list | sort
+ ],
+ [0],
+ [dir/
diff --git a/tar.spec b/tar.spec
index dda9c5a..7f33e19 100644
--- a/tar.spec
+++ b/tar.spec
@@ -115,6 +115,10 @@ Patch16: tar-1.27.1-recursion-fix.patch
 # ~> Related to #1230762
 Patch17: tar-1.27.1-T-recursion-tests.patch
 
+# Fix two testsuite failures related to --files-from (FTBFS)
+# ~> downstream (http://www.mail-archive.com/bug-tar@gnu.org/msg04798.html)
+Patch18: tar-1.27.1-T-tests-false-failure.patch
+
 # run "make check" by default
 %bcond_without check
 
@@ -165,6 +169,7 @@ the rmt package on the remote box.
 %patch15 -p1 -b .T-matchflags
 %patch16 -p1 -b .recursion
 %patch17 -p1 -b .T-recursion-tests
+%patch18 -p1 -b .T-false-failure
 
 autoreconf -v
 
@@ -227,6 +232,7 @@ fi
 %changelog
 * Fri Jun 26 2015 Pavel Raiskup <praiskup@redhat.com> - 1.27.1-8
 - fix --files-from and -T cooperation (rhbz#1230762)
+- avoid two testsuite false alarms related to --files-from option
 
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2:1.27.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild