rpms/curl/devel curl.spec,1.56,1.57

[Jindrich Novy (jnovy)]

Author: jnovy

Update of /cvs/extras/rpms/curl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15017

Modified Files:
	curl.spec 
Log Message:
revert back to use OpenSSL (#266021)


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- curl.spec	27 Aug 2007 12:42:14 -0000	1.56
+++ curl.spec	3 Sep 2007 10:48:12 -0000	1.57
@@ -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 @@
 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 @@
 %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 @@
 %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 @@
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Mon Sep  3 2007 Jindrich Novy <jnovy at redhat.com> 7.16.4-4
+- revert back to use OpenSSL (#266021)
+
 * Mon Aug 27 2007 Jindrich Novy <jnovy at redhat.com> 7.16.4-3
 - don't use openssl, use nss instead