SPECS: curl.spec - gnutls bcond

[arekm]

Author: arekm                        Date: Sun Jun 15 11:38:00 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- gnutls bcond

---- Files affected:
SPECS:
   curl.spec (1.150 -> 1.151) 

---- Diffs:

================================================================
Index: SPECS/curl.spec
diff -u SPECS/curl.spec:1.150 SPECS/curl.spec:1.151
--- SPECS/curl.spec:1.150	Thu Jun  5 08:35:13 2008
+++ SPECS/curl.spec	Sun Jun 15 13:37:55 2008
@@ -4,6 +4,7 @@
 %bcond_with	ares		# with c-ares (asynchronous DNS operations) library (disables IPv6)
 %bcond_without	ssh		# without SSH support
 %bcond_without	ssl		# without SSL support
+%bcond_with	gnutls
 %bcond_without	kerberos5	# without MIT Kerberos 5 support
 #
 Summary:	A utility for getting files from remote servers (FTP, HTTP, and others)
@@ -31,7 +32,13 @@
 %{?with_ssh:BuildRequires:	libssh2-devel >= 0.16}
 BuildRequires:	libtool
 BuildRequires:	openldap-devel
-%{?with_ssl:BuildRequires:	openssl-devel >= 0.9.7d}
+%if %{with ssl}
+%if %{with gnutls}
+BuildRequires:	gnutls-devel
+%else
+BuildRequires:	openssl-devel >= 0.9.7d
+%endif
+%endif
 BuildRequires:	zlib-devel
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	libidn >= 0.4.1
@@ -112,7 +119,13 @@
 %{?with_kerberos5:Requires:	krb5-devel}
 Requires:	libidn-devel >= 0.4.1
 %{?with_ssh:Requires:	libssh2-devel >= 0.16}
-%{?with_ssl:Requires:	openssl-devel >= 0.9.7c}
+%if %{with ssl}
+%if %{with gnutls}
+Requires:	gnutls-devel
+%else
+Requires:	openssl-devel >= 0.9.7c
+%endif
+%endif
 Requires:	zlib-devel
 Obsoletes:	libcurl2-devel
 
@@ -173,8 +186,14 @@
 %{__automake}
 %configure \
 	ac_cv_header_gss_h=no \
-	%{?with_ssl:--with-ssl=%{_prefix}} \
-	%{?with_ssl:--with-ca-bundle=/usr/share/ssl/ca-bundle.crt} \
+%if %{with ssl}
+	--with-ca-bundle=/usr/share/ssl/ca-bundle.crt \
+%if %{with gnutls}
+	--with-gnutls=%{_prefix} --without-ssl \
+%else
+	--with-ssl=%{_prefix} \
+%endif
+%endif
 	%{?with_kerberos5:--with-gssapi=%{_prefix}} \
 	%{?with_ares:--enable-ares=%{_prefix}} \
 	--%{?with_ares:dis}%{!?with_ares:en}able-ipv6
@@ -226,7 +245,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.150  2008/06/05 06:35:13  adamg
+Revision 1.151  2008/06/15 11:37:55  arekm
+- gnutls bcond
+
+Revision 1.150  2008-06-05 06:35:13  adamg
 - updated to 7.18.2
 
 Revision 1.149  2008-05-03 13:54:00  adamg
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/curl.spec?r1=1.150&r2=1.151&f=u