From: Tomasz Pala <gotar@pld-linux.org>
Date: Sat, 13 Jun 2009 13:02:51 +0000 (+0000)
Subject: - restored local rules
X-Git-Tag: auto/th/apache-mod_security-2_5_11-1~2
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fapache-mod_security.git;a=commitdiff_plain;h=4097ac0d96711e2f2f55aee16126cd066ad74b11

- restored local rules

Changed files:
    apache-mod_security.conf -> 1.4
    apache-mod_security.spec -> 1.27
---

diff --git a/apache-mod_security.conf b/apache-mod_security.conf
index 90b8b7c..a958747 100644
--- a/apache-mod_security.conf
+++ b/apache-mod_security.conf
@@ -33,5 +33,5 @@ LoadModule security2_module modules/mod_security2.so
 
 	# Put your local rules in here.
 
-	# Include conf.d/modsecurity.d/modsecurity_localrules.conf
+	Include conf.d/modsecurity.d/modsecurity_localrules.conf
 </IfModule>
diff --git a/apache-mod_security.spec b/apache-mod_security.spec
index a56875e..9ccbd98 100644
--- a/apache-mod_security.spec
+++ b/apache-mod_security.spec
@@ -14,7 +14,7 @@ URL:		http://www.modsecurity.org/
 BuildRequires:	apache-devel
 BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	apache(modules-api) = %apache_modules_api
-Requires:	apache(mod_unique_id)
+Requires:	apache-mod_unique_id
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		apacheconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
@@ -58,7 +58,7 @@ cp -a %{SOURCE1} $RPM_BUILD_ROOT%{apacheconfdir}/90_mod_%{mod_name}.conf
 install -d $RPM_BUILD_ROOT%{apacheconfdir}/modsecurity.d/blocking
 cp -a rules/*.conf $RPM_BUILD_ROOT%{apacheconfdir}/modsecurity.d
 #cp -a rules/blocking/*.conf $RPM_BUILD_ROOT%{apacheconfdir}/modsecurity.d/blocking
-echo '# Drop your local rules in here.' $RPM_BUILD_ROOT%{apacheconfdir}/modsecurity.d/modsecurity_localrules.conf
+echo '# Drop your local rules in here.' > $RPM_BUILD_ROOT%{apacheconfdir}/modsecurity.d/modsecurity_localrules.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -73,7 +73,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGES README.* modsecurity* doc/* rules/optional_rules rules/README.rules rules/CHANGELOG.rules
+%doc CHANGES MODSECURITY_LICENSING_EXCEPTION README.* modsecurity* doc/* rules/optional_rules rules/README.rules rules/CHANGELOG.rules
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{apacheconfdir}/*_mod_%{mod_name}.conf
 %dir %{apacheconfdir}/modsecurity.d
 %dir %{apacheconfdir}/modsecurity.d/blocking