OpenPKG Specs / file diff

     1.1 --- a/clamav/clamav.spec	Thu Aug 09 18:53:48 2012 +0200
     1.2 +++ b/clamav/clamav.spec	Thu Aug 09 18:55:01 2012 +0200
     1.3 @@ -38,8 +38,8 @@
     1.4  Class:        EVAL
     1.5  Group:        AntiVirus
     1.6  License:      GPL
     1.7 -Version:      0.95.3
     1.8 -Release:      20091102
     1.9 +Version:      0.97.5
    1.10 +Release:      20120800
    1.11  
    1.12  #   package options
    1.13  %option       with_milter  no
    1.14 @@ -50,18 +50,14 @@
    1.15  Patch0:       clamav.patch
    1.16  
    1.17  #   build information
    1.18 -Prefix:       %{l_prefix}
    1.19 -BuildRoot:    %{l_buildroot}
    1.20 -BuildPreReq:  OpenPKG, openpkg >= 20060823, gcc, bzip2, pkgconfig, bc
    1.21 -PreReq:       OpenPKG, openpkg >= 20060823
    1.22 +BuildPreReq:  OpenPKG, openpkg >= 20100101, gcc, bzip2, pkgconfig, bc
    1.23 +PreReq:       OpenPKG, openpkg >= 20100101
    1.24  BuildPreReq:  zlib, bzip2, curl, gmp, libiconv, openssl
    1.25  PreReq:       zlib, bzip2, curl, gmp, libiconv, openssl
    1.26  %if "%{with_milter}" == "yes"
    1.27  BuildPreReq:  milter
    1.28  PreReq:       milter
    1.29  %endif
    1.30 -AutoReq:      no
    1.31 -AutoReqProv:  no
    1.32  
    1.33  %description
    1.34      Clam AntiVirus is an anti-virus toolkit for UNIX. The main
    1.35 @@ -83,6 +79,9 @@
    1.36  %prep
    1.37      %setup -q
    1.38      %patch -p0
    1.39 +    %{l_shtool} subst \
    1.40 +        -e 's;lib\(milter/mfapi.h\);\1;' \
    1.41 +        configure
    1.42  
    1.43  %build
    1.44      #   configure package
    1.45 @@ -93,6 +92,7 @@
    1.46      GREP="grep" \
    1.47      ./configure \
    1.48          --prefix=%{l_prefix} \
    1.49 +        --libdir=%{l_prefix}/lib \
    1.50          --mandir=%{l_prefix}/man \
    1.51          --sysconfdir=%{l_prefix}/etc/clamav \
    1.52          --with-zlib=%{l_prefix} \
    1.53 @@ -117,10 +117,8 @@
    1.54      %{l_make} %{l_mflags -O}
    1.55  
    1.56  %install
    1.57 -    rm -rf $RPM_BUILD_ROOT
    1.58 -
    1.59      #   perform standard package installation
    1.60 -    %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
    1.61 +    %{l_make} %{l_mflags} install DESTDIR="$RPM_BUILD_ROOT"
    1.62  
    1.63      #   install default configuration
    1.64      %{l_shtool} mkdir -f -p -m 755 \
    1.65 @@ -165,13 +163,11 @@
    1.66      %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
    1.67          %{l_files_std} \
    1.68          '%config %{l_prefix}/etc/clamav/*.conf' \
    1.69 -        '%attr(755,%{l_rusr},%{l_mgrp}) %{l_prefix}/var/clamav' \
    1.70 -        '%attr(755,%{l_rusr},%{l_rgrp}) %{l_prefix}/share/clamav'
    1.71 +        '%attr(755,%{l_rusr},%{l_mgrp}) %{l_prefix}/var/clamav'
    1.72  
    1.73  %files -f files
    1.74  
    1.75  %clean
    1.76 -    rm -rf $RPM_BUILD_ROOT
    1.77  
    1.78  %pre
    1.79      #   before upgrade, save status and stop service