Hello community, here is the log from the commit of package curl for openSUSE:Factory checked in at Fri Jun 18 05:58:31 CEST 2010. -------- --- curl/curl.changes 2010-05-10 03:12:59.000000000 +0200 +++ curl/curl.changes 2010-06-02 16:14:09.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Jun 2 14:12:54 UTC 2010 - lnussel@suse.de + +- allowing switching to nss instead of openssl via bcond + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ curl.spec ++++++ --- /var/tmp/diff_new_pack.ckdY5i/_old 2010-06-18 05:58:25.000000000 +0200 +++ /var/tmp/diff_new_pack.ckdY5i/_new 2010-06-18 05:58:25.000000000 +0200 @@ -17,9 +17,18 @@ # norootforbuild +%bcond_without openssl +%bcond_with mozilla_nss +%bcond_without testsuite Name: curl -BuildRequires: libidn-devel openldap2-devel openssl-devel pkg-config zlib-devel +BuildRequires: libidn-devel openldap2-devel pkg-config zlib-devel +%if %{with openssl} +BuildRequires: openssl-devel +%endif +%if %{with mozilla_nss} +BuildRequires: mozilla-nss-devel +%endif %if 0%{suse_version} > 930 BuildRequires: krb5-devel %else @@ -32,7 +41,7 @@ %endif #define cvs_suffix -20090302 Version: 7.20.1 -Release: 2 +Release: 3 AutoReqProv: on # bug437293 %ifarch ppc64 @@ -88,8 +97,15 @@ ./configure \ --prefix=%{_prefix} \ --enable-ipv6 \ +%if %{with openssl} --with-ssl \ --with-ca-path=/etc/ssl/certs/ \ +%else + --without-ssl \ +%if %{with mozilla_nss} + --with-nss \ +%endif +%endif %if %suse_version > 930 --with-gssapi=/usr/lib/mit \ %else @@ -103,6 +119,10 @@ ./libtool --config | grep -q link_all_deplibs=no # enable-hidden-symbols needs gcc4 and causes that curl exports only its API make %{?jobs:-j%jobs} + +%if %{with testsuite} + +%check cd tests make # make sure the testsuite runs don't race on MP machines in autobuild @@ -120,6 +140,7 @@ echo "WARNING: runtests.pl failed with code $?, continuing nevertheless" %endif } +%endif %install make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org