- release 4 - merged from RA-branch (clamd_conf patch, better trigger),

[packages/clamav.git] / clamav.spec

diff --git a/clamav.spec b/clamav.spec
index 36d6c9a7bcc6e7548cadfa44e0a7fdad34e65180..f7c52591983e05d59608f59678a82ce2de010750 100644 (file)
--- a/clamav.spec
+++ b/clamav.spec
@@ -2,7 +2,7 @@
 #   Make freshclam (script and daemon)
 #
 # Conditional build:
-%bcond_with    milter  # build milter subpackage
+%bcond_without milter  # build without milter subpackage
 %bcond_with    curl    # enable curl support
 #
 Summary:       An anti-virus utility for Unix
@@ -33,6 +33,7 @@ Source9:      %{name}-milter.sysconfig
 Patch0:                %{name}-pld_config.patch
 Patch1:                %{name}-no_auto_libwrap.patch
 Patch2:                %{name}-nolibs.patch
+Patch3:                %{name}-clamd_conf.patch
 URL:           http://www.clamav.net/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -49,10 +50,11 @@ Requires(pre):      /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
 Requires(postun):      /usr/sbin/groupdel
 Requires(postun):      /usr/sbin/userdel
+Requires(postun):      sed >= 4.0
 Requires(postun,pre):  /usr/sbin/usermod
 Requires(post,preun):  /sbin/chkconfig
 Requires:      /usr/sbin/usermod
-Requires:      %{name}-libs = %{version}-%{release}
+Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Requires:      bc
 Provides:      group(clamav)
 Provides:      user(clamav)
@@ -87,7 +89,7 @@ Biblioteki dzielone clamav.
 Summary:       ClamAV filter using milter interface
 Summary(pl):   Filtr ClamAV korzystaj±cy z interfejsu milter
 Group:         Daemons
-Requires:      %{name} = %{version}-%{release}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 Requires:      sendmail >= 8.11
 Requires:      tcp_wrappers
 
@@ -101,7 +103,7 @@ Filtr ClamAV dla sendmaila korzystaj
 Summary:       clamav - Development header files and libraries
 Summary(pl):   clamav - Pliki nag³ówkowe i biblioteki dla programistów
 Group:         Development/Libraries
-Requires:      %{name}-libs = %{version}-%{release}
+Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Requires:      bzip2-devel
 Requires:      gmp-devel
 Requires:      zlib-devel
@@ -118,7 +120,7 @@ klienckich clamav.
 Summary:       clamav static libraris
 Summary(pl):   Biblioteki statyczne clamav
 Group:         Development/Libraries
-Requires:      %{name}-devel = %{version}-%{release}
+Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
 
 %description static
 clamav static libraries.
@@ -144,6 +146,7 @@ Bazy wirus
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # kill old libtool.m4 copy
 head -n 489 acinclude.m4 > acinclude.m4.tmp
@@ -278,6 +281,8 @@ if [ -f /etc/clamav.conf.rpmsave ]; then
        echo "Renaming config to new name /etc/clamd.conf"
        mv -f /etc/clamd.conf /etc/clamd.conf.rpmnew
        mv -f /etc/clamav.conf.rpmsave /etc/clamd.conf
+       echo "Changing config location in freshclam config"
+       sed -i -e 's/clamav.conf/clamd.conf/' /etc/freshclam.conf
 fi
 
 %if %{with milter}