rpms/curl/devel 0107-curl-7.21.0-disable-test575.patch, NONE, 1.1 curl.spec, 1.163, 1.164

Dan Horák sharkcz at fedoraproject.org
Mon Jul 12 10:17:19 UTC 2010


Author: sharkcz

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

Modified Files:
	curl.spec 
Added Files:
	0107-curl-7.21.0-disable-test575.patch 
Log Message:
* Mon Jul 12 2010 Dan Horák <dan[at]danny.cz> 7.21.0-3
- disable test 575 on s390(x)


0107-curl-7.21.0-disable-test575.patch:
 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE 0107-curl-7.21.0-disable-test575.patch ---
diff -up curl-7.21.0/tests/data/Makefile.am.s390 curl-7.21.0/tests/data/Makefile.am
--- curl-7.21.0/tests/data/Makefile.am.s390	2010-07-12 12:11:12.000000000 +0200
+++ curl-7.21.0/tests/data/Makefile.am	2010-07-12 12:11:25.000000000 +0200
@@ -60,7 +60,7 @@ EXTRA_DIST = test1 test108 test117 test1
  test1072 test1073 test1074 test1075 test1076 test1077 test1078 test1079   \
  test1080 test1081 test1082 test1083 test1084 test1085 test633 test634     \
  test635 test636 test637 test558 test559 test1086 test1087 test1088        \
- test574 test575 test576 test577 test1113 test1114 \
+ test574 test576 test577 test1113 test1114 \
  test1089 test1090 test1091 test1092 test1093 test1094 test1095 test1096   \
  test1097 test560 test561 test1098 test1099 test562 test563 test1100       \
  test564 test1101 test1102 test1103 test1104 test299 test310 test311       \


Index: curl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/curl/devel/curl.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -p -r1.163 -r1.164
--- curl.spec	28 Jun 2010 11:29:02 -0000	1.163
+++ curl.spec	12 Jul 2010 10:17:19 -0000	1.164
@@ -1,7 +1,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.21.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
@@ -29,6 +29,9 @@ Patch105: 0105-curl-7.20.0-disable-test1
 # disable valgrind for certain test-cases (libssh2 problem)
 Patch106: 0106-curl-7.21.0-libssh2-valgrind.patch
 
+# exclude test575 from the test suite (fails on s390(x))
+Patch107: 0107-curl-7.21.0-disable-test575.patch
+
 Provides: webclient
 URL: http://curl.haxx.se/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -111,6 +114,11 @@ done
 %patch105 -p1
 rm -f tests/data/test1112
 
+%ifarch s390 s390x
+%patch107 -p1
+rm -f tests/data/test575
+%endif
+
 autoreconf
 
 # replace hard wired port numbers in the test suite
@@ -213,6 +221,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Mon Jul 12 2010 Dan Horák <dan[at]danny.cz> 7.21.0-3
+- disable test 575 on s390(x)
+
 * Mon Jun 28 2010 Kamil Dudka <kdudka at redhat.com> 7.21.0-2
 - add support for NTLM authentication (#603783)
 



More information about the scm-commits mailing list