- 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 d9e40b9b3419de586adc7fbe019883542ec41d42..8d38d742e020811c8827e440421f86f558d11f69 100644 (file)
--- a/apache-mod_security.spec
+++ b/apache-mod_security.spec
@@ -1,19 +1,25 @@
 %define                mod_name        security
-%define        apxs            /usr/sbin/apxs
+%define                apxs            /usr/sbin/apxs
 Summary:       Apache module: securing web applications
 Summary(pl.UTF-8):     Moduł do apache: ochrona aplikacji WWW
 Name:          apache-mod_%{mod_name}
-Version:       2.5.7
-Release:       1
+Version:       2.5.13
+Release:       2
 License:       GPL v2
 Group:         Networking/Daemons/HTTP
 Source0:       http://www.modsecurity.org/download/modsecurity-apache_%{version}.tar.gz
-# Source0-md5: 049509c4d76048ce02cfb558d6598761
-Source1:       apache-mod_security.conf
+# Source0-md5: 92b0ed7dec188650ea9d78dfc326e8ec
+Source1:       %{name}.conf
 URL:           http://www.modsecurity.org/
 BuildRequires: apache-devel
+BuildRequires: autoconf
+BuildRequires: libxml2-devel
+BuildRequires: pcre-devel
+BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.268
 Requires:      apache(modules-api) = %apache_modules_api
+Requires:      apache-mod_unique_id
+Suggests:      apache-mod_headers
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                apacheconfdir   %(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
@@ -32,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
@@ -55,9 +63,9 @@ 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
-cp -a rules/*.conf $RPM_BUILD_ROOT%{apacheconfdir}/modsecurity.d
+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
+echo '# Drop your local rules in here.' > $RPM_BUILD_ROOT%{apacheconfdir}/modsecurity.d/modsecurity_localrules.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -72,10 +80,10 @@ 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 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
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{apacheconfdir}/modsecurity.d/*.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{apacheconfdir}/modsecurity.d/*.*
 #%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{apacheconfdir}/modsecurity.d/blocking/*.conf
 %attr(755,root,root) %{apachelibdir}/*.so