- updated to 0.103.3, allow milter w/o clamd

diff --git a/clamav.spec b/clamav.spec
index a8e709a3780cd6d47683263558c08524e9d54f9d..663889318ffda0789675febb53650aa46d50797f 100644 (file)
--- a/clamav.spec
+++ b/clamav.spec
@@ -15,13 +15,13 @@
 Summary:       An anti-virus utility for Unix
 Summary(pl.UTF-8):     Narzędzie antywirusowe dla Uniksów
 Name:          clamav
-Version:       0.103.0
+Version:       0.103.3
 Release:       1
 License:       GPL v2+
 Group:         Daemons
 #Source0Download: http://www.clamav.net/download
 Source0:       http://www.clamav.net/downloads/production/%{name}-%{version}.tar.gz
-# Source0-md5: 453a389e0147b5df8fae5601b390d7db
+# Source0-md5: f8dcf678953f6af056ddd5917bcc50c3
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       %{name}-milter.init
@@ -60,21 +60,14 @@ BuildRequires:      rpmbuild(macros) >= 1.647
 BuildRequires: tomsfastmath-devel >= 0.13.1-2
 BuildRequires: zlib-devel >= 1.2.2
 Requires(post,preun):  /sbin/chkconfig
-Requires(postun):      /usr/sbin/groupdel
-Requires(postun):      /usr/sbin/userdel
 Requires(postun,pre):  /usr/sbin/usermod
-Requires(pre): /bin/id
-Requires(pre): /usr/bin/getgid
-Requires(pre): /usr/sbin/groupadd
-Requires(pre): /usr/sbin/useradd
 Requires(triggerpostun):       sed >= 4.0
+Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Requires:      /usr/sbin/usermod
 Requires:      rc-scripts >= 0.4.1.23
 Suggests:      clamav-database
 Suggests:      cronjobs
-Provides:      group(clamav)
-Provides:      user(clamav)
 Conflicts:     logrotate < 3.7-4
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -134,6 +127,25 @@ Lista podstawowych możliwości:
 - wbudowana obsługa popularnych formatów dokumentów, w tym plików MS
   Office, MacOffice, HTML, RTF i PDF
 
+%package common
+Summary:        Common ClamAV files and directories
+Summary(pl.UTF-8):      ClamAV - wspólne pliki i katalogi
+Group:          Daemons
+Requires(postun):      /usr/sbin/groupdel
+Requires(postun):      /usr/sbin/userdel
+Requires(pre): /bin/id
+Requires(pre): /usr/bin/getgid
+Requires(pre):  /usr/sbin/groupadd
+Requires(pre):  /usr/sbin/useradd
+Provides:      group(clamav)
+Provides:      user(clamav)
+
+%description common
+Common ClamAV files and directories.
+
+%description common -l pl.UTF-8
+ClamAV - wspólne pliki i katalogi
+
 %package libs
 Summary:       Shared libraries for clamav
 Summary(pl.UTF-8):     Biblioteki dzielone clamav
@@ -153,10 +165,11 @@ Biblioteki dzielone clamav.
 Summary:       ClamAV filter using milter interface
 Summary(pl.UTF-8):     Filtr ClamAV korzystający z interfejsu milter
 Group:         Daemons
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Requires:      %{name}-common = %{epoch}:%{version}-%{release}
+Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Requires:      postfix
-#Requires:     sendmail >= 8.11
 Requires:      tcp_wrappers
+Suggests:      %{name} = %{epoch}:%{version}-%{release}
 
 %description milter
 ClamAV sendmail filter using MILTER interface.
@@ -276,10 +289,6 @@ rm -rf $RPM_BUILD_ROOT
 %triggerin -- amavisd
 %addusertogroup -q clamav amavis
 
-%pre
-%groupadd -g 43 clamav
-%useradd -u 43 -d /tmp -s /bin/false -c "Clam Anti Virus Checker" -g clamav clamav
-
 %post
 /sbin/chkconfig --add clamd
 %service clamd restart "Clam Antivirus daemon"
@@ -293,12 +302,6 @@ if [ "$1" = "0" ]; then
        /sbin/chkconfig --del clamd
 fi
 
-%postun
-if [ "$1" = "0" ]; then
-       %userremove clamav
-       %groupremove clamav
-fi
-
 %triggerpostun -- %{name} < 0.80
 if [ -f /etc/clamav.conf.rpmsave ]; then
        echo "Renaming config to new name /etc/clamd.conf"
@@ -330,6 +333,16 @@ EOF
 touch /var/lock/subsys/clamd
 %service -q clamd restart
 
+%pre common
+%groupadd -g 43 clamav
+%useradd -u 43 -d /tmp -s /bin/false -c "Clam Anti Virus Checker" -g clamav clamav
+
+%postun common
+if [ "$1" = "0" ]; then
+       %userremove clamav
+       %groupremove clamav
+fi
+
 %post milter
 /sbin/chkconfig --add clamav-milter
 %service clamav-milter restart "Clam Antivirus daemon"
@@ -358,9 +371,7 @@ fi
 %attr(755,root,root) %{_sbindir}/clamav-post-updatedb
 %attr(755,root,root) %{_sbindir}/clamd
 %attr(755,root,root) %{_sbindir}/clamonacc
-%attr(755,clamav,root) %dir /var/lib/%{name}
 %attr(640,clamav,root) %ghost /var/log/freshclam.log
-%attr(750,clamav,clamav) %dir /var/run/%{name}
 
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/cron.d/%{name}
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/clamd.conf
@@ -382,6 +393,11 @@ fi
 %{_mandir}/man8/clamd.8*
 %{_mandir}/man8/clamonacc.8*
 
+%files common
+%defattr(644,root,root,755)
+%attr(755,clamav,root) %dir /var/lib/%{name}
+%attr(750,clamav,clamav) %dir /var/run/%{name}
+
 %if %{with milter}
 %files milter
 %defattr(644,root,root,755)