- release 2

[packages/clamav.git] / clamav.spec

diff --git a/clamav.spec b/clamav.spec
index d0f593caabc68b3ccf91b3876831fddbf456322d..8994b97881f20ce68ebbd35439f03898a336fadf 100644 (file)
--- a/clamav.spec
+++ b/clamav.spec
@@ -3,13 +3,12 @@
 #
 # Conditional build:
 %bcond_without milter          # build without milter subpackage
-%bcond_with    curl            # enable curl support
 #
 Summary:       An anti-virus utility for Unix
 Summary(pl.UTF-8):     Narzędzie antywirusowe dla Uniksów
 Name:          clamav
 Version:       0.94.1
-Release:       1
+Release:       2
 Epoch:         0
 License:       GPL v2+
 Group:         Applications
@@ -25,13 +24,11 @@ Source9:    %{name}-milter.sysconfig
 Patch0:                %{name}-pld_config.patch
 Patch1:                %{name}-no_auto_libwrap.patch
 Patch2:                %{name}-nolibs.patch
-Patch3:                %{name}-find_milter.patch
-Patch4:                %{name}-valid_pp_exp.patch
+Patch3:                %{name}-valid_pp_exp.patch
 URL:           http://www.clamav.net/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: bzip2-devel
-%{?with_curl:BuildRequires:    curl-devel}
 BuildRequires: gmp-devel
 %{?with_milter:BuildRequires:  libmilter-devel}
 BuildRequires: libtool
@@ -150,9 +147,9 @@ Biblioteki statyczne clamav.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 %build
+
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
@@ -160,10 +157,10 @@ Biblioteki statyczne clamav.
 %{__automake}
 %configure \
        --disable-clamav \
-       %{!?with_curl:--without-libcurl} \
        %{?with_milter:--enable-milter} \
-       --with-dbdir=/var/lib/%{name}
-%{__make}
+       --with-dbdir=/var/lib/%{name} \
+       --with-no-cache
+%{__make} LIBTOOL=/usr/bin/libtool
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -171,6 +168,7 @@ install -d $RPM_BUILD_ROOT/etc/{cron.d,logrotate.d,rc.d/init.d,sysconfig} \
        $RPM_BUILD_ROOT%{_var}/{log,spool/clamav}
 
 %{__make} install \
+       LIBTOOL=/usr/bin/libtool \
        DESTDIR=$RPM_BUILD_ROOT
 %{!?with_milter:rm -f $RPM_BUILD_ROOT%{_mandir}/man8/clamav-milter.8*}