- misc fixes and cleanups

Changed files:
    ftp.spec -> 1.2

diff --git a/ftp.spec b/ftp.spec
index 83bbdf4493eb4266da2c9219814d2f1d2237afe1..b232f1ef76e9d5c95f494f1ecca7ed09bad435fb 100644 (file)
--- a/ftp.spec
+++ b/ftp.spec
@@ -1,13 +1,13 @@
-Summary: The standard UNIX FTP (file transfer protocol) client.
-Name: ftp
-Version: 0.10
-Release: 22
-Copyright: BSD
-Group: Applications/Internet
-Source0: ftp://sunsite.unc.edu/pub/Linux/system/network/file-transfer/netkit-ftp-0.10.tar.gz
-Patch0: netkit-ftp-0.10-misc.patch
-Requires: inetd
-BuildRoot: /var/tmp/%{name}-root
+Summary:       The standard UNIX FTP (file transfer protocol) client.
+Name:          ftp
+Version:       0.10
+Release:       23
+Copyright:     BSD
+Group:         Applications/Internet
+Source0:       ftp://sunsite.unc.edu/pub/Linux/system/network/file-transfer/netkit-ftp-0.10.tar.gz
+Patch0:                netkit-ftp-0.10-misc.patch
+Requires:      inetd
+BuildRoot:     /tmp/%{name}-%{version}-root
 
 %description
 The ftp package provides the standard UNIX command-line FTP client.
@@ -18,7 +18,7 @@ If your system is on a network, you should install ftp in order to do
 file transfers.
 
 %prep
-%setup -n netkit-ftp-0.10
+%setup -q -n netkit-ftp-0.10
 %patch0 -p1
 
 %build
@@ -26,16 +26,23 @@ make RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/usr/{bin,man/man1}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1}
 
-make INSTALLROOT=$RPM_BUILD_ROOT install
+make install \
+       BINDIR=$RPM_BUILD_ROOT%{_bindir} \
+       MANDIR=$RPM_BUILD_ROOT%{_mandir}
+
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/pftp.1
+echo ".so ftp.1" > $RPM_BUILD_ROOT%{_mandir}/man1/pftp.1
+
+gzip -9nf $RPM_BUILD_ROOT%{_mandir}/man1/*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
-/usr/bin/ftp
-/usr/bin/pftp
-/usr/man/man1/ftp.1
-/usr/man/man1/pftp.1
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/ftp
+%attr(755,root,root) %{_bindir}/pftp
+%{_mandir}/man1/ftp.1.gz
+%{_mandir}/man1/pftp.1.gz