[ncftp] Update to 3.2.5.

[Matthias Saou]

commit 9b7ce96eb70e116867f36d63e64f467d2b612e5b
Author: Matthias Saou <matthias at rpmforge.net>
Date:   Sat Feb 5 12:21:43 2011 +0100

    Update to 3.2.5.

 .gitignore             |    1 +
 ncftp-3.2.2-pref.patch |   12 ------------
 ncftp.spec             |   20 +++++++++++---------
 sources                |    2 +-
 4 files changed, 13 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e786fd4..942da0f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 ncftp-3.2.4-src.tar.bz2
+/ncftp-3.2.5-src.tar.bz2
diff --git a/ncftp.spec b/ncftp.spec
index 068e387..01f0ec4 100644
--- a/ncftp.spec
+++ b/ncftp.spec
@@ -1,6 +1,6 @@
 Summary: Improved console FTP client
 Name: ncftp
-Version: 3.2.4
+Version: 3.2.5
 Release: 1%{?dist}
 Epoch: 2
 License: Artistic clarified
@@ -8,10 +8,9 @@ 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-20061109b.diff.gz
-Patch1: ncftp-3.2.2-pref.patch
-Patch2: ncftp-3.0.3-resume.patch
-Patch3: ncftp-3.1.5-pmeter.patch
-Patch4: ncftp-3.2.3-ncursesw.patch
+Patch1: ncftp-3.0.3-resume.patch
+Patch2: ncftp-3.1.5-pmeter.patch
+Patch3: ncftp-3.2.3-ncursesw.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: ncurses-devel
 
@@ -24,10 +23,9 @@ anonymous logins, and more.
 %prep
 %setup -q
 #patch0 -p1 -b .ipv6
-%patch1 -p1 -b .pref
-%patch2 -p1 -b .res
-%patch3 -p1 -b .pmeter
-%patch4 -p1 -b .ncursesw
+%patch1 -p1 -b .res
+%patch2 -p1 -b .pmeter
+%patch3 -p1 -b .ncursesw
 
 
 %build
@@ -66,6 +64,10 @@ anonymous logins, and more.
 
 
 %changelog
+* Sat Feb  5 2011 Matthias Saou <http://freshrpms.net/> 2:3.2.5-1
+- Update to 3.2.5, live from FOSDEM.
+- Remove upstreamed pref patch.
+
 * Mon Apr 26 2010 Matthias Saou <http://freshrpms.net/> 2:3.2.4-1
 - Update to 3.2.4.
 
diff --git a/sources b/sources
index 4143a38..0eae715 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-216d6befdd7381b11ffdc8b6e0c1bd12  ncftp-3.2.4-src.tar.bz2
+b05c7a6d5269c04891f02f43d4312b30  ncftp-3.2.5-src.tar.bz2