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

Changed files:
    bftpd.spec -> 1.37

diff --git a/bftpd.spec b/bftpd.spec
index 72f07f508c72dc277f2d43261cbcbb54d00fb9d0..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
-Requires:      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
@@ -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