Accepting request 308148 from home:vitezslav_cizek:branches:devel:libraries:c_c++

- enable HTTP/2 support
- make the testsuite failure fatal
  * added curl-disable_failing_tests.patch
  * added groff to BuildRequires to enable builtin manual (test 1026)

OBS-URL: https://build.opensuse.org/request/show/308148
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/curl?expand=0&rev=134
This commit is contained in:
Ismail Dönmez
2015-05-21 14:02:13 +00:00
committed by Git OBS Bridge
parent 753a9895de
commit 0cff5e983c
3 changed files with 27 additions and 10 deletions

View File

@@ -35,9 +35,12 @@ Patch1: dont-mess-with-rpmoptflags.diff
Patch3: curl-secure-getenv.patch
# PATCH-FIX-OPENSUSE lnussel@suse.de -- use openssl's built in verify path as fallback
Patch4: curl-7.41.0-use-openssl-s-built-in-verify-path-as-fallback.diff
Patch5: curl-disable_failing_tests.patch
BuildRequires: groff
BuildRequires: krb5-mini-devel
BuildRequires: libtool
BuildRequires: lzma
BuildRequires: nghttp2-devel
BuildRequires: openldap2-devel
BuildRequires: pkg-config
BuildRequires: pkgconfig(libidn)
@@ -97,6 +100,7 @@ user interaction or any kind of interactivity.
%patch1
%patch3
%patch4 -p1
%patch5 -p1
%build
# curl complains if macro definition is contained in CFLAGS
@@ -128,7 +132,8 @@ sed -i 's/\(link_all_deplibs=\)unknown/\1no/' configure
--enable-hidden-symbols \
--disable-static \
--enable-threaded-resolver \
--with-libmetalink
--with-libmetalink \
--with-nghttp2=%{_libdir}
# if this fails, the above sed hack did not work
./libtool --config | grep -q link_all_deplibs=no
@@ -147,15 +152,9 @@ if test -z "$BUILD_INCARNATION"; then
BUILD_INCARNATION=0
fi
base=$((8990 + $BUILD_INCARNATION * 20))
perl ./runtests.pl -a -b$base || {
%if 0%{?curl_testsuite_fatal:1}
exit
%else
echo "WARNING: runtests.pl failed with code $?, continuing nevertheless"
%endif
}
%endif
perl ./runtests.pl -a -b$base || exit
popd
%endif
%install
%make_install
@@ -172,7 +171,7 @@ install -Dm 0644 docs/libcurl/libcurl.m4 %{buildroot}%{_datadir}/aclocal/libcurl
%doc docs/{BUGS,FAQ,FEATURES,MANUAL,RESOURCES,TODO,TheArtOfHttpScripting}
%doc lib/README.curl_off_t
%{_bindir}/curl
%doc %{_mandir}/man1/curl.1%{ext_man}
%{_mandir}/man1/curl.1%{ext_man}
%files -n libcurl4
%defattr(-,root,root)