Automatic import for version 7.25.0

.abf.yml

@@ -1,2 +1,2 @@
 sources:
-  "curl-7.24.0.tar.lzma": 9c084d2d6094d3d38f5aef476d19d1b3cc1fc494
+  "curl-7.25.0.tar.lzma": 7c2f96fedc1e70043643130bfdc19d2a68e9baba

curl-7.15.3-multilib.patch

@@ -1,7 +1,6 @@
-diff -up curl-7.18.0/curl-config.in.multilib curl-7.18.0/curl-config.in
---- curl-7.18.0/curl-config.in.multilib	2008-01-10 23:14:02.000000000 +0100
-+++ curl-7.18.0/curl-config.in	2008-01-28 21:37:50.000000000 +0100
-@@ -72,7 +72,7 @@
+--- curl-7.25.0/curl-config.in.multilib~	2012-03-16 22:42:16.000000000 +0100
++++ curl-7.25.0/curl-config.in	2012-03-23 11:27:45.122955323 +0100
+@@ -74,7 +74,7 @@ while test $# -gt 0; do
  	;;
  
      --cc)
@@ -10,7 +9,7 @@ diff -up curl-7.18.0/curl-config.in.multilib curl-7.18.0/curl-config.in
  	;;
  
      --prefix)
-@@ -189,16 +189,7 @@
+@@ -136,16 +136,7 @@ while test $# -gt 0; do
         	;;
  
      --libs)
@@ -20,11 +19,11 @@ diff -up curl-7.18.0/curl-config.in.multilib curl-7.18.0/curl-config.in
 -	   CURLLIBDIR=""
 -	fi
 -	if test "X@REQUIRE_LIB_DEPS@" = "Xyes"; then
--	  echo ${CURLLIBDIR}-lcurl @LDFLAGS@ @LIBCURL_LIBS@ @LIBS@
+-	  echo ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@ @LIBS@
 -	else
--	  echo ${CURLLIBDIR}-lcurl @LDFLAGS@ @LIBS@
+-	  echo ${CURLLIBDIR}-lcurl @LIBS@
 -	fi
-+	pkg-config libcurl --libs
++        pkg-config libcurl --libs
  	;;
  
      --static-libs)

curl-7.24.0.tar.lzma.asc

@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.11 (GNU/Linux)
-
-iEYEABECAAYFAk8eczoACgkQeOEcayedXJFoKACfUI6eBzthDt9SaQHF+uqXUIVS
-ewEAoM1e4Cuwt8vjL/6m4sEZSaaJ0Jp+
-=SL4u
------END PGP SIGNATURE-----

curl-7.25.0.tar.lzma.asc

@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.12 (GNU/Linux)
+
+iEYEABECAAYFAk9rdKgACgkQeOEcayedXJHJSwCgowL8602Sm+9E8csiFLp9oGBh
++ocAnityiUk4N9GOgrT1YPD7K0GEnAp0
+=0cCc
+-----END PGP SIGNATURE-----

curl.spec

@@ -4,7 +4,7 @@
 
 Summary:	Gets a file from a FTP, GOPHER or HTTP server
 Name:		curl
-Version:	7.24.0
+Version:	7.25.0
 Release:	%mkrel 1
 Epoch:		1
 License:	BSD-like
@@ -79,9 +79,9 @@ Example files for %{name} development.
 
 %prep
 %setup -q
-%patch3 -p1
-%patch4 -p1
-%patch6 -p1
+%patch3 -p1 -b .privlib~
+%patch4 -p1 -b .multilib~
+%patch6 -p1 -b .examples~
 
 %build
 autoreconf -fiv
@@ -164,7 +164,11 @@ find %{buildroot} -name ca-bundle.crt -exec rm -f '{}' \;
 
 
 %changelog
-* Mon Feb 13 2012 Andrey Bondrov <abondrov@mandriva.org> 1:7.24.0-1mdv2012.0
+* Fri Mar 23 2012 Bernhard Rosenkraenzer <bero@bero.eu> 1:7.25.0-1mdv2012.0
++ Revision: 786368
+- 7.25.0
+
+* Mon Feb 13 2012 Andrey Bondrov <abondrov@mandriva.org> 1:7.24.0-1
 + Revision: 773770
 - New version 7.24.0