From 07c4369038ff661c03be822289c08df0d79244b6 Mon Sep 17 00:00:00 2001 From: Peter Vrabec Date: Wed, 20 Jun 2012 18:02:25 +0200 Subject: [PATCH] "extras" subpackage is not provided on RHEL --- mod_security_crs.spec | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/mod_security_crs.spec b/mod_security_crs.spec index c2d7030..c5e4441 100644 --- a/mod_security_crs.spec +++ b/mod_security_crs.spec @@ -1,7 +1,7 @@ Summary: ModSecurity Rules Name: mod_security_crs Version: 2.2.4 -Release: 2%{?dist} +Release: 3%{?dist} License: ASL 2.0 URL: http://www.modsecurity.org/ Group: System Environment/Daemons @@ -12,6 +12,7 @@ Requires: mod_security >= 2.6.5 %description This package provides the base rules for mod_security. +%if 0%{?fedora} %package extras Summary: Supplementary mod_security rules Group: System Environment/Daemons @@ -19,6 +20,7 @@ Requires: %name = %version-%release %description extras This package provides supplementary rules for mod_security. +%endif %prep %setup -q -n modsecurity-crs_%{version} @@ -30,15 +32,20 @@ install -d %{buildroot}%{_sysconfdir}/httpd/modsecurity.d/ install -d %{buildroot}%{_sysconfdir}/httpd/modsecurity.d/activated_rules install -d %{buildroot}%{_prefix}/lib/modsecurity.d/base_rules + +%if 0%{?fedora} install -d %{buildroot}%{_prefix}/lib/modsecurity.d/optional_rules install -d %{buildroot}%{_prefix}/lib/modsecurity.d/experimental_rules install -d %{buildroot}%{_prefix}/lib/modsecurity.d/slr_rules +%endif install -m0644 modsecurity_crs_10_config.conf.example %{buildroot}%{_sysconfdir}/httpd/modsecurity.d/modsecurity_crs_10_config.conf install -m0644 base_rules/* %{buildroot}%{_prefix}/lib/modsecurity.d/base_rules/ +%if 0%{?fedora} install -m0644 optional_rules/* %{buildroot}%{_prefix}/lib/modsecurity.d/optional_rules/ install -m0644 experimental_rules/* %{buildroot}%{_prefix}/lib/modsecurity.d/experimental_rules/ install -m0644 slr_rules/* %{buildroot}%{_prefix}/lib/modsecurity.d/slr_rules +%endif # activate base_rules for f in `ls %{buildroot}/%{_prefix}/lib/modsecurity.d/base_rules/` ; do @@ -52,12 +59,17 @@ done %config(noreplace) %{_sysconfdir}/httpd/modsecurity.d/modsecurity_crs_10_config.conf %{_prefix}/lib/modsecurity.d/base_rules +%if 0%{?fedora} %files extras %{_prefix}/lib/modsecurity.d/optional_rules %{_prefix}/lib/modsecurity.d/experimental_rules %{_prefix}/lib/modsecurity.d/slr_rules +%endif %changelog +* Wed Jun 20 2012 Peter Vrabec 2.2.4-3 +- "extras" subpackage is not provided on RHEL + * Wed May 03 2012 Peter Vrabec 2.2.4-2 - fix fedora-review issues (#816975)