- unified rc-inetd usage (via %service), adapterized

[packages/bftpd.git] / bftpd.spec

diff --git a/bftpd.spec b/bftpd.spec
index 6961f8bb2425ff02abd4144097a57dfbb1ec7c56..56fd67a86706d07784ca01ec1f7271d010bb12aa 100644 (file)
--- a/bftpd.spec
+++ b/bftpd.spec
@@ -14,13 +14,13 @@ Source3:    ftpusers.tar.bz2
 URL:           http://www.bftpd.org/
 Patch0:                %{name}-NOROOT.patch
 BuildRequires: autoconf
-Prereq:                rc-inetd
+BuildRequires: rpmbuild(macros) >= 1.268
 Requires:      inetdaemon
+Requires:      rc-inetd
 Provides:      ftpserver
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-Obsoletes:     ftpserver
 Obsoletes:     anonftp
 Obsoletes:     ftpd-BSD
+Obsoletes:     ftpserver
 Obsoletes:     glftpd
 Obsoletes:     heimdal-ftpd
 Obsoletes:     linux-ftpd
@@ -34,6 +34,7 @@ Obsoletes:    troll-ftpd
 Obsoletes:     vsftpd
 Obsoletes:     wu-ftpd
 Conflicts:     man-pages < 1.51
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 bftpd is a Linux FTP server with chroot and setreuid. Not all FTP
@@ -58,7 +59,7 @@ Autoryzacja u
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_prefix}{/sbin,/share/man/man8},/etc/sysconfig/rc-inetd,/srv/ftp}
+install -d $RPM_BUILD_ROOT{%{_prefix}{/sbin,/share/man/man8},/etc/sysconfig/rc-inetd,/home/services/ftp}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
@@ -73,15 +74,11 @@ bzip2 -dc %{SOURCE3} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ -f /var/lock/subsys/rc-inetd ]; then
-       /etc/rc.d/init.d/rc-inetd restart 1>&2
-else
-       echo "Type \"/etc/rc.d/init.d/rc-inetd start\" to start inet server" 1>&2
-fi
+%service -q rc-inetd reload
 
 %postun
-if [ "$1" = "0" -a -f /var/lock/subsys/rc-inetd ]; then
-       /etc/rc.d/init.d/rc-inetd restart
+if [ "$1" = "0" ]; then
+       %service -q rc-inetd reload
 fi
 
 %files
@@ -91,10 +88,11 @@ fi
 %doc %lang(pl) doc/pl/*.{html,txt}
 %attr(755,root,root) %{_sbindir}/*
 #%attr(640,root,root) /etc/pam.d/ftp
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/%{name}.conf
-%attr(640,root,root) %config /etc/sysconfig/rc-inetd/ftpd
-%dir %attr(555,ftp,ftp) /srv/ftp
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rc-inetd/ftpd
+%dir %attr(555,ftp,ftp) /home/services/ftp
 
+%{_mandir}/man5/ftpusers.5*
 %{_mandir}/man8/*
 %lang(ja) %{_mandir}/ja/man5/ftpusers*
 %lang(pl) %{_mandir}/pl/man5/ftpusers*