Accepting request 286144 from home:pluskalm:branches:devel:libraries:c_c++

- Re-enable metalink supoort
- Use pkgconfig() style dependencies

OBS-URL: https://build.opensuse.org/request/show/286144
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/curl?expand=0&rev=123

curl.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Feb 14 18:29:37 UTC 2015 - mpluskal@suse.com
+
+- Re-enable metalink supoort
+- Use pkgconfig() style dependencies
+
 -------------------------------------------------------------------
 Thu Jan  8 09:55:11 UTC 2015 - vcizek@suse.com
 

curl.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package curl
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -34,17 +34,18 @@ Patch0:         libcurl-ocloexec.patch
 Patch1:         dont-mess-with-rpmoptflags.diff
 Patch3:         curl-secure-getenv.patch
 BuildRequires:  krb5-mini-devel
-BuildRequires:  libidn-devel
-BuildRequires:  libssh2-devel
 BuildRequires:  libtool
 BuildRequires:  lzma
 BuildRequires:  openldap2-devel
 BuildRequires:  pkg-config
-BuildRequires:  zlib-devel
+BuildRequires:  pkgconfig(libidn)
+BuildRequires:  pkgconfig(libmetalink)
+BuildRequires:  pkgconfig(libssh2)
+BuildRequires:  pkgconfig(zlib)
 Requires:       libcurl4 = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if %{with openssl}
-BuildRequires:  openssl-devel
+BuildRequires:  pkgconfig(libssl)
 %endif
 %if %{with mozilla_nss}
 BuildRequires:  mozilla-nss-devel
@@ -122,7 +123,8 @@ sed -i 's/link_all_deplibs=unknown/link_all_deplibs=no/' configure
 	--with-libssh2\
 	--enable-hidden-symbols \
 	--disable-static \
-    --enable-threaded-resolver
+	--enable-threaded-resolver \
+	--with-libmetalink
 
 : if this fails, the above sed hack did not work
 ./libtool --config | grep -q link_all_deplibs=no