- restore llvm bcond default for ac

[packages/clamav.git] / clamav.spec

diff --git a/clamav.spec b/clamav.spec
index fbab9d59227796146334165bcaebb7a510e21cbd..4413ef03d58ee952abcd44800a8711f124f28346 100644 (file)
--- a/clamav.spec
+++ b/clamav.spec
@@ -10,15 +10,19 @@
 %bcond_without llvm            # LLVM support
 %endif
 
+%ifarch x32
+%undefine with_llvm
+%endif
+
 Summary:       An anti-virus utility for Unix
 Summary(pl.UTF-8):     Narzędzie antywirusowe dla Uniksów
 Name:          clamav
-Version:       0.98.3
-Release:       1
+Version:       0.98.7
+Release:       2
 License:       GPL v2+
 Group:         Daemons
 Source0:       http://downloads.sourceforge.net/clamav/%{name}-%{version}.tar.gz
-# Source0-md5: b649d35ee85d4d6075a98173dd255c17
+# Source0-md5: 157c601161da1c2d5a0e48ea1b49e067
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       %{name}-milter.init
@@ -35,6 +39,8 @@ Patch2:               am-nosilentrules.patch
 %endif
 Patch3:                ac2.68.patch
 Patch4:                %{name}-openssl.patch
+Patch5:                %{name}-major.patch
+Patch6:                x32.patch
 URL:           http://www.clamav.net/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -46,7 +52,6 @@ BuildRequires:        libltdl-devel
 BuildRequires: libstdc++-devel
 BuildRequires: libtool
 %{?with_milter:BuildRequires:  libwrap-devel}
-BuildRequires: llvm-devel
 %{?with_llvm:BuildRequires:    llvm-devel}
 BuildRequires: ncurses-devel
 BuildRequires: openssl-devel
@@ -68,6 +73,7 @@ Requires:     %{name}-libs = %{epoch}:%{version}-%{release}
 Requires:      /usr/sbin/usermod
 Requires:      rc-scripts >= 0.4.1.23
 Suggests:      clamav-database
+Suggests:      crondaemon
 Provides:      group(clamav)
 Provides:      user(clamav)
 Conflicts:     logrotate < 3.7-4
@@ -171,8 +177,12 @@ Biblioteki statyczne clamav.
 %if "%{pld_release}" == "ac"
 %patch2 -p1
 %endif
+%if "%{pld_release}" != "ac"
 %patch3 -p1
-%patch4 -p1
+%endif
+#%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 %{__libtoolize}
@@ -184,6 +194,7 @@ Biblioteki statyczne clamav.
        --disable-silent-rules \
        --disable-clamav \
        --enable-clamdtop \
+       %{?with_llvm:--enable-llvm --with-system-llvm} \
        %{?with_milter:--enable-milter} \
        --with-dbdir=/var/lib/%{name} \
        --with-no-cache \