- readline patch, changed modules path, removed unnecesary lines

- BuildRequires: gcc-c++

Changed files:
    lftp-readline.patch -> 1.1
    lftp.spec -> 1.87

diff --git a/lftp-readline.patch b/lftp-readline.patch
new file mode 100644 (file)
index 0000000..c316b2a
--- /dev/null
+++ b/lftp-readline.patch
@@ -0,0 +1,32 @@
+--- 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 @@
+ #include "url.h"
+ 
+ CDECL_BEGIN
++#undef __P
++#define __P(args) args
+ #include "readline/readline.h"
++#undef __P
++#define __P(args) args __THROW
+ 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);
+ 
+-   char **matches=completion_matches(text,(CPFunction*)generator);
++   char **matches=rl_completion_matches(text,(CPFunction*)generator);
+ 
+    glob_res=0;
+    if(rg)
+@@ -952,8 +956,6 @@
+ 
+ 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 df77dad423c0c65f47830284f2d55f82c8888442..7ce1c366d780caf4a381bb1554f638b6ee4ce8bf 100644 (file)
--- a/lftp.spec
+++ b/lftp.spec
@@ -10,6 +10,7 @@ Group(pl):    Aplikacje/Sieciowe
 Source0:       ftp://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/%{name}-%{version}.tar.bz2
 Patch0:                %{name}-am14_fix.patch
 Patch1:                %{name}-use_system_gettext.m4.patch
+Patch2:                %{name}-readline.patch
 Icon:          ftp.gif
 URL:           http://ftp.yars.free.net/projects/lftp/
 BuildRequires: ncurses-devel >= 5.2
@@ -17,8 +18,6 @@ BuildRequires:        readline-devel >= 4.2
 BuildRequires: gettext-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _sysconfdir     /etc
-
 %description
 LFTP is a shell-like command line ftp client. The main two advantages
 over other ftp clients are reliability and ability to perform tasks in
@@ -41,6 +40,7 @@ do mirrorowania serwer
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 gettextize --copy --force
@@ -60,8 +60,6 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}
 
 install lftp.conf $RPM_BUILD_ROOT%{_sysconfdir}
 
-chmod +x $RPM_BUILD_ROOT%{_libdir}/lftp/*
-
 gzip -9nf README NEWS
 
 %find_lang %{name}
@@ -78,4 +76,5 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_datadir}/lftp
 
 %dir %{_libdir}/lftp
-%attr(755,root,root) %{_libdir}/lftp/*.so
+%dir %{_libdir}/lftp/%{version}
+%attr(755,root,root) %{_libdir}/lftp/%{version}/*.so