[packages/lftp] - up to 4.8.2; pl.po patch needs update
arekm
arekm at pld-linux.org
Tue Sep 26 08:43:35 CEST 2017
commit 42656b3d5547d1fee012a5f44a5df87c53767dc8
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Tue Sep 26 08:43:29 2017 +0200
- up to 4.8.2; pl.po patch needs update
lftp-m4.patch | 19 ++++++++++---------
lftp.spec | 8 ++++----
2 files changed, 14 insertions(+), 13 deletions(-)
---
diff --git a/lftp.spec b/lftp.spec
index 924469c..af097e7 100644
--- a/lftp.spec
+++ b/lftp.spec
@@ -24,12 +24,12 @@ Summary(pl.UTF-8): Zaawansowany klient FTP/HTTP
Summary(pt_BR.UTF-8): Sofisticado programa de transferência de arquivos (cliente FTP/HTTP)
Summary(zh_CN.UTF-8): lftp 客户端程序
Name: lftp
-Version: 4.8.0
+Version: 4.8.2
Release: 1
License: GPL v3+
Group: Applications/Networking
Source0: https://lftp.yar.ru/ftp/%{name}-%{version}.tar.xz
-# Source0-md5: 468558412ad3575ef8e98547c41339f4
+# Source0-md5: 36f3ca2c070391282e0260dd6234af3b
Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-man-pages.tar.bz2
# Source1-md5: cdad8fb5342eebd9916eccefc98a855b
Source2: %{name}.desktop
@@ -49,7 +49,7 @@ BuildRequires: automake
BuildRequires: expat-devel
BuildRequires: gettext-tools >= 0.14.2
%{?with_gnutls:BuildRequires: gnutls-devel >= 1.2.5}
-BuildRequires: libidn-devel
+BuildRequires: libidn2-devel
BuildRequires: libstdc++-devel
BuildRequires: libtool >= 2:2
BuildRequires: ncurses-devel >= 5.2
@@ -93,7 +93,7 @@ o arquivo FEATURES para uma lista mais detalhada.
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
+#%patch3 -p1
%patch4 -p1
%{__rm} po/stamp-po
diff --git a/lftp-m4.patch b/lftp-m4.patch
index b3a2cf1..6add79e 100644
--- a/lftp-m4.patch
+++ b/lftp-m4.patch
@@ -25,11 +25,12 @@
elif test "$expat_requested" = "yes"; then
--- lftp-4.7.1/m4/ax_check_zlib.m4~ 2016-02-20 14:57:52.000000000 +0100
+++ lftp-4.7.1/m4/ax_check_zlib.m4 2016-04-08 23:22:04.957699442 +0200
-@@ -118,7 +118,6 @@ then
+@@ -119,8 +119,6 @@ then
# If both library and header were found, action-if-found
#
m4_ifblank([$1],[
-- LDFLAGS="$LDFLAGS -R${ZLIB_HOME}/lib"
+- test "$enable_rpath" = yes -a "$ZLIB_HOME" != /usr && \
+- LDFLAGS="$LDFLAGS -R${ZLIB_HOME}/lib"
LIBS="-lz $LIBS"
AC_DEFINE([HAVE_LIBZ], [1],
[Define to 1 if you have `z' library (-lz)])
@@ -53,22 +54,22 @@
CPPFLAGS="$CPPFLAGS -I$loc/include"
fi
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <openssl/ssl.h>
-@@ -21,7 +20,7 @@ AC_CACHE_VAL(lftp_cv_openssl,
- if test $found_loc != "none"; then
+@@ -21,7 +21,7 @@ AC_CACHE_VAL(lftp_cv_openssl,
lftp_cv_openssl="OPENSSL_LIBS=\"-lssl -lcrypto\""
if test $found_loc != default; then
-- lftp_cv_openssl="$lftp_cv_openssl OPENSSL_LDFLAGS=\"-L$found_loc/lib -R$found_loc/lib\""
-+ lftp_cv_openssl="$lftp_cv_openssl OPENSSL_LDFLAGS=\"-R$found_loc/lib\""
+ r=""; test "$enable_rpath" = yes -a "$found_loc" != /usr && r=" -R$found_loc/lib"
+- lftp_cv_openssl="$lftp_cv_openssl OPENSSL_LDFLAGS=\"-L$found_loc/lib$r\""
++ lftp_cv_openssl="$lftp_cv_openssl OPENSSL_LDFLAGS=\"$r\""
lftp_cv_openssl="$lftp_cv_openssl OPENSSL_CPPFLAGS=-I$found_loc/include"
fi
break;
--- lftp-4.7.1/configure.ac~ 2016-04-08 23:03:03.000000000 +0200
+++ lftp-4.7.1/configure.ac 2016-04-08 23:49:53.853139448 +0200
-@@ -306,7 +306,7 @@ fi
-
+@@ -307,7 +307,7 @@ fi
AX_CHECK_ZLIB([
AC_SUBST([ZLIB],[-lz])
-- AC_SUBST([ZLIB_LDFLAGS],["-L${ZLIB_HOME}/lib -R${ZLIB_HOME}/lib"])
+ r=""; test "$enable_rpath" = yes -a "$ZLIB_HOME" != /usr && r=" -R${ZLIB_HOME}/lib"
+- AC_SUBST([ZLIB_LDFLAGS],["-L${ZLIB_HOME}/lib$r"])
+ AC_SUBST([ZLIB_LDFLAGS],[""])
AC_SUBST([ZLIB_CPPFLAGS],["-I${ZLIB_HOME}/include"])
],[
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lftp.git/commitdiff/42656b3d5547d1fee012a5f44a5df87c53767dc8
More information about the pld-cvs-commit
mailing list