- added BuildRequires and Obsoletes rules,

- cosmetics.

Changed files:
    ftpd-BSD.spec -> 1.5

diff --git a/ftpd-BSD.spec b/ftpd-BSD.spec
index 2ca3614ca9759d6ef2ee08a3a0a373e26db1ad8e..cf790564ab12e65dbdec25f0b23ce0d5fe5a9a35 100644 (file)
--- a/ftpd-BSD.spec
+++ b/ftpd-BSD.spec
@@ -8,21 +8,26 @@ Source0:      ftp://quatramaran.ens.fr/pub/madore/ftpd-BSD/%{name}-%{version}.tar.gz
 Source1:       %{name}.inetd
 Source2:       %{name}.pamd
 Source3:       %{name}-ftpusers
-BuildRoot:     /tmp/%{name}-%{version}-root
+Buildrequires: libwrap-devel
+Buildrequires: pam-devel
 Requires:      rc-inetd
 Requires:      inetdaemon
 Requires:      anonftp
 Provides:      ftpserver
+BuildRoot:     /tmp/%{name}-%{version}-root
+Obsoletes:     wu-ftpd
+Obsoletes:     proftpd
+Obsoletes:     heimdal-ftpd
 
 %description
-This is a Linux port of the BSD ftp server (ftpd).  It doesn't have
-all the bells and whistles of wu-ftpd, but it is also probably less
-buggy and more secure (at least, it was certainly so before I ported
-it, and I hope I didn't mess things up *too* much).
+This is a Linux port of the BSD ftp server (ftpd). It doesn't have all the
+bells and whistles of wu-ftpd, but it is also probably less buggy and more
+secure (at least, it was certainly so before I ported it, and I hope I
+didn't mess things up *too* much).
 
-The source code was taken from the OpenBSD CVS as of 2000/01/23 (this
-is between releases 2.6 and 2.7).  The ftpd version number is 6.4 and
-this port's version number is 0.3.0.
+The source code was taken from the OpenBSD CVS as of 2000/01/23 (this is
+between releases 2.6 and 2.7). The ftpd version number is 6.4 and this
+port's version number is 0.3.0.
 
 %prep
 %setup -q
@@ -35,8 +40,8 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/{%{_sbindir},%{_mandir}/man8,etc/{pam.d,sysconfig/rc-inetd}}
 
 install -s ftpd        $RPM_BUILD_ROOT%{_sbindir}/ftpd-BSD
-install ftpd.8         $RPM_BUILD_ROOT%{_mandir}/man8/ftpd-BSD.8
-install %{SOURCE1}     $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/ftp
+install ftpd.8         $RPM_BUILD_ROOT%{_mandir}/man8/
+install %{SOURCE1}     $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/ftpd
 install %{SOURCE2}     $RPM_BUILD_ROOT/etc/pam.d/ftp
 install %{SOURCE3}     $RPM_BUILD_ROOT/etc/ftpusers
 
@@ -64,4 +69,4 @@ rm -rf $RPM_BUILD_ROOT
 %attr(640,root,root) %{_mandir}/man8/*
 %attr(640,root,root) %config %verify(not size mtime md5) /etc/pam.d/ftp
 %attr(640,root,root) /etc/ftpusers
-%attr(640,root,root) /etc/sysconfig/rc-inetd/ftp
+%attr(640,root,root) /etc/sysconfig/rc-inetd/ftpd