X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=curl.spec;h=db1a2a55639d491639311e9bec81e339cd9dc08c;hb=96ab157702c66fcb66377aef1ba0537650162c91;hp=8c8e18f0b9235a8cfa73fcf1335535ef9af9737a;hpb=d7200934918acad794fe5d6ed43b37f013082e06;p=packages%2Fcurl.git

diff --git a/curl.spec b/curl.spec
index 8c8e18f..db1a2a5 100644
--- a/curl.spec
+++ b/curl.spec
@@ -1,10 +1,12 @@
 #
 # Conditional build:
-%bcond_with	ares		# with c-ares (asynchronous DNS operations) library (disables IPv6)
+%bcond_without	ares		# with c-ares (asynchronous DNS operations) library
 %bcond_without	ssh		# without SSH support
 %bcond_without	ssl		# without SSL support
-%bcond_without	kerberos5	# without MIT Kerberos 5 support
-#
+%bcond_without	gnutls		# use GnuTLS instead of OpenSSL
+%bcond_without	kerberos5	# without Heimdal Kerberos 5 support
+%bcond_without	rtmp		# without Real Time Media Protocol
+
 Summary:	A utility for getting files from remote servers (FTP, HTTP, and others)
 Summary(es.UTF-8):	Un cliente para bajar archivos de servidores (FTP, HTTP, y otros)
 Summary(pl.UTF-8):	Narzędzie do ściągania plików z serwerów (FTP, HTTP i innych)
@@ -12,27 +14,40 @@ Summary(pt_BR.UTF-8):	Busca URL (suporta FTP, TELNET, LDAP, GOPHER, DICT, HTTP e
 Summary(ru.UTF-8):	Утилита для получения файлов с серверов FTP, HTTP и других
 Summary(uk.UTF-8):	Утиліта для отримання файлів з серверів FTP, HTTP та інших
 Name:		curl
-Version:	7.16.4
+Version:	7.21.4
 Release:	1
 License:	MIT-like
 Group:		Applications/Networking
-Source0:	http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
-# Source0-md5:	ffa6d1f4e28ca493a43f9dc17882c4d8
+Source0:	http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
+# Source0-md5:	074fa396afe3dbf10163c05756a5a85d
 Patch0:		%{name}-no_strip.patch
 Patch1:		%{name}-ac.patch
 Patch2:		%{name}-pc.patch
+Patch3:		%{name}-krb5flags.patch
+Patch4:		libcurl.fb-changes.diff
 URL:		http://curl.haxx.se/
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake
-%{?with_ares:BuildRequires:	c-ares-devel}
-%{?with_kerberos5:BuildRequires:	krb5-devel}
+%{?with_ares:BuildRequires:	c-ares-devel >= 1.7.0}
+%{?with_kerberos5:BuildRequires:	heimdal-devel}
 BuildRequires:	libidn-devel >= 0.4.1
-%{?with_ssh:BuildRequires:	libssh2-devel}
+%{?with_rtmp:BuildRequires:	librtmp-devel}
+%{?with_ssh:BuildRequires:	libssh2-devel >= 0.16}
 BuildRequires:	libtool
-%{?with_ssl:BuildRequires:	openssl-devel >= 0.9.7d}
+BuildRequires:	openldap-devel
+BuildRequires:	pkgconfig
+%if %{with ssl}
+%if %{with gnutls}
+BuildRequires:	gnutls-devel
+%else
+BuildRequires:	openssl-devel >= 0.9.7d
+%endif
+%endif
+BuildRequires:	tar >= 1:1.22
 BuildRequires:	zlib-devel
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	libidn >= 0.4.1
+%{?with_ssh:Requires:	libssh2 >= 0.16}
 Requires:	openssl-tools >= 0.9.7d
 Obsoletes:	libcurl2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -90,6 +105,9 @@ curl п╕дтриму╓ багато корисних можливостей,
 Summary:	curl library
 Summary(pl.UTF-8):	Biblioteka curl
 Group:		Libraries
+Suggests:	ca-certificates
+Conflicts:	ca-certificates < 20080809-4
+%{?with_ares:Requires:	c-ares >= 1.7.0}
 
 %description libs
 curl library.
@@ -106,10 +124,18 @@ Summary(uk.UTF-8):	Файли для розробки з використанн
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
 %{?with_ares:Requires:	c-ares-devel}
-%{?with_kerberos5:Requires:	krb5-devel}
+%{?with_kerberos5:Requires:	heimdal-devel}
 Requires:	libidn-devel >= 0.4.1
-%{?with_ssh:Requires:	libssh2-devel}
-%{?with_ssl:Requires:	openssl-devel >= 0.9.7c}
+%{?with_rtmp:Requires:	librtmp-devel}
+%{?with_ssh:Requires:	libssh2-devel >= 0.16}
+Requires:	openldap-devel
+%if %{with ssl}
+%if %{with gnutls}
+Requires:	gnutls-devel
+%else
+Requires:	openssl-devel >= 0.9.7c
+%endif
+%endif
 Requires:	zlib-devel
 Obsoletes:	libcurl2-devel
 
@@ -161,20 +187,30 @@ Bibliotecas estáticas para desenvolvimento com o curl.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__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=/etc/certs/ca-certificates.crt \
+%if %{with gnutls}
+	--with-gnutls --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
+	%{?with_rtmp:--with-librtmp} \
+	%{?with_ares:--enable-ares} \
+	--enable-ldaps \
+	--enable-ipv6
 
 %{__make}
 
@@ -199,6 +235,7 @@ rm -rf $RPM_BUILD_ROOT
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libcurl.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libcurl.so.4
 
 %files devel
 %defattr(644,root,root,755)
@@ -209,7 +246,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/curl
 %{_pkgconfigdir}/libcurl.pc
 %{_mandir}/man1/curl-config.1*
-%{_mandir}/man3/*curl*.3*
+%{_mandir}/man3/curl_*.3*
+%{_mandir}/man3/libcurl*.3*
 
 %files static
 %defattr(644,root,root,755)