don't use openssl, use nss instead

This commit is contained in:
Jindrich Novy 2007-08-27 12:18:28 +00:00
parent ab16894e62
commit 16dc696dfe

View File

@ -4,7 +4,7 @@
Summary: A utility for getting files from remote servers (FTP, HTTP, and others) Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
Name: curl Name: curl
Version: 7.16.4 Version: 7.16.4
Release: 2%{?dist} Release: 3%{?dist}
License: MIT License: MIT
Group: Applications/Internet Group: Applications/Internet
Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
@ -14,7 +14,7 @@ Patch3: curl-7.16.4-ftp.patch
URL: http://curl.haxx.se/ URL: http://curl.haxx.se/
Requires: openssl Requires: openssl
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: openssl-devel, libtool, pkgconfig, libidn-devel BuildRequires: libtool, pkgconfig, libidn-devel
%description %description
cURL is a tool for getting files from FTP, HTTP, Gopher, Telnet, and cURL is a tool for getting files from FTP, HTTP, Gopher, Telnet, and
@ -42,11 +42,11 @@ use cURL's capabilities internally.
%patch3 -p1 -b .ftp %patch3 -p1 -b .ftp
%build %build
if pkg-config openssl ; then if pkg-config nss ; then
CPPFLAGS=`pkg-config --cflags openssl`; export CPPFLAGS CPPFLAGS=`pkg-config --cflags nss`; export CPPFLAGS
LDFLAGS=`pkg-config --libs openssl`; export LDFLAGS LDFLAGS=`pkg-config --libs nss`; export LDFLAGS
fi fi
%configure --with-ssl=%{_prefix} --enable-ipv6 \ %configure --without-ssl --with-nss=%{_prefix} --enable-ipv6 \
--with-ca-bundle=%{_sysconfdir}/pki/tls/certs/ca-bundle.crt \ --with-ca-bundle=%{_sysconfdir}/pki/tls/certs/ca-bundle.crt \
--with-gssapi=%{_prefix}/kerberos --with-libidn \ --with-gssapi=%{_prefix}/kerberos --with-libidn \
--with-ldap-lib=libldap-%{ldap_version}.so.0 \ --with-ldap-lib=libldap-%{ldap_version}.so.0 \
@ -100,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/aclocal/libcurl.m4 %{_datadir}/aclocal/libcurl.m4
%changelog %changelog
* Mon Aug 27 2007 Jindrich Novy <jnovy@redhat.com> 7.16.4-3
- don't use openssl, use nss instead
* Fri Aug 10 2007 Jindrich Novy <jnovy@redhat.com> 7.16.4-2 * Fri Aug 10 2007 Jindrich Novy <jnovy@redhat.com> 7.16.4-2
- fix anonymous ftp login (#251570), thanks to David Cantrell - fix anonymous ftp login (#251570), thanks to David Cantrell