- R: clamav; cleanups

- change init name to clamsmtpd; rel 0.6

Changed files:
    clamsmtp.spec -> 1.8

diff --git a/clamsmtp.spec b/clamsmtp.spec
index a7b1dff33d2b6d20a2f7960305c764a05a209947..2ddeceb5de83f7105996551bbd1e11840dbe27ef 100644 (file)
--- a/clamsmtp.spec
+++ b/clamsmtp.spec
@@ -2,22 +2,19 @@ Summary:      clamsmtp - clamav-based antivirus SMTP-level gateway
 Summary(pl):   clamsmtp - oparta na clamavie bramka antywirusowa SMTP
 Name:          clamsmtp
 Version:       1.1
-Release:       0.5
+Release:       0.6
 License:       BSD
 Group:         Applications/Networking
 Source0:       http://memberwebs.com/nielsen/software/clamsmtp/%{name}-%{version}.tar.gz
 # Source0-md5: dbb077492c1ed5acca9beb91f2808e0c
-# Source0-size:        138446
 Source1:       %{name}.init
 URL:           http://memberwebs.com/nielsen/software/clamsmtp/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libtool
-#BuildRequires:        pcre-devel
 PreReq:                rc-scripts
+Requires:      clamav
 Requires(post,preun):  /sbin/chkconfig
-# FIXME: which package in PLD provides 'netfilter' ? 
-#Requires:     netfilter
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -47,7 +44,7 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sbindir},%{_sysconfdir},/etc/rc.d/init.d}
 install -d $RPM_BUILD_ROOT{%{_mandir}/{man8,man5},/var/spool/%{name}}
 
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/clamsmtpd
 install doc/clamsmtpd.conf $RPM_BUILD_ROOT%{_sysconfdir}
 install src/clamsmtpd $RPM_BUILD_ROOT%{_sbindir}
 install doc/clamsmtpd.conf.5 $RPM_BUILD_ROOT%{_mandir}/man5/
@@ -57,25 +54,25 @@ install doc/clamsmtpd.8 $RPM_BUILD_ROOT%{_mandir}/man8/
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/chkconfig --add %{name}
-if [ -f /var/lock/subsys/%{name} ]; then
-       /etc/rc.d/init.d/%{name} restart 1>&2
+/sbin/chkconfig --add clamsmtpd
+if [ -f /var/lock/subsys/clamsmtpd ]; then
+       /etc/rc.d/init.d/clamsmtpd restart 1>&2
 else
-       echo "Type \"/etc/rc.d/init.d/%{name} start\" to start inet server" 1>&2
+       echo "Type \"/etc/rc.d/init.d/clamsmtpd start\" to start inet server" 1>&2
 fi
 
 %preun
 if [ "$1" = "0" ]; then
-       if [ -f /var/lock/subsys/%{name} ]; then
-               /etc/rc.d/init.d/%{name} stop 1>&2
+       if [ -f /var/lock/subsys/clamsmtpd ]; then
+               /etc/rc.d/init.d/clamsmtpd stop 1>&2
        fi
-       /sbin/chkconfig --del %{name}
+       /sbin/chkconfig --del clamsmtpd
 fi
 
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
-%attr(754,root,root) /etc/rc.d/init.d/%{name}
+%attr(754,root,root) /etc/rc.d/init.d/clamsmtpd
 %attr(755,root,root) %{_sbindir}/*
 %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/clamsmtpd.conf
 %dir /var/spool/%{name}