svn commit: r1207968 - in /httpd/httpd/trunk: build/rpm/httpd.spec.in config.layout

[mi...@apache.org]

Author: minfrin
Date: Tue Nov 29 16:56:47 2011
New Revision: 1207968

URL: http://svn.apache.org/viewvc?rev=1207968&view=rev
Log:
RPM: Introduce a proper layout for RPM, removing the need for script
gymnastics and replacement configuration files in order to get the
configuration paths to match up correctly.

Modified:
    httpd/httpd/trunk/build/rpm/httpd.spec.in
    httpd/httpd/trunk/config.layout

Modified: httpd/httpd/trunk/build/rpm/httpd.spec.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/rpm/httpd.spec.in?rev=1207968&r1=1207967&r2=1207968&view=diff
==============================================================================
--- httpd/httpd/trunk/build/rpm/httpd.spec.in (original)
+++ httpd/httpd/trunk/build/rpm/httpd.spec.in Tue Nov 29 16:56:47 2011
@@ -122,11 +122,7 @@ rm -rf srclib/{apr,apr-util,pcre}
 	support/apxs.in
 
 %configure \
- 	--prefix=%{_sysconfdir}/httpd \
-        --exec-prefix=%{_prefix} \
- 	--bindir=%{_bindir} \
- 	--sbindir=%{_sbindir} \
- 	--mandir=%{_mandir} \
+	--enable-layout=RPM \
 	--libdir=%{_libdir} \
 	--sysconfdir=%{_sysconfdir}/httpd/conf \
 	--includedir=%{_includedir}/httpd \
@@ -160,15 +156,9 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/mod_ssl
 touch $RPM_BUILD_ROOT%{_localstatedir}/cache/mod_ssl/scache.{dir,pag,sem}
 
-# move the build directory to within the library directory
-mv $RPM_BUILD_ROOT%{contentdir}/build $RPM_BUILD_ROOT%{_libdir}/httpd/build
-
 # Make the MMN accessible to module packages
 echo %{mmn} > $RPM_BUILD_ROOT%{_includedir}/httpd/.mmn
 
-# docroot
-mkdir $RPM_BUILD_ROOT%{contentdir}/html
-
 # Set up /var directories
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/httpd
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/httpd/cache-root
@@ -404,14 +394,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %dir %{contentdir}
 %dir %{contentdir}/cgi-bin
-%dir %{contentdir}/htdocs
 %dir %{contentdir}/html
 %dir %{contentdir}/icons
 %dir %{contentdir}/error
 %dir %{contentdir}/error/include
 %{contentdir}/icons/*
 %{contentdir}/error/README
-%{contentdir}/htdocs/index.html
+%{contentdir}/html/index.html
 %config(noreplace) %{contentdir}/error/*.var
 %config(noreplace) %{contentdir}/error/include/*.html
 

Modified: httpd/httpd/trunk/config.layout
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/config.layout?rev=1207968&r1=1207967&r2=1207968&view=diff
==============================================================================
--- httpd/httpd/trunk/config.layout (original)
+++ httpd/httpd/trunk/config.layout Tue Nov 29 16:56:47 2011
@@ -298,3 +298,28 @@
     installbuilddir: ${prefix}/usr/share/apache2/build
     errordir:      ${datadir}/error
 </Layout>
+
+# Generic RPM layout
+<Layout RPM>
+    prefix:        /usr
+    exec_prefix:   ${prefix}
+    bindir:        ${prefix}/bin
+    sbindir:       ${prefix}/sbin
+    libdir:        ${prefix}/lib
+    libexecdir:    ${libdir}/httpd/modules
+    mandir:        ${prefix}/share/man
+    sysconfdir:    /etc/httpd/conf
+    installbuilddir: ${libdir}/httpd/build
+    includedir:    ${prefix}/include/httpd
+    localstatedir: /var
+    datadir:       ${localstatedir}/www
+    errordir:      ${datadir}/error
+    iconsdir:      ${datadir}/icons
+    htdocsdir:     ${datadir}/html
+    manualdir:     ${datadir}/manual
+    cgidir:        ${datadir}/cgi-bin
+    runtimedir:    ${localstatedir}/run
+    logfiledir:    ${localstatedir}/log/httpd
+    proxycachedir: ${localstatedir}/cache/httpd/cache-root
+</Layout>
+