From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sun, 21 Apr 2002 14:34:11 +0000 (+0000)
Subject: - changed amfix patch so it works now with libtool 1.4.2 and 1.4d
X-Git-Tag: lftp-2_5_2-1~1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Flftp.git;a=commitdiff_plain;h=eb63432983a24870a77a8b354e3185e46fe4a20d

- 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 c7a78bd..e9322d4 100644
--- 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 10de94f..eb1a38b 100644
--- 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