[clamav/el5: 5/5] Merge branch 'el6' into el5

[Jan-Frode Myklebust]

commit d77b949ca7af06f4e9151a2533f571cf21e13009
Merge: 462c599 7d5029a
Author: Jan-Frode Myklebust <janfrode at tanso.net>
Date:   Wed Jul 27 09:17:00 2011 +0200

    Merge branch 'el6' into el5
    
    Conflicts:
    	clamav.spec
    	sources

 .gitignore  |    2 +-
 clamav.spec |   20 +++++++++++++++-----
 sources     |    2 +-
 3 files changed, 17 insertions(+), 7 deletions(-)
---
diff --cc clamav.spec
index b69ff5e,234273a..e58d3bc
--- a/clamav.spec
+++ b/clamav.spec
@@@ -404,10 -405,18 +405,19 @@@ rm -rf %{buildroot
  %exclude %{_libdir}/libclamav.la
  
  %changelog
 -* Wed Jul 27 2011 Jan-Frode Myklebuust <janfrode at tanso.net> - 0.97.2-2
 -- include updated clamd-wrapper which get the PidFile setting from the
 -  service configuration file. 
+ 
 -* Wed Jul 27 2011 Jan-Frode Myklebuust <janfrode at tanso.net> - 0.97.2-1
++* Wed Jul 27 2011 Jan-Frode Myklebuust <janfrode at tanso.net> - 0.97.2-2
+ - updated to 0.97.2
+ - Build-require xz
+ - CVE-2011-2721 Off-by-one error by scanning message hashes (#725694)
+ 
 +* Thu Jul 14 2011 Jeroen van Meeuwen <kanarip at kanarip.com> - 0.97-14
 +- Make clamd-wrapper get the PidFile setting from the service
 +  configuration file.
 +
+ * Wed Jun 29 2011 Nick Bebout <nb at fedoraproject.org> - 0.97-14
+ - Require /usr/sbin/sendmail instead of sendmail
+ 
  * Tue Apr 26 2011 Jan-Frode Myklebust <janfrode at tanso.net> - 0.97-13
  - Obsolete and provide clamav-milter-sysvinit (bz#696856)