- fix dirdep; rel 2

Changed files:
    apache-mod_macro.spec -> 1.14

diff --git a/apache-mod_macro.spec b/apache-mod_macro.spec
index 9a294e6afd90300d5618d002396ec92394c8a45f..9fab09ea0c07ff021cf83a76b0b2d86a02fb8653 100644 (file)
--- a/apache-mod_macro.spec
+++ b/apache-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