- amd64 ready modules loading (no longer libXX in LoadModule path)

Changed files:
    apache.spec -> 1.289

diff --git a/apache.spec b/apache.spec
index 10f49e1a2b636536e66cbc575d10358aa66db43c..9b9effb450d4003fe120b8322e29904d61089889 100644 (file)
--- a/apache.spec
+++ b/apache.spec
@@ -35,7 +35,7 @@ Summary(ru):  
 Summary(tr):   Lider WWW tarayýcý
 Name:          apache
 Version:       2.0.49
-Release:       0.1
+Release:       0.2
 License:       Apache Group License
 Group:         Networking/Daemons
 Source0:       http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
@@ -674,7 +674,9 @@ CPPFLAGS="-DMAX_SERVER_LIMIT=200000"
 for mpm in %{?with_metuxmpm:metuxmpm} perchild prefork worker; do
 install -d "buildmpm-${mpm}"; cd "buildmpm-${mpm}"
 ../%configure \
-       --prefix=%{_libexecdir} \
+       --prefix=%{_sysconfdir} \
+       --exec-prefix=%{_libexecdir} \
+       --with-installbuilddir=%{_libdir}/apache/build \
        --enable-layout=PLD \
        --enable-modules=all \
        --enable-mods-shared=all \
@@ -774,6 +776,10 @@ done
 
 ln -s httpd.prefork $RPM_BUILD_ROOT%{_sbindir}/httpd
 
+ln -s %{_libdir}/apache $RPM_BUILD_ROOT%{_sysconfdir}/modules
+ln -s %{_localstatedir}/run/apache $RPM_BUILD_ROOT%{_sysconfdir}/run
+ln -s %{_libdir}/apache/build $RPM_BUILD_ROOT%{_sysconfdir}/build
+
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 
@@ -1212,6 +1218,8 @@ fi
 
 %attr(750,root,root) %dir %{_sysconfdir}
 %attr(750,root,root) %dir %{_sysconfdir}/httpd.conf
+%attr(750,root,root) %dir %{_sysconfdir}/modules
+%attr(750,root,root) %dir %{_sysconfdir}/run
 %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_httpd.conf
 %attr(640,root,root) %{_sysconfdir}/magic
 %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/*
@@ -1334,6 +1342,7 @@ fi
 %defattr(644,root,root,755)
 %{_includedir}
 %{_libexecdir}/*.exp
+%attr(750,root,root) %dir %{_sysconfdir}/build
 %attr(755,root,root) %dir %{_libexecdir}/build
 %attr(644,root,root) %{_libexecdir}/build/*.mk
 %attr(755,root,root) %{_libexecdir}/build/*.sh