[mod_security_crs/el6: 3/3] Merge branch 'master' into el6

[Athmane Madjoudj]

commit 6ee5531c68a8825bd9dad594be29220516087f09
Merge: da24660 62e63a3
Author: Athmane Madjoudj <athmane at fedoraproject.org>
Date:   Thu Sep 13 10:41:53 2012 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	mod_security_crs.spec

 mod_security_crs.spec |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)
---
diff --cc mod_security_crs.spec
index b243f37,1c00ad6..ff2f8ce
--- a/mod_security_crs.spec
+++ b/mod_security_crs.spec
@@@ -1,7 -1,7 +1,11 @@@
  Summary: ModSecurity Rules
  Name: mod_security_crs
  Version: 2.2.5
++<<<<<<< HEAD
 +Release: 4%{?dist}
++=======
+ Release: 5%{?dist}
++>>>>>>> master
  License: ASL 2.0
  URL: http://www.modsecurity.org/
  Group: System Environment/Daemons
@@@ -70,9 -63,11 +67,14 @@@ rm -rf %{buildroot
  %{_prefix}/lib/modsecurity.d/optional_rules
  %{_prefix}/lib/modsecurity.d/experimental_rules
  %{_prefix}/lib/modsecurity.d/slr_rules
- %endif
  
  %changelog
++<<<<<<< HEAD
++=======
+ * Thu Sep 13 2012 Athmane Madjoudj <athmane at fedoraproject.org> 2.2.5-5
+ - Enable extra rules sub-package for EPEL.
+ 
++>>>>>>> master
  * Tue Aug 28 2012 Athmane Madjoudj <athmane at fedoraproject.org> 2.2.5-4
  - Fix spec for el5