[dansguardian/f17: 4/4] fix merge

[Peter Robinson]

commit 442b6b0cbade72d7e603a2dac667016e351c07a2
Merge: 62473cb 07a9df4
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sun Mar 4 16:39:50 2012 +0000

    fix merge

 ...n-2.10.1.1-Do-no-check-for-clamav-version.patch |   27 ++++++++++++++++++++
 ...an-2.10.1.1-Include-stddef.h-for-offsetof.patch |   24 +++++++++++++++++
 dansguardian.spec                                  |   18 +++++++++++-
 3 files changed, 67 insertions(+), 2 deletions(-)
---
diff --cc dansguardian.spec
index 7561620,7d663ea..5637f21
--- a/dansguardian.spec
+++ b/dansguardian.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:           dansguardian
  Version:        2.10.1.1
--Release:        7%{?dist}
++Release:        8%{?dist}
  Summary:        Content filtering web proxy
  Summary(de):    Contentfilter-Proxy
  
@@@ -193,9 -202,11 +202,14 @@@ f
  
  
  %changelog
- * Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.10.1.1-7
++* Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.10.1.1-8
 +- Rebuilt for c++ ABI breakage
 +
+ * Fri Feb 10 2012 Petr Pisar <ppisar at redhat.com> - 2.10.1.1-7
+ - Rebuild against PCRE 8.30
+ - Do not check for clamav version
+ - Fix compilation with GCC 4.7
+ 
  * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.10.1.1-6
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild