rpms/curl/devel curl-7.20.1-test-delay.patch, NONE, 1.1 curl.spec, 1.151, 1.152

[Paul Howarth]

Author: pghmcfc

Update of /cvs/pkgs/rpms/curl/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv19231

Modified Files:
	curl.spec 
Added Files:
	curl-7.20.1-test-delay.patch 
Log Message:
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:
 test513 |    2 +-
 test514 |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE curl-7.20.1-test-delay.patch ---
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>


Index: curl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/curl/devel/curl.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -p -r1.151 -r1.152
--- curl.spec	21 Apr 2010 19:09:46 -0000	1.151
+++ curl.spec	22 Apr 2010 15:27:30 -0000	1.152
@@ -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 at 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 at redhat.com> 7.20.1-2
 - experimentally enabled threaded DNS lookup
 - make curl-config multilib ready again (#584107)