commit 677447689596c80bf823246c43c12b56439be37c
Author: Jakub Bogusz <[email protected]>
Date: Sat Jul 19 12:08:06 2014 +0200
- updated to 7.37.1
- updated krb5flags
curl-krb5flags.patch | 16 ++++++++--------
curl.spec | 5 +++--
2 files changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/curl.spec b/curl.spec
index aa5d5c2..3324608 100644
--- a/curl.spec
+++ b/curl.spec
@@ -22,12 +22,12 @@ 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.37.0
+Version: 7.37.1
Release: 1
License: MIT-like
Group: Applications/Networking
Source0: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
-# Source0-md5: 54bfd1eb5214f604186d6f5ac61c7781
+# Source0-md5: 71c313865ce687b0d3f05035fad4dfa5
Patch0: %{name}-ac.patch
Patch1: %{name}-krb5flags.patch
URL: http://curl.haxx.se/
@@ -267,6 +267,7 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/curl-config.1*
%{_mandir}/man3/curl_*.3*
%{_mandir}/man3/libcurl*.3*
+%{_mandir}/man3/CURLOPT_*.3*
%files static
%defattr(644,root,root,755)
diff --git a/curl-krb5flags.patch b/curl-krb5flags.patch
index 0d3afd6..b8a56e9 100644
--- a/curl-krb5flags.patch
+++ b/curl-krb5flags.patch
@@ -1,16 +1,16 @@
---- curl-7.29.0/configure.ac.orig 2013-02-15 15:38:22.912332897 +0100
-+++ curl-7.29.0/configure.ac 2013-02-15 15:47:10.498977423 +0100
-@@ -1336,7 +1336,7 @@
-
- if test -z "$GSSAPI_INCS"; then
- if test -f "$GSSAPI_ROOT/bin/krb5-config"; then
+--- curl-7.37.1/configure.ac.orig 2014-07-19 10:27:07.972697344 +0200
++++ curl-7.37.1/configure.ac 2014-07-19 10:28:38.279360218 +0200
+@@ -1212,7 +1212,7 @@
+ if test -n "$host_alias" -a -f
"$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then
+ GSSAPI_INCS=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --cflags gssapi`
+ elif test -f "$GSSAPI_ROOT/bin/krb5-config"; then
- GSSAPI_INCS=`$GSSAPI_ROOT/bin/krb5-config --cflags gssapi`
+ GSSAPI_INCS=`CFLAGS= $GSSAPI_ROOT/bin/krb5-config --cflags gssapi`
elif test "$GSSAPI_ROOT" != "yes"; then
GSSAPI_INCS="-I$GSSAPI_ROOT/include"
fi
-@@ -1424,7 +1424,7 @@
- if test -f "$GSSAPI_ROOT/bin/krb5-config"; then
+@@ -1311,7 +1311,7 @@
+ elif test -f "$GSSAPI_ROOT/bin/krb5-config"; then
dnl krb5-config doesn't have --libs-only-L or similar, put
everything
dnl into LIBS
- gss_libs=`$GSSAPI_ROOT/bin/krb5-config --libs gssapi`
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/curl.git/commitdiff/677447689596c80bf823246c43c12b56439be37c
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
