From: Elan Ruusamäe <glen@pld-linux.org>
Date: Sun, 3 Jan 2010 02:47:54 +0000 (+0000)
Subject: - fix dirdep; rel 2
X-Git-Tag: auto/th/apache-mod_macro-1_1_10-2
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fapache1-mod_macro.git;a=commitdiff_plain;h=e724c3183a3f34d1c15c6ebbd288748af90dcfd9

- fix dirdep; rel 2

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

diff --git a/apache1-mod_macro.spec b/apache1-mod_macro.spec
index 9a294e6..9fab09e 100644
--- a/apache1-mod_macro.spec
+++ b/apache1-mod_macro.spec
@@ -4,7 +4,7 @@ Summary:	Apache module to allow macros in apache config files
 Summary(pl.UTF-8):	Moduł do apache pozwalający używać makr w konfiguracji
 Name:		apache-mod_%{mod_name}
 Version:	1.1.10
-Release:	1
+Release:	2
 License:	Apache
 Group:		Networking/Daemons/HTTP
 Source0:	http://www.cri.ensmp.fr/~coelho/mod_macro/mod_%{mod_name}-%{version}.tar.bz2
@@ -16,7 +16,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
 Apache module to allow macros in apache config files.
@@ -32,11 +32,11 @@ Moduł do apache pozwalający używać makr w plikach konfiguracyjnych.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}}
 
-install .libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
+install -p .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
@@ -52,5 +52,5 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc README CHANGES
-%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