diff --git a/curl-7.24.0.tar.lzma b/curl-7.24.0.tar.lzma deleted file mode 100644 index 9ea1396..0000000 --- a/curl-7.24.0.tar.lzma +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cd683ee8be137ed8a8e97d42fd3cc94f88f63d478b83d4abe38e31b6281e2268 -size 1973811 diff --git a/curl-7.25.0.tar.lzma b/curl-7.25.0.tar.lzma new file mode 100644 index 0000000..5ab7a0c --- /dev/null +++ b/curl-7.25.0.tar.lzma @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:efa900a1836ed2e287173fdb0b7bd187a310ce4f8df88ef0a7fa23586a287fa8 +size 1983323 diff --git a/curl-7.25.0.tar.lzma.asc b/curl-7.25.0.tar.lzma.asc new file mode 100644 index 0000000..e4f3bbd --- /dev/null +++ b/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----- diff --git a/curl.changes b/curl.changes index cd11a91..a3f0617 100644 --- a/curl.changes +++ b/curl.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sat May 12 23:24:56 UTC 2012 - jengelh@inai.de + +- Update to new upstream release 7.25.0 +* Added CURLOPT_TCP_KEEPALIVE, CURLOPT_TCP_KEEPIDLE, + CURLOPT_TCP_KEEPINTVL +* use new library-side TCP_KEEPALIVE options +* Added a new CURLOPT_MAIL_AUTH option +* Added support for --mail-auth +* (for more see the shipped CHANGES file) + ------------------------------------------------------------------- Wed Feb 8 00:45:18 UTC 2012 - crrodriguez@opensuse.org diff --git a/curl.spec b/curl.spec index e595e26..353292e 100644 --- a/curl.spec +++ b/curl.spec @@ -21,6 +21,17 @@ %bcond_without testsuite Name: curl +Version: 7.25.0 +Release: 0 +Summary: A Tool for Transferring Data from URLs +License: BSD-3-Clause ; MIT +Group: Productivity/Networking/Web/Utilities +Url: http://curl.haxx.se/ +Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma +Source2: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma.asc +Source3: baselibs.conf +Patch: libcurl-ocloexec.patch +Patch1: dont-mess-with-rpmoptflags.diff BuildRequires: libidn-devel BuildRequires: libtool BuildRequires: lzma @@ -34,29 +45,18 @@ BuildRequires: openssl-devel BuildRequires: mozilla-nss-devel %endif BuildRequires: krb5-devel +BuildRequires: libcares-devel BuildRequires: libssh2-devel BuildRequires: openssh -BuildRequires: libcares-devel %if 0%{?_with_stunnel:1} # used by the testsuite BuildRequires: stunnel %endif -Version: 7.24.0 -Release: 0 +BuildRoot: %{_tmppath}/%{name}-%{version}-build # bug437293 %ifarch ppc64 Obsoletes: curl-64bit %endif -# -Summary: A Tool for Transferring Data from URLs -License: BSD-3-Clause ; MIT -Group: Productivity/Networking/Web/Utilities -Url: http://curl.haxx.se/ -Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma -Source2: baselibs.conf -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Patch: libcurl-ocloexec.patch -Patch1: dont-mess-with-rpmoptflags.diff %description Curl is a client to get documents and files from or send documents to a @@ -75,7 +75,8 @@ network protocols. %package -n libcurl-devel Summary: A Tool for Transferring Data from URLs Group: Development/Libraries/C and C++ -Requires: libcurl4 = %{version} glibc-devel +Requires: glibc-devel +Requires: libcurl4 = %{version} # curl-devel (v 7.15.5) was last used in 10.2 Provides: curl-devel <= 7.15.5 Obsoletes: curl-devel < 7.16.2