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

diff --git a/curl.spec b/curl.spec
index 7ac4a2b..db1a2a5 100644
--- a/curl.spec
+++ b/curl.spec
@@ -1,11 +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	gnutls		# use GnuTLS instead of OpenSSL
-%bcond_without	kerberos5	# without MIT Kerberos 5 support
-#
+%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)
@@ -13,24 +14,28 @@ 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.19.2
+Version:	7.21.4
 Release:	1
 License:	MIT-like
 Group:		Applications/Networking
-Source0:	http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
-# Source0-md5:	3a461b145a4a31fe7d5a44684e7fbdbc
+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_rtmp:BuildRequires:	librtmp-devel}
 %{?with_ssh:BuildRequires:	libssh2-devel >= 0.16}
 BuildRequires:	libtool
 BuildRequires:	openldap-devel
+BuildRequires:	pkgconfig
 %if %{with ssl}
 %if %{with gnutls}
 BuildRequires:	gnutls-devel
@@ -38,6 +43,7 @@ BuildRequires:	gnutls-devel
 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
@@ -101,6 +107,7 @@ 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.
@@ -117,9 +124,11 @@ 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_rtmp:Requires:	librtmp-devel}
 %{?with_ssh:Requires:	libssh2-devel >= 0.16}
+Requires:	openldap-devel
 %if %{with ssl}
 %if %{with gnutls}
 Requires:	gnutls-devel
@@ -178,6 +187,8 @@ Bibliotecas estáticas para desenvolvimento com o curl.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 %{__libtoolize}
@@ -190,15 +201,16 @@ Bibliotecas estáticas para desenvolvimento com o curl.
 %if %{with ssl}
 	--with-ca-bundle=/etc/certs/ca-certificates.crt \
 %if %{with gnutls}
-	--with-gnutls=%{_prefix} --without-ssl \
+	--with-gnutls --without-ssl \
 %else
 	--with-ssl=%{_prefix} \
 %endif
 %endif
 	%{?with_kerberos5:--with-gssapi=%{_prefix}} \
-	%{?with_ares:--enable-ares=%{_prefix}} \
+	%{?with_rtmp:--with-librtmp} \
+	%{?with_ares:--enable-ares} \
 	--enable-ldaps \
-	--%{?with_ares:dis}%{!?with_ares:en}able-ipv6
+	--enable-ipv6
 
 %{__make}