packages: apache-mod_security/apache-mod_security.spec - don't break -bi --...

[gotar]

Author: gotar                        Date: Sat Jul 23 10:24:30 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- don't break -bi --short-circuit, packaged rules/util as %doc, rel. 2

---- Files affected:
packages/apache-mod_security:
   apache-mod_security.spec (1.34 -> 1.35) 

---- Diffs:

================================================================
Index: packages/apache-mod_security/apache-mod_security.spec
diff -u packages/apache-mod_security/apache-mod_security.spec:1.34 packages/apache-mod_security/apache-mod_security.spec:1.35
--- packages/apache-mod_security/apache-mod_security.spec:1.34	Thu Apr 28 00:16:47 2011
+++ packages/apache-mod_security/apache-mod_security.spec	Sat Jul 23 12:24:25 2011
@@ -5,7 +5,7 @@
 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
@@ -39,8 +39,10 @@
 
 %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
@@ -62,8 +64,6 @@
 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
@@ -81,7 +81,7 @@
 
 %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
@@ -95,6 +95,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.35  2011/07/23 10:24:25  gotar
+- don't break -bi --short-circuit, packaged rules/util as %doc, rel. 2
+
 Revision 1.34  2011/04/27 22:16:47  marti
 - up to 2.5.13
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_security/apache-mod_security.spec?r1=1.34&r2=1.35&f=u