- 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 90b8b7c8bb139e53c19598f2ac82c1d65487d6a5..a958747615ed423810811613d0046fdf070a5a5b 100644 (file)
--- 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 a56875e5f2263f737f80acaa85270edd2cd548f0..9ccbd9843aa9194879fa2623110e3f434940aa28 100644 (file)
--- 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