diff --git a/.cvsignore b/.cvsignore index 2f04cee..1162a3a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -2,3 +2,4 @@ curl-7.15.4.tar.bz2 curl-7.15.5.tar.bz2 curl-7.16.0.tar.bz2 curl-7.16.1.tar.bz2 +curl-7.16.2.tar.bz2 diff --git a/curl-7.15.3-multilib.patch b/curl-7.15.3-multilib.patch index 8650913..8775a89 100644 --- a/curl-7.15.3-multilib.patch +++ b/curl-7.15.3-multilib.patch @@ -1,6 +1,6 @@ ---- curl-7.15.1/curl-config.in.pom 2005-09-04 20:15:24.000000000 +0200 -+++ curl-7.15.1/curl-config.in 2006-03-20 14:12:04.485640816 +0100 -@@ -50,7 +50,7 @@ +--- curl-7.16.2/curl-config.in.multilib 2007-02-18 10:41:27.000000000 +0100 ++++ curl-7.16.2/curl-config.in 2007-04-11 20:00:16.000000000 +0200 +@@ -71,7 +71,7 @@ ;; --cc) @@ -9,12 +9,21 @@ ;; --prefix) -@@ -143,7 +143,7 @@ +@@ -181,16 +181,7 @@ ;; --libs) -- echo -L@libdir@ -lcurl @LDFLAGS@ @LIBS@ -+ pkg-config libcurl --libs - ;; +- if test "X@libdir@" != "X/usr/lib"; then +- CURLLIBDIR="-L@libdir@ " +- else +- CURLLIBDIR="" +- fi +- if test "X@REQUIRE_LIB_DEPS@" = "Xyes"; then +- echo ${CURLLIBDIR}-lcurl @LDFLAGS@ @LIBCURL_LIBS@ @LIBS@ +- else +- echo ${CURLLIBDIR}-lcurl @LDFLAGS@ @LIBS@ +- fi ++ pkg-config libcurl --libs + ;; *) diff --git a/curl-7.16.0-privlibs.patch b/curl-7.16.0-privlibs.patch index e0f5fbb..f3d2ece 100644 --- a/curl-7.16.0-privlibs.patch +++ b/curl-7.16.0-privlibs.patch @@ -1,11 +1,11 @@ ---- curl-7.16.1/libcurl.pc.in.privlibs 2007-01-02 13:14:21.000000000 +0100 -+++ curl-7.16.1/libcurl.pc.in 2007-01-29 17:20:50.000000000 +0100 +--- curl-7.16.2/libcurl.pc.in.privlibs 2007-02-18 10:41:27.000000000 +0100 ++++ curl-7.16.2/libcurl.pc.in 2007-04-11 20:02:34.000000000 +0200 @@ -33,6 +33,6 @@ URL: http://curl.haxx.se/ Description: Library to transfer files with ftp, http, etc. Version: @VERSION@ --Libs: -L${libdir} -lcurl @LDFLAGS@ --Libs.private: @LIBS@ +-Libs: -L${libdir} -lcurl @LDFLAGS@ @LIBS@ +-Libs.private: @LIBCURL_LIBS@ @LIBS@ +Libs: -L${libdir} -lcurl -+Libs.private: @LDFLAGS@ @LIBS@ ++Libs.private: @LIBCURL_LIBS@ @LIBS@ @LDFLAGS@ Cflags: -I${includedir} diff --git a/curl.spec b/curl.spec index 49101d8..2f4d644 100644 --- a/curl.spec +++ b/curl.spec @@ -2,8 +2,8 @@ Summary: A utility for getting files from remote servers (FTP, HTTP, and others) Name: curl -Version: 7.16.1 -Release: 3%{?dist} +Version: 7.16.2 +Release: 1%{?dist} License: MIT Group: Applications/Internet Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2 @@ -96,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* Wed Apr 11 2007 Jindrich Novy 7.16.2-1 +- update to 7.16.2 + * Mon Feb 19 2007 Jindrich Novy 7.16.1-3 - don't create/ship static libraries (#225671) diff --git a/sources b/sources index 0c1b1ec..c964dd7 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ acdab0b0467c55e10ed02d2afed80575 curl-7.16.1.tar.bz2 +37a1de15c4300ca9413d39d2bcea9b36 curl-7.16.2.tar.bz2