rpms/ncftp/EL-6 ncftp-3.2.3-ncursesw.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 ncftp.spec, 1.17, 1.18 sources, 1.7, 1.8 ncftp-3.1.5-ncursesw.patch, 1.1, NONE ncftp-3.2.2-no_lfs64_source.patch, 1.1, NONE

[Matthias Saou]

Author: thias

Update of /cvs/extras/rpms/ncftp/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv1891

Modified Files:
	.cvsignore ncftp.spec sources 
Added Files:
	ncftp-3.2.3-ncursesw.patch 
Removed Files:
	ncftp-3.1.5-ncursesw.patch ncftp-3.2.2-no_lfs64_source.patch 
Log Message:
Update to 3.2.4.


ncftp-3.2.3-ncursesw.patch:
 autoconf_local/aclocal.m4 |    4 ++--
 configure                 |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE ncftp-3.2.3-ncursesw.patch ---
diff -Naupr ncftp-3.2.3.orig/autoconf_local/aclocal.m4 ncftp-3.2.3/autoconf_local/aclocal.m4
--- ncftp-3.2.3.orig/autoconf_local/aclocal.m4	2009-07-28 16:45:58.000000000 +0200
+++ ncftp-3.2.3/autoconf_local/aclocal.m4	2009-12-08 17:06:12.854319959 +0100
@@ -4632,7 +4632,7 @@ AC_MSG_CHECKING([for curses library])
 wi_cv_lib_curses=no
 wi_cv_lib_curses_result=no
 ac_save_LIBS="$LIBS"
-for LIBCURSES in "-lncurses" "-lcurses" "-lcurses -ltermcap" "-ltermcap -lcurses"
+for LIBCURSES in "-lncursesw" "-lncurses" "-lcurses" "-lcurses -ltermcap" "-ltermcap -lcurses"
 do
 	if test "x$LIBCURSES-$wi_cv_ncurses" = "x-lncurses-no" ; then
 		# This should never work
@@ -4705,7 +4705,7 @@ LIBS="$ac_save_LIBS"
 
 if test "$wi_cv_lib_curses_result" != "no" ; then
 	case "$LIBCURSES" in
-		"-lncurses")
+		"-lncurses*")
 			AC_DEFINE(HAVE_LIBNCURSES)
 			;;
 		"-lcurses")
diff -Naupr ncftp-3.2.3.orig/configure ncftp-3.2.3/configure
--- ncftp-3.2.3.orig/configure	2009-07-28 17:01:30.000000000 +0200
+++ ncftp-3.2.3/configure	2009-12-08 17:06:34.850195005 +0100
@@ -5105,7 +5105,7 @@ echo "configure:5104: checking for curse
 wi_cv_lib_curses=no
 wi_cv_lib_curses_result=no
 ac_save_LIBS="$LIBS"
-for LIBCURSES in "-lncurses" "-lcurses" "-lcurses -ltermcap" "-ltermcap -lcurses"
+for LIBCURSES in "-lncursesw" "-lncurses" "-lcurses" "-lcurses -ltermcap" "-ltermcap -lcurses"
 do
 	if test "x$LIBCURSES-$wi_cv_ncurses" = "x-lncurses-no" ; then
 		# This should never work


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ncftp/EL-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	29 Aug 2008 19:11:09 -0000	1.7
+++ .cvsignore	8 Jul 2010 09:08:01 -0000	1.8
@@ -1 +1 @@
-ncftp-3.2.2-src.tar.bz2
+ncftp-3.2.4-src.tar.bz2


Index: ncftp.spec
===================================================================
RCS file: /cvs/extras/rpms/ncftp/EL-6/ncftp.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- ncftp.spec	25 Jul 2009 15:51:00 -0000	1.17
+++ ncftp.spec	8 Jul 2010 09:08:01 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Improved console FTP client
 Name: ncftp
-Version: 3.2.2
-Release: 3%{?dist}
+Version: 3.2.4
+Release: 1%{?dist}
 Epoch: 2
 License: Artistic clarified
 Group: Applications/Internet
@@ -11,8 +11,7 @@ Source: ftp://ftp.ncftp.com/ncftp/ncftp-
 Patch1: ncftp-3.2.2-pref.patch
 Patch2: ncftp-3.0.3-resume.patch
 Patch3: ncftp-3.1.5-pmeter.patch
-Patch4: ncftp-3.1.5-ncursesw.patch
-Patch5: ncftp-3.2.2-no_lfs64_source.patch
+Patch4: ncftp-3.2.3-ncursesw.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: ncurses-devel
 
@@ -29,7 +28,6 @@ anonymous logins, and more.
 %patch2 -p1 -b .res
 %patch3 -p1 -b .pmeter
 %patch4 -p1 -b .ncursesw
-%patch5 -p0 -b .no_lfs64_source
 
 
 %build
@@ -68,6 +66,14 @@ anonymous logins, and more.
 
 
 %changelog
+* Mon Apr 26 2010 Matthias Saou <http://freshrpms.net/> 2:3.2.4-1
+- Update to 3.2.4.
+
+* Tue Dec  8 2009 Matthias Saou <http://freshrpms.net/> 2:3.2.3-1
+- Update to 3.2.3.
+- Rebase the ncursesw patch.
+- Remove no longer required no_lfs64_source patch.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2:3.2.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ncftp/EL-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	29 Aug 2008 19:11:09 -0000	1.7
+++ sources	8 Jul 2010 09:08:01 -0000	1.8
@@ -1 +1 @@
-c33da134e5e53b5a3b340e0de5456137  ncftp-3.2.2-src.tar.bz2
+216d6befdd7381b11ffdc8b6e0c1bd12  ncftp-3.2.4-src.tar.bz2


--- ncftp-3.1.5-ncursesw.patch DELETED ---


--- ncftp-3.2.2-no_lfs64_source.patch DELETED ---