revert back to use OpenSSL (#266021)
This commit is contained in:
parent
4f230aa568
commit
c13f5712fe
18
curl.spec
18
curl.spec
@ -4,7 +4,7 @@
|
||||
Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
|
||||
Name: curl
|
||||
Version: 7.16.4
|
||||
Release: 3%{?dist}
|
||||
Release: 4%{?dist}
|
||||
License: MIT
|
||||
Group: Applications/Internet
|
||||
Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
|
||||
@ -12,8 +12,9 @@ Patch1: curl-7.15.3-multilib.patch
|
||||
Patch2: curl-7.16.0-privlibs.patch
|
||||
Patch3: curl-7.16.4-ftp.patch
|
||||
URL: http://curl.haxx.se/
|
||||
Requires: openssl
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
BuildRequires: libtool, pkgconfig, libidn-devel, nss-devel
|
||||
BuildRequires: openssl-devel, libtool, pkgconfig, libidn-devel
|
||||
|
||||
%description
|
||||
cURL is a tool for getting files from FTP, HTTP, Gopher, Telnet, and
|
||||
@ -25,7 +26,7 @@ authentication, FTP upload, HTTP post, and file transfer resume.
|
||||
%package devel
|
||||
Group: Development/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: pkgconfig, automake
|
||||
Requires: openssl-devel, libidn-devel, pkgconfig, automake
|
||||
Summary: Files needed for building applications with libcurl
|
||||
|
||||
%description devel
|
||||
@ -41,11 +42,11 @@ use cURL's capabilities internally.
|
||||
%patch3 -p1 -b .ftp
|
||||
|
||||
%build
|
||||
if pkg-config nss ; then
|
||||
CPPFLAGS=`pkg-config --cflags nss`; export CPPFLAGS
|
||||
LDFLAGS=`pkg-config --libs nss`; export LDFLAGS
|
||||
if pkg-config openssl ; then
|
||||
CPPFLAGS=`pkg-config --cflags openssl`; export CPPFLAGS
|
||||
LDFLAGS=`pkg-config --libs openssl`; export LDFLAGS
|
||||
fi
|
||||
%configure --without-ssl --with-nss=%{_prefix} --enable-ipv6 \
|
||||
%configure --with-ssl=%{_prefix} --enable-ipv6 \
|
||||
--with-ca-bundle=%{_sysconfdir}/pki/tls/certs/ca-bundle.crt \
|
||||
--with-gssapi=%{_prefix}/kerberos --with-libidn \
|
||||
--with-ldap-lib=libldap-%{ldap_version}.so.0 \
|
||||
@ -99,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_datadir}/aclocal/libcurl.m4
|
||||
|
||||
%changelog
|
||||
* Mon Sep 3 2007 Jindrich Novy <jnovy@redhat.com> 7.16.4-4
|
||||
- revert back to use OpenSSL (#266021)
|
||||
|
||||
* Mon Aug 27 2007 Jindrich Novy <jnovy@redhat.com> 7.16.4-3
|
||||
- don't use openssl, use nss instead
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user