diff -r 3695593c147a -r c6b0e6c7f67d clamav/clamav.spec --- a/clamav/clamav.spec Thu Aug 09 18:53:48 2012 +0200 +++ b/clamav/clamav.spec Thu Aug 09 18:55:01 2012 +0200 @@ -38,8 +38,8 @@ Class: EVAL Group: AntiVirus License: GPL -Version: 0.95.3 -Release: 20091102 +Version: 0.97.5 +Release: 20120800 # package options %option with_milter no @@ -50,18 +50,14 @@ Patch0: clamav.patch # build information -Prefix: %{l_prefix} -BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20060823, gcc, bzip2, pkgconfig, bc -PreReq: OpenPKG, openpkg >= 20060823 +BuildPreReq: OpenPKG, openpkg >= 20100101, gcc, bzip2, pkgconfig, bc +PreReq: OpenPKG, openpkg >= 20100101 BuildPreReq: zlib, bzip2, curl, gmp, libiconv, openssl PreReq: zlib, bzip2, curl, gmp, libiconv, openssl %if "%{with_milter}" == "yes" BuildPreReq: milter PreReq: milter %endif -AutoReq: no -AutoReqProv: no %description Clam AntiVirus is an anti-virus toolkit for UNIX. The main @@ -83,6 +79,9 @@ %prep %setup -q %patch -p0 + %{l_shtool} subst \ + -e 's;lib\(milter/mfapi.h\);\1;' \ + configure %build # configure package @@ -93,6 +92,7 @@ GREP="grep" \ ./configure \ --prefix=%{l_prefix} \ + --libdir=%{l_prefix}/lib \ --mandir=%{l_prefix}/man \ --sysconfdir=%{l_prefix}/etc/clamav \ --with-zlib=%{l_prefix} \ @@ -117,10 +117,8 @@ %{l_make} %{l_mflags -O} %install - rm -rf $RPM_BUILD_ROOT - # perform standard package installation - %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT" + %{l_make} %{l_mflags} install DESTDIR="$RPM_BUILD_ROOT" # install default configuration %{l_shtool} mkdir -f -p -m 755 \ @@ -165,13 +163,11 @@ %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \ %{l_files_std} \ '%config %{l_prefix}/etc/clamav/*.conf' \ - '%attr(755,%{l_rusr},%{l_mgrp}) %{l_prefix}/var/clamav' \ - '%attr(755,%{l_rusr},%{l_rgrp}) %{l_prefix}/share/clamav' + '%attr(755,%{l_rusr},%{l_mgrp}) %{l_prefix}/var/clamav' %files -f files %clean - rm -rf $RPM_BUILD_ROOT %pre # before upgrade, save status and stop service