- changed amfix patch so it works now with libtool 1.4.2 and 1.4d

  (BTW, is "Ugly hack" still needed?)

Changed files:
    lftp-amfix.patch -> 1.3
    lftp.spec -> 1.124

diff --git a/lftp-amfix.patch b/lftp-amfix.patch
index c7a78bd503e8ca272b016a0b7b5fa00c1776b2c9..e9322d429ec04ab2929c8042bb8442b9976fe9dd 100644 (file)
--- a/lftp-amfix.patch
+++ b/lftp-amfix.patch
@@ -34,9 +34,9 @@
 -lftp.o commands.o module.o: confpaths.h
 +lftp.lo commands.lo module.lo: confpaths.h
 +libtasks.a: libtasks.la
-+      ln -sf .libs/libtasks.al libtasks.a
++      ln -sf .libs/libtasks.a* libtasks.a
 +libjobs.a: libjobs.la
-+      ln -sf .libs/libjobs.al libjobs.a
++      ln -sf .libs/libjobs.a* libjobs.a
  
  # libtool does not strip modules, do it here.
  install-lib-local:

diff --git a/lftp.spec b/lftp.spec
index 10de94f26cacc8404ad45a895e6e377fe6953444..eb1a38b780bed80040599e08e72aa843a2a91def 100644 (file)
--- a/lftp.spec
+++ b/lftp.spec
@@ -17,15 +17,15 @@ Patch0:             %{name}-m4.patch
 Patch1:                %{name}-amfix.patch
 Icon:          ftp.gif
 URL:           http://lftp.yar.ru/
-BuildRequires: ncurses-devel >= 5.2
-BuildRequires: readline-devel >= 4.2
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: libtool
 BuildRequires: gettext-devel
 BuildRequires: gcc-c++
 BuildRequires: libstdc++-devel
-%{!??_without_ssl:BuildRequires:       openssl-devel >= 0.9.6a}
+BuildRequires: libtool
+BuildRequires: ncurses-devel >= 5.2
+%{!?_without_ssl:BuildRequires:        openssl-devel >= 0.9.6a}
+BuildRequires: readline-devel >= 4.2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description