rpms/ncftp/FC-5 .cvsignore, 1.3, 1.4 ncftp.spec, 1.8, 1.9 sources, 1.3, 1.4 ncftp-3.1.6-rh1.patch, 1.1, NONE ncftp-3.1.7-shell.patch, 1.1, NONE ncftp-3.1.9-dirlist.patch, 1.1, NONE

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/ncftp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9165/FC-5

Modified Files:
	.cvsignore ncftp.spec sources 
Removed Files:
	ncftp-3.1.6-rh1.patch ncftp-3.1.7-shell.patch 
	ncftp-3.1.9-dirlist.patch 
Log Message:
Backport 3.2.0 update from devel to FC-4 and FC-5.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ncftp/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 May 2005 18:56:41 -0000	1.3
+++ .cvsignore	23 Aug 2006 14:27:44 -0000	1.4
@@ -1,2 +1,2 @@
-ncftp-3.1.9-src.tar.bz2
-ncftp-319-v6-20050419.diff.gz
+ncftp-3.2.0-src.tar.bz2
+ncftp-320-v6-20060806.diff.gz


Index: ncftp.spec
===================================================================
RCS file: /cvs/extras/rpms/ncftp/FC-5/ncftp.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ncftp.spec	12 May 2006 11:15:16 -0000	1.8
+++ ncftp.spec	23 Aug 2006 14:27:44 -0000	1.9
@@ -1,21 +1,18 @@
 Summary: Improved console FTP client
 Name: ncftp
-Version: 3.1.9
-Release: 4%{?dist}
+Version: 3.2.0
+Release: 1%{?dist}
 Epoch: 2
 License: Distributable
 Group: Applications/Internet
 URL: http://www.ncftp.com/ncftp/
 Source: ftp://ftp.ncftp.com/ncftp/ncftp-%{version}-src.tar.bz2
+Patch0: ftp://ftp.kame.net/pub/kame/misc/ncftp-320-v6-20060806.diff.gz
 Patch1: ncftp-3.0.1-pref.patch
-Patch2: ncftp-3.1.7-shell.patch
-Patch3: ftp://ftp.kame.net/pub/kame/misc/ncftp-319-v6-20050419.diff.gz
-Patch4: ncftp-3.0.3-resume.patch
-Patch5: ncftp-3.1.5-pmeter.patch
-Patch6: ncftp-3.1.5-ncursesw.patch
-Patch7: ncftp-3.1.6-rh1.patch
-Patch8: ncftp-3.1.8-epsv.patch
-Patch9: ncftp-3.1.9-dirlist.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.1.8-epsv.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: ncurses-devel
 
@@ -27,15 +24,12 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .ipv6
 %patch1 -p0 -b .pref
-%patch2 -p1 -b .shell
-%patch3 -p1 -b .ipv6
-%patch4 -p1 -b .res
-%patch5 -p1 -b .pmeter
-%patch6 -p1 -b .ncursesw
-#patch7 -p1 -b .ask_save
-%patch8 -p1 -b .epsv
-%patch9 -p1 -b .dirlist
+%patch2 -p1 -b .res
+%patch3 -p1 -b .pmeter
+%patch4 -p1 -b .ncursesw
+%patch5 -p1 -b .epsv
 
 
 %build
@@ -73,6 +67,13 @@
 
 
 %changelog
+* Tue Aug 22 2006 Matthias Saou <http://freshrpms.net/> 2:3.2.0-1
+- Update to 3.2.0.
+- Update IPv6 patch to 320-v6-20060806.
+- Remove dirlist patch (merged upstream).
+- Remove rh1 (ask_save) patch, not applied for a while.
+- Remove shell patch (xclam args removed).
+
 * Fri May 12 2006 Matthias Saou <http://freshrpms.net/> 2:3.1.9-4
 - Include dirlist patch from Mike Gleason to fix bug #187605 reported by
   Lauri Nurmi when using fi_FI.UTF-8 locale.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ncftp/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 May 2005 18:56:41 -0000	1.3
+++ sources	23 Aug 2006 14:27:44 -0000	1.4
@@ -1,2 +1,2 @@
-66cf8dacec848eb11a70632fe9f21807  ncftp-3.1.9-src.tar.bz2
-8a696bf0e2dcd4e04309da630e993dfd  ncftp-319-v6-20050419.diff.gz
+384b7f01d725c89ccd30692628b3ac1b  ncftp-3.2.0-src.tar.bz2
+b8943ef660beac94f81969cd1bdf2476  ncftp-320-v6-20060806.diff.gz


--- ncftp-3.1.6-rh1.patch DELETED ---


--- ncftp-3.1.7-shell.patch DELETED ---


--- ncftp-3.1.9-dirlist.patch DELETED ---