From: Elan Ruusamäe <glen@pld-linux.org>
Date: Fri, 9 Dec 2011 12:22:13 +0000 (+0000)
Subject: - update config dir macro
X-Git-Url: http://git.pld-linux.org/cgi-bin/gitweb.cgi?p=packages%2Fapache1-mod_security.git;a=commitdiff_plain

- update config dir macro

Changed files:
    apache1-mod_security.spec -> 1.14
---

diff --git a/apache1-mod_security.spec b/apache1-mod_security.spec
index af7d382..3632f09 100644
--- a/apache1-mod_security.spec
+++ b/apache1-mod_security.spec
@@ -16,7 +16,7 @@ Requires:	apache1(EAPI)
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
-%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)
+%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
 
 %description
 ModSecurity is an open source intrusion detection and prevention
@@ -38,12 +38,12 @@ cd apache1
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/conf.d}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}}
 
 install apache1/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
 
 echo 'LoadModule %{mod_name}_module	modules/mod_%{mod_name}.so' > \
-	$RPM_BUILD_ROOT%{_sysconfdir}/conf.d/90_mod_%{mod_name}.conf
+	$RPM_BUILD_ROOT%{_sysconfdir}/90_mod_%{mod_name}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -59,5 +59,5 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc README CHANGES modsecurity-manual.pdf httpd.conf*
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*