- fix config dir

Changed files:
    apache-mod_midgard.spec -> 1.39

diff --git a/apache-mod_midgard.spec b/apache-mod_midgard.spec
index cf66604c009b43af17fcc37ad1e95c898bb53ca2..28b8a74f03b868622429ac3aceed9219c941dea3 100644 (file)
--- a/apache-mod_midgard.spec
+++ b/apache-mod_midgard.spec
@@ -28,7 +28,7 @@ Provides:     mod_midgard
 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
 
 %prep
 %setup -q -n %{arname}-%{version}
@@ -59,11 +59,11 @@ utrzymywania dynamicznych, wykorzystujących bazy danych serwisów WWW.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}}
 
-install midgard-root.php $RPM_BUILD_ROOT%{_pkglibdir}
-install mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
-install midgard.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/90_mod_%{mod_name}.conf
+cp -p midgard-root.php $RPM_BUILD_ROOT%{_pkglibdir}
+install -p mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
+cp -p midgard.conf $RPM_BUILD_ROOT%{_sysconfdir}/90_mod_%{mod_name}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -79,7 +79,7 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS COPYING ChangeLog INSTALL INSTALL.ru NEWS README README.ru
-%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
 # FIXME
 %config %{_pkglibdir}/midgard-root.php