From: Elan Ruusamäe <glen@pld-linux.org>
Date: Fri, 9 Dec 2011 12:06:22 +0000 (+0000)
Subject: - fix config dir
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fapache-mod_auth_any.git;a=commitdiff_plain;h=HEAD;hp=6f29f543c84076c955e1f5b2cb83cd1fbed6c0fb

- fix config dir

Changed files:
    apache-mod_auth_any.spec -> 1.41
---

diff --git a/apache-mod_auth_any.spec b/apache-mod_auth_any.spec
index 565b4f9..193a8e3 100644
--- a/apache-mod_auth_any.spec
+++ b/apache-mod_auth_any.spec
@@ -28,7 +28,7 @@ Requires:	apache(modules-api) = %apache_modules_api
 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
 This module allows you to use any command line program (such as
@@ -78,15 +78,16 @@ godtyckligt angivet kommando.
 %patch0 -p1
 
 %build
-%{__make} APXS2=/usr/sbin/apxs
+%{__make} \
+	APXS2=/usr/sbin/apxs
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}}
 
-install src/.libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
+install -p src/.libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
 echo 'LoadModule %{mod_name}_module modules/mod_%{mod_name}.so' > \
-	$RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/90_mod_%{mod_name}.conf
+	$RPM_BUILD_ROOT%{_sysconfdir}/90_mod_%{mod_name}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -102,5 +103,5 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc docs/* TODO
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_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}/*.so