rpms/ncftp/devel ncftp.spec,1.3,1.4

[Tom Callaway (spot)]

Author: spot

Update of /cvs/extras/rpms/ncftp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4985

Modified Files:
	ncftp.spec 
Log Message:

Reverting my inadvertant squash... sorry Matthias.



Index: ncftp.spec
===================================================================
RCS file: /cvs/extras/rpms/ncftp/devel/ncftp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ncftp.spec	18 Apr 2005 18:40:38 -0000	1.3
+++ ncftp.spec	18 Apr 2005 18:51:25 -0000	1.4
@@ -1,11 +1,12 @@
-Summary: An improved FTP client.
+Summary: Improved console FTP client
 Name: ncftp
 Version: 3.1.8
-Epoch: 2
 Release: 5
+Epoch: 2
 License: Distributable
 Group: Applications/Internet
-Source0: ftp://ftp.ncftp.com/ncftp/ncftp-%{version}-src.tar.bz2
+URL: http://www.ncftp.com/ncftp/
+Source: ftp://ftp.ncftp.com/ncftp/ncftp-%{version}-src.tar.bz2
 Patch1: ncftp-3.0.1-pref.patch
 Patch2: ncftp-3.1.7-shell.patch
 Patch3: ftp://ftp.kame.net/pub/kame/misc/ncftp-3181-v6-20040826.diff.gz
@@ -13,44 +14,45 @@
 Patch5: ncftp-3.1.5-pmeter.patch
 Patch6: ncftp-3.1.5-ncursesw.patch
 Patch7: ncftp-3.1.6-rh1.patch
-BuildRoot: /var/tmp/%{name}-root
-BuildRequires: ncurses-devel glibc-devel gcc
-URL: http://www.ncftp.com/ncftp/
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires: ncurses-devel
 
 %description
 Ncftp is an improved FTP client. Ncftp's improvements include support
 for command line editing, command histories, recursive gets, automatic
 anonymous logins, and more.
 
+
 %prep
 %setup -q
 %patch1 -p0 -b .pref
-%patch2 -p1
+%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
 
+
 %build
 %configure --enable-signals --enable-ipv6
 make STRIPFLAG=""
 rm -f README.v6.ipv6
 
-%install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT{/usr/bin,%{_mandir}/man1}
 
-%makeinstall BINDIR=$RPM_BUILD_ROOT/usr/bin
+%install
+rm -rf %{buildroot}
+mkdir -p %{buildroot}{%{_bindir},%{_mandir}/man1}
+%makeinstall BINDIR=%{buildroot}%{_bindir}
 
-mkdir -p $RPM_BUILD_ROOT/etc/X11/applnk/Internet
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+
 
 %files
-%defattr(-,root,root)
-%doc README* doc
+%defattr(-,root,root,0755)
+%doc README* doc/*.txt doc/html/
 %{_bindir}/ncftp
 %{_bindir}/ncftpget
 %{_bindir}/ncftpput
@@ -65,9 +67,12 @@
 %{_mandir}/man1/ncftpls.1*
 %{_mandir}/man1/ncftpspooler.1*
 
+
 %changelog
-* Mon Apr 18 2005 Tom "spot" Callaway <tcallawa at redhat.com> 2:3.1.8-5
-- moved to extras, minor spec cleanup
+* Sat Mar  5 2005 Matthias Saou <http://freshrpms.net/> 2:3.1.8-5
+- Spec file cleanup.
+- Remove man pages from docs.
+- Update summary.
 
 * Wed Mar 02 2005 Karsten Hopp <karsten at redhat.de> 2:3.1.8-4
 - build with gcc-4
@@ -75,10 +80,10 @@
 * Wed Feb 09 2005 Karsten Hopp <karsten at redhat.de> 2:3.1.8-3
 - rebuilt
 
-* Thu Aug 26 2004 Karsten Hopp <karsten at redhat.de> 3.1.8-2 
+* Thu Aug 26 2004 Karsten Hopp <karsten at redhat.de> 3.1.8-2
 - new upstream ipv6 patch, enable ipv6 again
 
-* Mon Aug 09 2004 Karsten Hopp <karsten at redhat.de> 3.1.8-1 
+* Mon Aug 09 2004 Karsten Hopp <karsten at redhat.de> 3.1.8-1
 - update to version 3.1.8
 - new ipv6 patch, but currently disabled due to problems with active-ftp
   (#127553)
@@ -86,8 +91,9 @@
 * Wed Jul 07 2004 Karsten Hopp <karsten at redhat.de> 2:3.1.7-5
 - rebuild with new gcc
 
-* Mon Jul 05 2004 Karsten Hopp <karsten at redhat.de> 3.1.7-4 
+* Mon Jul 05 2004 Karsten Hopp <karsten at redhat.de> 3.1.7-4
 - add new ipv6 patch (#124232)
+
 * Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
 - rebuilt
 
@@ -230,7 +236,7 @@
 * Sat Jun 12 1999 Jeff Johnson <jbj at redhat.com>
 - 3.0b19
 
-* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com> 
+* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com>
 - auto rebuild in the new build environment (release 3)
 
 * Wed Feb 24 1999 Bill Nottingham <notting at redhat.com>