Author: jnovy
Update of /cvs/extras/rpms/curl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1856
Modified Files:
curl.spec
Added Files:
curl-7.16.4-curl-config.patch
Log Message:
* Thu Oct 11 2007 Jindrich Novy <jnovy at redhat.com> 7.16.4-8
- list features correctly when curl is compiled against NSS (#316191)
curl-7.16.4-curl-config.patch:
--- NEW FILE curl-7.16.4-curl-config.patch ---
Patch for #316191 curl-config doesn't advertise support of SSL and HTTPS when
built against nss (Lubomir Kundrak <lkundrak at redhat.com>)
--- curl-7.16.4/curl-config.in.sslconfig 2007-10-02 22:55:15.000000000 +0200
+++ curl-7.16.4/curl-config.in 2007-10-02 22:58:19.000000000 +0200
@@ -56,6 +56,8 @@
usage 1
fi
+USE_SSL="@USE_SSLEAY@@USE_GNUTLS@@USE_NSS@"
+
while test $# -gt 0; do
case "$1" in
# this deals with options in the style
@@ -80,9 +82,9 @@
--feature|--features)
if test "@USE_SSLEAY@" = "1"; then
- echo "SSL"
NTLM=1 # OpenSSL implies NTLM
- elif test -n "@USE_GNUTLS@"; then
+ fi
+ if test -n "$USE_SSL"; then
echo "SSL"
fi
if test "@KRB4_ENABLED@" = "1"; then
@@ -112,13 +114,13 @@
--protocols)
if test "@CURL_DISABLE_HTTP@" != "1"; then
echo "HTTP"
- if test "@USE_SSLEAY@" = "1"; then
+ if test "$USE_SSL" = "1"; then
echo "HTTPS"
fi
fi
if test "@CURL_DISABLE_FTP@" != "1"; then
echo "FTP"
- if test "@USE_SSLEAY@" = "1"; then
+ if test "$USE_SSL" = "1"; then
echo "FTPS"
fi
fi
Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- curl.spec 17 Sep 2007 13:48:13 -0000 1.60
+++ curl.spec 11 Oct 2007 14:56:46 -0000 1.61
@@ -4,7 +4,7 @@
Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
Name: curl
Version: 7.16.4
-Release: 7%{?dist}
+Release: 8%{?dist}
License: MIT
Group: Applications/Internet
Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
@@ -12,6 +12,7 @@
Patch2: curl-7.16.0-privlibs.patch
Patch3: curl-7.16.4-ftp.patch
Patch4: curl-7.16.4-nsspem.patch
+Patch5: curl-7.16.4-curl-config.patch
Provides: webclient
URL: http://curl.haxx.se/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -43,6 +44,7 @@
%patch2 -p1 -b .privlibs
%patch3 -p1 -b .ftp
%patch4 -p1 -b .nsspem
+%patch5 -p1 -b .curl-config
%build
if pkg-config nss ; then
@@ -103,6 +105,9 @@
%{_datadir}/aclocal/libcurl.m4
%changelog
+* Thu Oct 11 2007 Jindrich Novy <jnovy at redhat.com> 7.16.4-8
+- list features correctly when curl is compiled against NSS (#316191)
+
* Mon Sep 17 2007 Jindrich Novy <jnovy at redhat.com> 7.16.4-7
- add zlib-devel BR to enable gzip compressed transfers in curl (#292211)