- updated to 7.30.0

[packages/curl.git] / curl.spec

diff --git a/curl.spec b/curl.spec
index 034ea5fab07af1d302be898b1767f8d67cbd0d22..4c8cdf062557634005987da318c11ae7c29135e7 100644 (file)
--- a/curl.spec
+++ b/curl.spec
@@ -1,13 +1,19 @@
 #
 # Conditional build:
-%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 Heimdal Kerberos 5 support
-%bcond_without rtmp            # without Real Time Media Protocol
 %bcond_without ldap            # without LDAP support
-#
+%if "%{pld_release}" != "ac"
+%bcond_without ares            # with c-ares (asynchronous DNS operations) library
+%bcond_with    gnutls          # use GnuTLS instead of OpenSSL
+%bcond_without rtmp            # without Real Time Media Protocol
+%else
+%bcond_with    ares            # with c-ares (asynchronous DNS operations) library
+%bcond_with    gnutls          # use GnuTLS instead of OpenSSL
+%bcond_with    rtmp            # without Real Time Media Protocol
+%endif
+
 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)
@@ -15,17 +21,14 @@ 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.22.0
+Version:       7.30.0
 Release:       1
 License:       MIT-like
 Group:         Applications/Networking
 Source0:       http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
-# Source0-md5: 2fd7d848e143b32a42bf2a28af7caab0
-Patch0:                %{name}-no_strip.patch
-Patch1:                %{name}-ac.patch
-Patch2:                %{name}-pc.patch
-Patch3:                %{name}-krb5flags.patch
-Patch4:                libcurl.fb-changes.diff
+# Source0-md5: e47049eaabfbed194bef7ae4960fdc37
+Patch0:                %{name}-ac.patch
+Patch1:                %{name}-krb5flags.patch
 URL:           http://curl.haxx.se/
 BuildRequires: autoconf >= 2.57
 BuildRequires: automake
@@ -33,10 +36,13 @@ BuildRequires:      automake
 %{?with_kerberos5:BuildRequires:       heimdal-devel}
 BuildRequires: libidn-devel >= 0.4.1
 %{?with_rtmp:BuildRequires:    librtmp-devel}
-%{?with_ssh:BuildRequires:     libssh2-devel >= 0.16}
+%{?with_ssh:BuildRequires:     libssh2-devel >= 1.2.8}
 BuildRequires: libtool
+BuildRequires: nettle-devel
 %{?with_ldap:BuildRequires:    openldap-devel}
 BuildRequires: pkgconfig
+BuildRequires: rpm >= 4.4.9-56
+BuildRequires: rpmbuild(macros) >= 1.453
 %if %{with ssl}
 %if %{with gnutls}
 BuildRequires: gnutls-devel
@@ -48,7 +54,7 @@ BuildRequires:        tar >= 1:1.22
 BuildRequires: zlib-devel
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      libidn >= 0.4.1
-%{?with_ssh:Requires:  libssh2 >= 0.16}
+%{?with_ssh:Requires:  libssh2 >= 1.2.8}
 Obsoletes:     libcurl2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -105,9 +111,9 @@ curl п╕дтриму╓ багато корисних можливостей,
 Summary:       curl library
 Summary(pl.UTF-8):     Biblioteka curl
 Group:         Libraries
+%{?with_ares:Requires: c-ares >= 1.7.0}
 Suggests:      ca-certificates
 Conflicts:     ca-certificates < 20080809-4
-%{?with_ares:Requires: c-ares >= 1.7.0}
 
 %description libs
 curl library.
@@ -127,7 +133,7 @@ Requires:   %{name}-libs = %{version}-%{release}
 %{?with_kerberos5:Requires:    heimdal-devel}
 Requires:      libidn-devel >= 0.4.1
 %{?with_rtmp:Requires: librtmp-devel}
-%{?with_ssh:Requires:  libssh2-devel >= 0.16}
+%{?with_ssh:Requires:  libssh2-devel >= 1.2.8}
 %{?with_ldap:Requires: openldap-devel}
 %if %{with ssl}
 %if %{with gnutls}
@@ -186,9 +192,8 @@ Bibliotecas estáticas para desenvolvimento com o curl.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+
+%{__rm} -v m4/lt*.m4 m4/libtool.m4
 
 %build
 %{__libtoolize}