- up to 4.8.0

diff --git a/lftp-m4.patch b/lftp-m4.patch
index c6f6b02a33ee74284a2358337bfc17785802865d..b3a2cf1335a8ff8720c2470448b0104a0d43e54e 100644 (file)
--- a/lftp-m4.patch
+++ b/lftp-m4.patch
@@ -25,19 +25,11 @@
      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
-@@ -105,7 +105,6 @@ then
-   ZLIB_OLD_LDFLAGS=$LDFLAGS
-   ZLIB_OLD_CPPFLAGS=$CPPFLAGS
-   if test -n "${ZLIB_HOME}"; then
--        LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib"
-         CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include"
-   fi
-   AC_LANG_SAVE
-@@ -120,7 +119,6 @@ then
+@@ -118,7 +118,6 @@ then
+     # If both library and header were found, action-if-found
      #
      m4_ifblank([$1],[
-                 CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include"
--                LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib"
+-              LDFLAGS="$LDFLAGS -R${ZLIB_HOME}/lib"
                  LIBS="-lz $LIBS"
                  AC_DEFINE([HAVE_LIBZ], [1],
                            [Define to 1 if you have `z' library (-lz)])
@@ -76,8 +68,9 @@
  
  AX_CHECK_ZLIB([
     AC_SUBST([ZLIB],[-lz])
--   AC_SUBST([ZLIB_LDFLAGS],["-L${ZLIB_HOME}/lib"])
+-   AC_SUBST([ZLIB_LDFLAGS],["-L${ZLIB_HOME}/lib -R${ZLIB_HOME}/lib"])
 +   AC_SUBST([ZLIB_LDFLAGS],[""])
     AC_SUBST([ZLIB_CPPFLAGS],["-I${ZLIB_HOME}/include"])
  ],[
     AC_MSG_ERROR([cannot find -lz library, install zlib-devel package])
+

diff --git a/lftp.spec b/lftp.spec
index 33be8718ffec0ebd0e4dae03a0d0e2a892696fb2..e2a6d68819c840d7a68975d3b79fc0aa0214bb9c 100644 (file)
--- 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.7.7
+Version:       4.8.0
 Release:       1
 License:       GPL v3+
 Group:         Applications/Networking
 Source0:       https://lftp.yar.ru/ftp/%{name}-%{version}.tar.xz
-# Source0-md5: 1e84dd802bdd4d1be15b8dac9fc9c697
+# Source0-md5: 468558412ad3575ef8e98547c41339f4
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-man-pages.tar.bz2
 # Source1-md5: cdad8fb5342eebd9916eccefc98a855b
 Source2:       %{name}.desktop