From 1105c159cc395ceb4224eca606d897ebbead33e1 Mon Sep 17 00:00:00 2001
From: Paul Howarth <pghmcfc@fedoraproject.org>
Date: Thu, 22 Apr 2010 15:27:30 +0000
Subject: [PATCH] Replace Rawhide s390-sleep patch with a more targeted patch
 adding a delay     after tests 513 and 514 rather than after all tests

---
 curl-7.20.1-test-delay.patch | 24 ++++++++++++++++++++++++
 curl.spec                    |  8 ++++++--
 2 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 curl-7.20.1-test-delay.patch

diff --git a/curl-7.20.1-test-delay.patch b/curl-7.20.1-test-delay.patch
new file mode 100644
index 0000000..dd75596
--- /dev/null
+++ b/curl-7.20.1-test-delay.patch
@@ -0,0 +1,24 @@
+diff -up curl-7.20.1/tests/data/test513.delay curl-7.20.1/tests/data/test513
+--- curl-7.20.1/tests/data/test513.delay	2010-04-22 10:00:08.326108258 +0100
++++ curl-7.20.1/tests/data/test513	2010-04-22 11:09:08.342100834 +0100
+@@ -17,7 +17,7 @@ lib513
+  <name>
+ send HTTP POST using read callback that returns CURL_READFUNC_ABORT
+  </name>
+- <command>
++ <command delay="1">
+ http://%HOSTIP:%HTTPPORT/513
+ </command>
+ </client>
+diff -up curl-7.20.1/tests/data/test514.delay curl-7.20.1/tests/data/test514
+--- curl-7.20.1/tests/data/test514.delay	2010-04-22 10:00:08.326108258 +0100
++++ curl-7.20.1/tests/data/test514	2010-04-22 11:09:40.192203636 +0100
+@@ -29,7 +29,7 @@ lib514
+  <name>
+ First set options to POST and then to make HEAD
+  </name>
+- <command>
++ <command delay="1">
+ http://%HOSTIP:%HTTPPORT/514
+ </command>
+ </client>
diff --git a/curl.spec b/curl.spec
index 8a54b3c..754c195 100644
--- a/curl.spec
+++ b/curl.spec
@@ -1,7 +1,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.20.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
@@ -25,7 +25,7 @@ Patch103: curl-7.19.4-debug.patch
 # suppress occasional failure of curl test-suite on s390; caused more likely
 # by the test-suite infrastructure than (lib)curl itself
 # http://curl.haxx.se/mail/lib-2009-12/0031.html
-Patch104: curl-7.19.7-s390-sleep.patch
+Patch104: curl-7.20.1-test-delay.patch
 
 # use localhost6 instead of ip6-localhost in the curl test-suite
 Patch105: curl-7.19.7-localhost6.patch
@@ -215,6 +215,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Thu Apr 22 2010 Paul Howarth <paul@city-fan.org> 7.20.1-3
+- replace Rawhide s390-sleep patch with a more targeted patch adding a
+  delay after tests 513 and 514 rather than after all tests
+
 * Wed Apr 21 2010 Kamil Dudka <kdudka@redhat.com> 7.20.1-2
 - experimentally enabled threaded DNS lookup
 - make curl-config multilib ready again (#584107)