rpms/curl/F-13 curl-7.20.0-multilib.patch, NONE, 1.1 curl.spec, 1.143, 1.144 curl-7.15.3-multilib.patch, 1.6, NONE

[Kamil Dudka]

Author: kdudka

Update of /cvs/extras/rpms/curl/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv21227

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:
 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 |   22 ++++------------------
 libcurl.pc.in  |    1 +
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/curl-config.in b/curl-config.in
index d336999..77c75e1 100644
--- a/curl-config.in
+++ b/curl-config.in
@@ -43,7 +43,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
@@ -70,7 +69,7 @@ while test $# -gt 0; do
 	;;
 
     --cc)
-	echo "@CC@"
+	echo "gcc"
 	;;
 
     --prefix)
@@ -131,25 +130,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"
diff --git a/libcurl.pc.in b/libcurl.pc.in
index b765994..e98c6b2 100644
--- a/libcurl.pc.in
+++ b/libcurl.pc.in
@@ -30,6 +30,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/F-13/curl.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -p -r1.143 -r1.144
--- curl.spec	7 Apr 2010 17:03:16 -0000	1.143
+++ curl.spec	21 Apr 2010 19:20:22 -0000	1.144
@@ -1,7 +1,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.20.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
@@ -19,8 +19,8 @@ Patch2: curl-7.20.0-ff87111.patch
 # bz #565972
 Patch3: curl-7.20.0-ef1ac36.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
@@ -148,6 +148,10 @@ sed -i s/899\\\([0-9]\\\)/%{?__isa_bits}
 	--enable-ldaps --disable-static --with-libssh2 --enable-manual --enable-ares
 sed -i -e 's,-L/usr/lib ,,g;s,-L/usr/lib64 ,,g;s,-L/usr/lib$,,g;s,-L/usr/lib64$,,g' \
 	Makefile libcurl.pc
+
+# uncomment to turn off optimizations
+# find -name Makefile | xargs sed -i 's/-O2/-O0/'
+
 # Remove bogus rpath
 sed -i \
 	-e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
@@ -156,7 +160,8 @@ sed -i \
 make %{?_smp_mflags}
 
 %check
-export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
+LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
+export LD_LIBRARY_PATH
 cd tests
 make %{?_smp_mflags}
 
@@ -221,6 +226,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Wed Apr 21 2010 Kamil Dudka <kdudka at redhat.com> 7.20.0-4
+- make curl-config multilib ready again (#584107)
+
 * Wed Apr 07 2010 Kamil Dudka <kdudka at redhat.com> 7.20.0-3
 - add missing quote in libcurl.m4 (#576252)
 - throw CURLE_SSL_CERTPROBLEM in case peer rejects a certificate (#565972)


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