Merge branch 'master' into el5

.gitignore

@@ -1,3 +1,4 @@
 /modsecurity-crs_2.2.4.tar.gz
 /modsecurity-crs_2.2.5.tar.gz
 /SpiderLabs-owasp-modsecurity-crs-21197fc.tar.gz
+/SpiderLabs-owasp-modsecurity-crs-v2.2.6-0-g3f85c76.tar.gz

mod_security_crs.spec

@@ -1,9 +1,9 @@
-%global git_short 21197fc
+%global git_short 3f85c76
 
 Summary: ModSecurity Rules
 Name: mod_security_crs
 Version: 2.2.6
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: ASL 2.0
 URL: http://www.modsecurity.org/
 Group: System Environment/Daemons
@@ -11,9 +11,9 @@ Group: System Environment/Daemons
 # Use the following command to generate the tarball:
 # wget https://github.com/SpiderLabs/owasp-modsecurity-crs/tarball/GIT_SHORT
 
-Source: SpiderLabs-owasp-modsecurity-crs-%{git_short}.tar.gz
+Source: SpiderLabs-owasp-modsecurity-crs-v%{version}-0-g%{git_short}.tar.gz
 BuildArch: noarch
-Requires: mod_security >= 2.6.5
+Requires: mod_security >= 2.7.0
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -71,6 +71,14 @@ rm -rf %{buildroot}
 %{_prefix}/lib/modsecurity.d/slr_rules
 
 %changelog
+* Wed Oct 17 2012 Athmane Madjoudj <athmane@fedoraproject.org> 2.2.6-3
+- Remove the patch since we're requiring mod_security >= 2.7.0
+- Require mod_security >= 2.7.0
+
+* Mon Oct 01 2012 Athmane Madjoudj <athmane@fedoraproject.org> 2.2.6-2
+- Add a patch to fix incompatible rules.
+- Update to new git release
+
 * Sat Sep 15 2012 Athmane Madjoudj <athmane@fedoraproject.org> 2.2.6-1
 - Update to 2.2.6
 - Update spec file since upstream moved to Github.

sources

@@ -1 +1 @@
-1e002f0892319724a4f14266b1213ae0  SpiderLabs-owasp-modsecurity-crs-21197fc.tar.gz
+99fa2a3ec391c56ac4a92b749b299f35  SpiderLabs-owasp-modsecurity-crs-v2.2.6-0-g3f85c76.tar.gz