rpms/curl/devel curl-7.20.0-multilib.patch, NONE, 1.1 curl.spec, 1.150, 1.151 curl-7.15.3-multilib.patch, 1.7, NONE

[Kamil Dudka]

Author: kdudka

Update of /cvs/extras/rpms/curl/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv18803

Modified Files:
	curl.spec 
Added Files:
	curl-7.20.0-multilib.patch 
Removed Files:
	curl-7.15.3-multilib.patch 
Log Message:
- make curl-config multilib ready again (#584107)

curl-7.20.0-multilib.patch:
 b/curl-config.in |   22 ++++------------------
 libcurl.pc.in    |    1 +
 2 files changed, 5 insertions(+), 18 deletions(-)

--- NEW FILE curl-7.20.0-multilib.patch ---
 curl-config.in |   18 ++----------------
 1 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/curl-config.in b/curl-config.in
index ebda129..b404827 100644
--- a/curl-config.in
+++ b/curl-config.in
@@ -42,7 +42,6 @@ Available values for OPTION include:
   --libs      library linking information
   --prefix    curl install prefix
   --protocols newline separated list of enabled protocols
-  --static-libs static libcurl library linking information
   --version   output version information
   --vernum    output the version information as a number (hexadecimal)
 EOF
@@ -69,7 +68,7 @@ while test $# -gt 0; do
 	;;
 
     --cc)
-	echo "@CC@"
+	echo "gcc"
 	;;
 
     --prefix)
@@ -130,25 +129,12 @@ while test $# -gt 0; do
        	;;
 
     --libs)
-	if test "X at libdir@" != "X/usr/lib" -a "X at libdir@" != "X/usr/lib64"; then
-	   CURLLIBDIR="-L at libdir@ "
-	else
-	   CURLLIBDIR=""
-	fi
-	if test "X at REQUIRE_LIB_DEPS@" = "Xyes"; then
-	  echo ${CURLLIBDIR}-lcurl @LDFLAGS@ @LIBCURL_LIBS@ @LIBS@
-	else
-	  echo ${CURLLIBDIR}-lcurl @LDFLAGS@ @LIBS@
-	fi
-	;;
-
-    --static-libs)
-	echo @libdir@/libcurl. at libext@ @LDFLAGS@ @LIBCURL_LIBS@ @LIBS@
+	pkg-config libcurl --libs
 	;;
 
     --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/


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -p -r1.150 -r1.151
--- curl.spec	21 Apr 2010 18:52:00 -0000	1.150
+++ curl.spec	21 Apr 2010 19:09:46 -0000	1.151
@@ -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)
-Patch101: curl-7.15.3-multilib.patch
+# patch making libcurl multilib ready
+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 at redhat.com> 7.20.1-2
+* Wed Apr 21 2010 Kamil Dudka <kdudka at 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 at redhat.com> 7.20.1-1
 - new upstream release


--- curl-7.15.3-multilib.patch DELETED ---