[clamav/el5: 4/4] Merge branch 'el5' of ssh://pkgs.fedoraproject.org/clamav into el5

[Nick Bebout]

commit 854a82a4d502b33cb4983364e164f387d3c1244c
Merge: 6fcce95 e38bfba
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Tue Oct 18 19:59:25 2011 -0500

    Merge branch 'el5' of ssh://pkgs.fedoraproject.org/clamav into el5
    
    Conflicts:
    	clamav.spec

 clamav.spec |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --cc clamav.spec
index b85ae02,76ea306..43edef5
--- a/clamav.spec
+++ b/clamav.spec
@@@ -418,11 -414,9 +418,12 @@@ rm -rf %{buildroot
    (bz#727894)
  
  * Wed Jul 27 2011 Jan-Frode Myklebuust <janfrode at tanso.net> - 0.97.2-3
+ - Handle xz archives in rpmbuilds < RHEL6.
  - include updated clamd-wrapper which get the PidFile setting from the
 -  service configuration file. 
 +  service configuration file.
 +
 +* Wed Jul 27 2011 Jan-Frode Myklebuust <janfrode at tanso.net> - 0.97.2-3
 +- Handle xz archives in rpmbuilds < RHEL6.
  
  * Wed Jul 27 2011 Jan-Frode Myklebuust <janfrode at tanso.net> - 0.97.2-2
  - updated to 0.97.2