commit deb3ecbf90224b483bc85def673f760836f76359
Author: Jakub Bogusz <[email protected]>
Date: Fri May 23 22:30:21 2014 +0200
- updated to 7.37.0
- removed obsolete http2 patch
curl-http2.patch | 11 -----------
curl.spec | 12 +++++-------
2 files changed, 5 insertions(+), 18 deletions(-)
---
diff --git a/curl.spec b/curl.spec
index c9eaeb5..aa5d5c2 100644
--- a/curl.spec
+++ b/curl.spec
@@ -22,15 +22,14 @@ Summary(pt_BR.UTF-8): Busca URL (suporta FTP, TELNET,
LDAP, GOPHER, DICT, HTTP e
Summary(ru.UTF-8): Утилита для получения файлов с серверов FTP, HTTP и
других
Summary(uk.UTF-8): Утиліта для отримання файлів з серверів FTP, HTTP та
інших
Name: curl
-Version: 7.36.0
+Version: 7.37.0
Release: 1
License: MIT-like
Group: Applications/Networking
Source0: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
-# Source0-md5: 291081121e604b04e0035bfdd736d196
+# Source0-md5: 54bfd1eb5214f604186d6f5ac61c7781
Patch0: %{name}-ac.patch
Patch1: %{name}-krb5flags.patch
-Patch2: %{name}-http2.patch
URL: http://curl.haxx.se/
BuildRequires: autoconf >= 2.57
BuildRequires: automake
@@ -42,7 +41,7 @@ BuildRequires: libidn-devel >= 0.4.1
%{?with_ssh:BuildRequires: libssh2-devel >= 1.2.8}
BuildRequires: libtool
BuildRequires: nettle-devel
-%{?with_http2:BuildRequires: nghttp2-devel >= 0.3}
+%{?with_http2:BuildRequires: nghttp2-devel >= 0.4}
%{?with_ldap:BuildRequires: openldap-devel}
BuildRequires: pkgconfig
BuildRequires: rpm >= 4.4.9-56
@@ -116,7 +115,7 @@ Summary(pl.UTF-8): Biblioteka curl
Group: Libraries
%{?with_ares:Requires: c-ares >= 1.7.0}
%{?with_ssh:Requires: libssh2 >= 1.2.8}
-%{?with_http2:Requires: nghttp2 >= 0.3}
+%{?with_http2:Requires: nghttp2 >= 0.4}
%if %{with ssl} && %{without gnutls}
Requires: openssl >= 1.0.1
%endif
@@ -142,7 +141,7 @@ Requires: %{name}-libs = %{version}-%{release}
Requires: libidn-devel >= 0.4.1
%{?with_rtmp:Requires: librtmp-devel}
%{?with_ssh:Requires: libssh2-devel >= 1.2.8}
-%{?with_http2:Requires: nghttp2-devel >= 0.3}
+%{?with_http2:Requires: nghttp2-devel >= 0.4}
%{?with_ldap:Requires: openldap-devel}
%if %{with ssl}
%if %{with gnutls}
@@ -201,7 +200,6 @@ використанням бібліотеки curl.
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
%{__rm} m4/lt*.m4 m4/libtool.m4
diff --git a/curl-http2.patch b/curl-http2.patch
deleted file mode 100644
index e1d596c..0000000
--- a/curl-http2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- curl-7.36.0/configure.ac.orig 2014-03-30 18:33:06.758735667 +0200
-+++ curl-7.36.0/configure.ac 2014-03-30 20:11:15.498488539 +0200
-@@ -2767,7 +2767,7 @@
- CLEANCPPFLAGS="$CPPFLAGS"
- CLEANLIBS="$LIBS"
-
-- h2pcdir=${want_h2_path}/lib/pkgconfig
-+ h2pcdir="${want_h2_path:+${want_h2_path}/lib${libsuff}/pkgconfig}"
- CURL_CHECK_PKGCONFIG(libnghttp2, $h2pcdir)
-
- if test "$PKGCONFIG" != "no" ; then
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/curl.git/commitdiff/deb3ecbf90224b483bc85def673f760836f76359
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
