- make curl-config multilib ready again (#584107)

curl-7.20.0-multilib.patch

@@ -22,7 +22,7 @@ index ebda129..b404827 100644
  	;;
  
      --prefix)
-@@ -130,20 +129,7 @@ while test $# -gt 0; do
+@@ -130,25 +129,12 @@ while test $# -gt 0; do
         	;;
  
      --libs)
@@ -44,3 +44,20 @@ index ebda129..b404827 100644
  	;;
  
      --configure)
+-      echo @CONFIGURE_OPTIONS@
+-    ;;
++	pkg-config libcurl --variable=configure_options | sed 's/^"//;s/"$//'
++	;;
+ 
+     *)
+         echo "unknown option: $1"
+--- a/libcurl.pc.in
++++ b/libcurl.pc.in
+@@ -29,6 +29,7 @@ libdir=@libdir@
+ includedir=@includedir@
+ supported_protocols="@SUPPORT_PROTOCOLS@"
+ supported_features="@SUPPORT_FEATURES@"
++configure_options=@CONFIGURE_OPTIONS@
+ 
+ Name: libcurl
+ URL: http://curl.haxx.se/

curl.spec

@@ -13,8 +13,8 @@ Patch0: curl-7.20.0-e32fe30.patch
 # experimentally enabled threaded DNS lookup
 Patch1: curl-7.20.1-threaded-dns-multi.patch
 
-# patch making libcurl multilib ready (by excluding static libraries)
+# patch making libcurl multilib ready
-Patch101: curl-7.15.3-multilib.patch
+Patch101: curl-7.20.0-multilib.patch
 
 # force -lrt when linking the curl tool and test-cases
 Patch102: curl-7.20.0-lrt.patch
@@ -215,8 +215,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
-* Tue Apr 20 2010 Kamil Dudka <kdudka@redhat.com> 7.20.1-2
+* Wed Apr 21 2010 Kamil Dudka <kdudka@redhat.com> 7.20.1-2
 - experimentally enabled threaded DNS lookup
+- make curl-config multilib ready again (#584107)
 
 * Mon Apr 19 2010 Kamil Dudka <kdudka@redhat.com> 7.20.1-1
 - new upstream release