- don't break -bi --short-circuit, packaged rules/util as %doc, rel. 2

[packages/apache-mod_security.git] / apache-mod_security.spec

diff --git a/apache-mod_security.spec b/apache-mod_security.spec
index 5b9d41054285e0bd20e1d57b1eb69691a0922a42..8d38d742e020811c8827e440421f86f558d11f69 100644 (file)
--- a/apache-mod_security.spec
+++ b/apache-mod_security.spec
@@ -4,7 +4,7 @@ Summary:        Apache module: securing web applications
 Summary(pl.UTF-8):     Moduł do apache: ochrona aplikacji WWW
 Name:          apache-mod_%{mod_name}
 Version:       2.5.13
-Release:       1
+Release:       2
 License:       GPL v2
 Group:         Networking/Daemons/HTTP
 Source0:       http://www.modsecurity.org/download/modsecurity-apache_%{version}.tar.gz
@@ -38,8 +38,10 @@ parasol chroniący aplikacje WWW przed atakami.
 
 %prep
 %setup -q -n modsecurity-apache_%{version}
-mv rules/README{,.rules}
-mv rules/CHANGELOG{,.rules}
+%{__mv} rules/README{,.rules}
+%{__mv} rules/CHANGELOG{,.rules}
+%{__mv} rules/modsecurity_crs_10_config.conf{.example,}
+%{__mv} rules/modsecurity_crs_48_local_exceptions.conf{.example,}
 
 %build
 cd apache2
@@ -61,8 +63,6 @@ install apache2/.libs/mod_%{mod_name}2.so $RPM_BUILD_ROOT%{apachelibdir}
 cp -a %{SOURCE1} $RPM_BUILD_ROOT%{apacheconfdir}/90_mod_%{mod_name}.conf
 
 install -d $RPM_BUILD_ROOT%{apacheconfdir}/modsecurity.d/blocking
-mv rules/modsecurity_crs_10_config.conf.example rules/modsecurity_crs_10_config.conf
-mv rules/modsecurity_crs_48_local_exceptions.conf.example rules/modsecurity_crs_48_local_exceptions.conf
 cp -a modsecurity.conf-minimal rules/*.conf rules/base_rules/* $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
@@ -80,7 +80,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGES MODSECURITY_LICENSING_EXCEPTION README.* modsecurity* doc/* rules/optional_rules rules/README.rules rules/CHANGELOG.rules tools
+%doc CHANGES MODSECURITY_LICENSING_EXCEPTION README.* modsecurity* doc/* rules/optional_rules rules/README.rules rules/CHANGELOG.rules rules/util tools
 %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