- version 2.3.10

- readline-patch updated
- OMIT-patch added - remove OMMIT-DEPENDENCES
NFY: proto-ftp and proto-http shared libraries are made with .soU extension

Changed files:
    lftp-readline.patch -> 1.2
    lftp.spec -> 1.93

diff --git a/lftp-readline.patch b/lftp-readline.patch
index c316b2a0c58949129c7bd901a4996520ff8e6e91..05bb82d932910de0da836fe1f1d5ff85fed4dd7e 100644 (file)
--- a/lftp-readline.patch
+++ b/lftp-readline.patch
@@ -1,8 +1,11 @@
---- lftp-2.3.9.orig/src/complete.cc    Fri Dec  8 16:30:37 2000
-+++ lftp-2.3.9/src/complete.cc Sat Apr 14 05:38:44 2001
-@@ -39,7 +39,11 @@
+--- ./src/complete.cc.orig     Mon May 14 20:59:10 2001
++++ ./src/complete.cc  Mon May 14 22:13:26 2001
+@@ -38,8 +38,14 @@
+ #include "lftp_rl.h"
  #include "url.h"
  
++#include <ctype.h>
++
  CDECL_BEGIN
 +#undef __P
 +#define __P(args) args
@@ -12,21 +15,20 @@
  CDECL_END
  
  static char *bash_dequote_filename (char *text, int quote_char);
-@@ -575,7 +579,7 @@
-    text=bash_dequote_filename(text, quoted);
-    len=strlen(text);
+@@ -577,7 +583,7 @@
+    textq=bash_dequote_filename(textq, quoted);
+    len=strlen(textq);
  
--   char **matches=completion_matches(text,(CPFunction*)generator);
-+   char **matches=rl_completion_matches(text,(CPFunction*)generator);
+-   char **matches=lftp_rl_completion_matches(textq,generator);
++   char **matches=rl_completion_matches(textq,generator);
  
     glob_res=0;
     if(rg)
-@@ -952,8 +956,6 @@
+@@ -952,7 +958,6 @@
+   return (0);
+ }
  
- int   lftp_complete_remote(int count,int key)
+-extern "C" int (*rl_last_func)(int,int);
+ static int lftp_complete_remote(int count,int key)
  {
--   extern Function *rl_last_func;
--
-    if(rl_last_func == (Function*)lftp_complete_remote)
-       rl_last_func = (Function*)rl_complete;
  

diff --git a/lftp.spec b/lftp.spec
index 61fa334eaaacb5cb3ad5576c1122d183cac96823..f0ff40f3810c560fb0b8d7978a2ed16792a088ac 100644 (file)
--- a/lftp.spec
+++ b/lftp.spec
@@ -5,8 +5,8 @@
 Summary:       Commandline ftp client
 Summary(pl):   Zaawansowany klient ftp
 Name:          lftp
-Version:       2.3.9
-Release:       4
+Version:       2.3.10
+Release:       1
 License:       GPL
 Group:         Applications/Networking
 Group(de):     Applikationen/Netzwerkwesen
@@ -15,6 +15,7 @@ Source0:      ftp://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/%{name}-%
 Patch0:                %{name}-am14_fix.patch
 Patch1:                %{name}-use_system_gettext.m4.patch
 Patch2:                %{name}-readline.patch
+Patch3:                %{name}-OMIT.patch
 Icon:          ftp.gif
 URL:           http://ftp.yars.free.net/projects/lftp/
 BuildRequires: ncurses-devel >= 5.2
@@ -44,9 +45,10 @@ do mirrorowania serwer
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
+#%patch0 -p1
+#%patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 libtoolize --copy --force
@@ -56,6 +58,7 @@ autoconf
 automake -a -c
 CXXFLAGS="%{rpmcflags} -fno-rtti -fno-exceptions -fno-implicit-templates"
 %configure \
+       --enable-shared=ftp
        --with-modules \
        --with%{?bcond_off_ssl:out}-ssl
 %{__make}
@@ -68,7 +71,7 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}
 
 install lftp.conf $RPM_BUILD_ROOT%{_sysconfdir}
 
-gzip -9nf README NEWS
+gzip -9nf README NEWS FAQ
 
 %find_lang %{name}