diff --git a/curl.changes b/curl.changes index e811542..d05eefe 100644 --- a/curl.changes +++ b/curl.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Feb 18 15:00:12 CET 2008 - mmarek@suse.cz + +- removed Requires: openssl-certs - doesn't exist on older dists + and is required by libopenssl otherwise +- allow to build the package even if the testsuite fails + ------------------------------------------------------------------- Fri Feb 8 10:21:10 CET 2008 - mmarek@suse.cz diff --git a/curl.spec b/curl.spec index de43bb9..800b861 100644 --- a/curl.spec +++ b/curl.spec @@ -10,12 +10,13 @@ # norootforbuild + Name: curl BuildRequires: libidn-devel openldap2-devel openssl-devel zlib-devel # used by the testsuite BuildRequires: stunnel Version: 7.18.0 -Release: 5 +Release: 10 AutoReqProv: on License: BSD 3-Clause; X11/MIT Group: Productivity/Networking/Web/Utilities @@ -54,7 +55,6 @@ Authors: %package -n libcurl4 Summary: cURL shared library version 4 Group: Productivity/Networking/Web/Utilities -Requires: openssl-certs %description -n libcurl4 cURL shared library version 4. @@ -118,7 +118,14 @@ if test -z "$BUILD_INCARNATION"; then BUILD_INCARNATION=0 fi base=$((8990 + $BUILD_INCARNATION * 20)) -perl ./runtests.pl -a -b$base !279 # test 279 doesn't work with -b +# test 279 doesn't work with -b +perl ./runtests.pl -a -b$base !279 || { +%if 0%{?testsuite_nonfatal:1} + echo "WARNING: runtests.pl failed with code $?, continuing nevertheless" +%else + exit +%endif +} %install make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} @@ -160,6 +167,10 @@ rm -rf $RPM_BUILD_ROOT %doc %{_mandir}/man3/* %changelog +* Mon Feb 18 2008 mmarek@suse.cz +- removed Requires: openssl-certs - doesn't exist on older dists + and is required by libopenssl otherwise +- allow to build the package even if the testsuite fails * Fri Feb 08 2008 mmarek@suse.cz - use /etc/ssl/certs instead of own curl-ca-bundle.crt * more up-to-date ca cert collection (bnc#334690)