From b10da42fb9cab9f6d404230f6194597ecd000115 Mon Sep 17 00:00:00 2001
From: Michael Fleming <mfleming@fedoraproject.org>
Date: May 01 2008 01:30:14 +0000
Subject: - New upstream release (bz #444794)


---

diff --git a/.cvsignore b/.cvsignore
index ef2ef41..e04f988 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-modsecurity-apache_2.1.3.tar.gz
+modsecurity-apache_2.1.7.tar.gz
diff --git a/mod_security.spec b/mod_security.spec
index 1a3763d..02505df 100644
--- a/mod_security.spec
+++ b/mod_security.spec
@@ -1,6 +1,6 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
-Version: 2.1.3
+Version: 2.1.7
 Release: 1%{?dist}
 License: GPLv2
 URL: http://www.modsecurity.org/
@@ -29,9 +29,9 @@ perl -pi.orig -e 's|LIBDIR|%{_libdir}|;' %{SOURCE1}
 rm -rf %{buildroot}
 install -D -m755 apache2/.libs/mod_security2.so %{buildroot}/%{_libdir}/httpd/modules/mod_security2.so
 install -D -m644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/mod_security.conf
-install -d %{buildroot}/%{_sysconfdir}/httpd/modsecurity.d/blocking/
+install -d %{buildroot}/%{_sysconfdir}/httpd/modsecurity.d/optional_rules/
 cp -r rules/*.conf %{buildroot}/%{_sysconfdir}/httpd/modsecurity.d/
-cp -r rules/blocking/*.conf %{buildroot}/%{_sysconfdir}/httpd/modsecurity.d/blocking/
+cp -r rules/optional_rules/*.conf %{buildroot}/%{_sysconfdir}/httpd/modsecurity.d/optional_rules/
 install -D -m644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/httpd/modsecurity.d/modsecurity_localrules.conf
 
 %clean
@@ -43,12 +43,15 @@ rm -rf %{buildroot}
 %{_libdir}/httpd/modules/mod_security2.so
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_security.conf
 %dir %{_sysconfdir}/httpd/modsecurity.d
-%dir %{_sysconfdir}/httpd/modsecurity.d/blocking
+%dir %{_sysconfdir}/httpd/modsecurity.d/optional_rules
 %config(noreplace) %{_sysconfdir}/httpd/modsecurity.d/*.conf
-%config(noreplace) %{_sysconfdir}/httpd/modsecurity.d/blocking/*.conf
+%config(noreplace) %{_sysconfdir}/httpd/modsecurity.d/optional_rules/*.conf
 
 
 %changelog
+* Thu May 1 2008 Michael Fleming <mfleming+rpm@enlartenment.com> 2.1.7-1
+- New upstream release (bz #444794)
+
 * Thu Sep 13 2007 Michael Fleming <mfleming+rpm@enlartenment.com> 2.1.3-1
 - New upstream release
 - Update License tag per guidelines
diff --git a/sources b/sources
index f69caf1..00c975a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b98a65ce4fd5deb343e295bac9490331  modsecurity-apache_2.1.3.tar.gz
+19c34dd5611e0c516c0717de793f4640  modsecurity-apache_2.1.7.tar.gz