build with metalink support (added in 7.27.0)

diff --git a/curl.spec b/curl.spec
index 08505a1f8fa2527c238166effb9027cc09249b89..fd1352fe481d87a9aee7a278b72ffc010df5a3d8 100644 (file)
--- a/curl.spec
+++ b/curl.spec
@@ -4,6 +4,7 @@
 %bcond_without ssl             # without SSL support
 %bcond_without kerberos5       # without Heimdal Kerberos 5 support
 %bcond_without ldap            # without LDAP support
+%bcond_without metalink        # without metalink support
 %if "%{pld_release}" != "ac"
 %bcond_without ares            # with c-ares (asynchronous DNS operations) library
 %bcond_with    gnutls          # use GnuTLS instead of OpenSSL
@@ -29,12 +30,15 @@ Source0:    http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
 # Source0-md5: db5948f44e7ef3edbf9a7907af9556ac
 Patch0:                %{name}-ac.patch
 Patch1:                %{name}-krb5flags.patch
+# make the curl tool link SSL libraries also used by src/tool_metalink.c
+Patch2:                metalink.patch
 URL:           http://curl.haxx.se/
 BuildRequires: autoconf >= 2.57
 BuildRequires: automake
 %{?with_ares:BuildRequires:    c-ares-devel >= 1.7.0}
 %{?with_kerberos5:BuildRequires:       heimdal-devel}
 BuildRequires: libidn-devel >= 0.4.1
+%{?with_metalink:BuildRequires:        libmetalink-devel}
 %{?with_rtmp:BuildRequires:    librtmp-devel}
 %{?with_ssh:BuildRequires:     libssh2-devel >= 1.2.8}
 BuildRequires: libtool
@@ -213,16 +217,15 @@ Bibliotecas estáticas para desenvolvimento com o curl.
 %endif
        %{?with_kerberos5:--with-gssapi=%{_prefix}} \
        %{?with_rtmp:--with-librtmp} \
+       %{?with_metalink:--with-libmetalink} \
        %{?with_ares:--enable-ares} \
-       %{?with_ldap:--enable-ldaps} \
-       %{!?with_ldap:--disable-ldap} \
+       %{!?with_ldap:--disable-ldap}%{?with_ldap:--enable-ldaps} \
        --enable-ipv6
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 

diff --git a/metalink.patch b/metalink.patch
new file mode 100644 (file)
index 0000000..3bb0af7
--- /dev/null
+++ b/metalink.patch
@@ -0,0 +1,63 @@
+From 5a4feefe61733d7b650d6f6e1995a6d1555530d3 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka@redhat.com>
+Date: Wed, 26 Jun 2013 18:00:43 +0200
+Subject: [PATCH] make the curl tool link SSL libraries also used by src/tool_metalink.c
+
+---
+ configure    |   10 +++-------
+ configure.ac |   18 +++++++++++-------
+ 2 files changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/configure b/configure
+index a466175..cb63075 100755
+--- a/configure
++++ b/configure
+@@ -15495,13 +15495,9 @@ fi
+ 
+ 
+ 
+-# Determine whether all dependent libraries must be specified when linking
+-if test "X$enable_shared" = "Xyes" -a "X$link_all_deplibs" = "Xno"
+-then
+-    REQUIRE_LIB_DEPS=no
+-else
+-    REQUIRE_LIB_DEPS=yes
+-fi
++REQUIRE_LIB_DEPS=yes
++
++
+ 
+  if test x$REQUIRE_LIB_DEPS = xyes; then
+   USE_EXPLICIT_LIB_DEPS_TRUE=
+diff --git a/configure.ac b/configure.ac
+index 49309e6..90c56b5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -243,13 +243,17 @@ fi
+ AC_SUBST([CPPFLAG_CURL_STATICLIB])
+ 
+ 
+-# Determine whether all dependent libraries must be specified when linking
+-if test "X$enable_shared" = "Xyes" -a "X$link_all_deplibs" = "Xno"
+-then
+-    REQUIRE_LIB_DEPS=no
+-else
+-    REQUIRE_LIB_DEPS=yes
+-fi
++dnl make the curl tool link SSL libraries also used by src/tool_metalink.c
++REQUIRE_LIB_DEPS=yes
++
++dnl # Determine whether all dependent libraries must be specified when linking
++dnl if test "X$enable_shared" = "Xyes" -a "X$link_all_deplibs" = "Xno"
++dnl then
++dnl     REQUIRE_LIB_DEPS=no
++dnl else
++dnl     REQUIRE_LIB_DEPS=yes
++dnl fi
++
+ AC_SUBST(REQUIRE_LIB_DEPS)
+ AM_CONDITIONAL(USE_EXPLICIT_LIB_DEPS, test x$REQUIRE_LIB_DEPS = xyes)
+ 
+-- 
+1.7.1
+