rpms/mod_security/F-7 mod_security.spec, 1.20, 1.21 sources, 1.11, 1.12

[Michael G. Fleming (mfleming)]

Author: mfleming

Update of /cvs/extras/rpms/mod_security/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22790

Modified Files:
	mod_security.spec sources 
Log Message:
* Sat Jan 27 2008 Michael Fleming <mfleming+rpm at enlartenment.com> 2.1.5-1
- Update to 2.1.5 (bz#425986)
- "blocking" -> "optional_rules" per tarball ;-)



Index: mod_security.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_security/F-7/mod_security.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mod_security.spec	13 Sep 2007 07:36:14 -0000	1.20
+++ mod_security.spec	27 Jan 2008 06:59:51 -0000	1.21
@@ -1,6 +1,6 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
-Version: 2.1.3
+Version: 2.1.5
 Release: 1%{?dist}
 License: GPLv2
 URL: http://www.modsecurity.org/
@@ -29,9 +29,9 @@
 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,15 +43,26 @@
 %{_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 Sep 13 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 2.1.3-1
-- New upstream release
-- Update License tag per guidelines
+* Sat Jan 27 2008 Michael Fleming <mfleming+rpm at enlartenment.com> 2.1.5-1
+- Update to 2.1.5 (bz#425986)
+- "blocking" -> "optional_rules" per tarball ;-)
+
+
+* Thu Sep  13 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 2.1.3-1
+- Update to 2.1.3
+- Update License tag per guidelines.
+
+* Mon Sep  3 2007 Joe Orton <jorton at redhat.com> 2.1.1-3
+- rebuild for fixed 32-bit APR (#254241)
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 2.1.1-2
+- Rebuild for selinux ppc32 issue.
 
 * Tue Jun 19 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 2.1.1-1
 - New upstream release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_security/F-7/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	13 Sep 2007 07:36:14 -0000	1.11
+++ sources	27 Jan 2008 06:59:51 -0000	1.12
@@ -1 +1 @@
-b98a65ce4fd5deb343e295bac9490331  modsecurity-apache_2.1.3.tar.gz
+5ecbc8dbebbfcc8f850937167891fc9d  modsecurity-apache_2.1.5.tar.gz