[httpd/f17] switch default runtimedir to /var/run/httpd

[jorton]

commit c273ba7eee1b4b0e2c9becde91bb55ae9ac02fa7
Author: Joe Orton <jorton at redhat.com>
Date:   Mon Apr 30 10:35:55 2012 +0100

    switch default runtimedir to /var/run/httpd

 httpd-2.1.10-layout.patch |   17 -----------------
 httpd-2.2.22-layout.patch |   28 ++++++++++++++++++++++++++++
 httpd.spec                |    3 ++-
 3 files changed, 30 insertions(+), 18 deletions(-)
---
diff --git a/httpd-2.2.22-layout.patch b/httpd-2.2.22-layout.patch
new file mode 100644
index 0000000..3998bc6
--- /dev/null
+++ b/httpd-2.2.22-layout.patch
@@ -0,0 +1,28 @@
+
+Adjust paths in the default layout.
+
+--- httpd-2.2.22/config.layout.layout
++++ httpd-2.2.22/config.layout
+@@ -20,17 +20,17 @@
+     mandir:        ${prefix}/man
+     sysconfdir:    ${prefix}/conf
+     datadir:       ${prefix}
+-    installbuilddir: ${datadir}/build
++    installbuilddir: ${libdir}/httpd/build
+     errordir:      ${datadir}/error
+     iconsdir:      ${datadir}/icons
+     htdocsdir:     ${datadir}/htdocs
+     manualdir:     ${datadir}/manual
+     cgidir:        ${datadir}/cgi-bin
+     includedir:    ${prefix}/include
+-    localstatedir: ${prefix}
+-    runtimedir:    ${localstatedir}/logs
+-    logfiledir:    ${localstatedir}/logs
+-    proxycachedir: ${localstatedir}/proxy
++    localstatedir: /var
++    runtimedir:    ${localstatedir}/run/httpd
++    logfiledir:    ${localstatedir}/log/httpd
++    proxycachedir: ${localstatedir}/cache/mod_proxy
+ </Layout>
+ 
+ #   GNU standards conforming path layout.
diff --git a/httpd.spec b/httpd.spec
index 586c218..ed3a6ee 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -30,7 +30,7 @@ Patch1: httpd-2.1.10-apctl.patch
 Patch2: httpd-2.1.10-apxs.patch
 Patch3: httpd-2.2.9-deplibs.patch
 Patch4: httpd-2.1.10-disablemods.patch
-Patch5: httpd-2.1.10-layout.patch
+Patch5: httpd-2.2.22-layout.patch
 Patch6: httpd-2.2.22-pcre830.patch
 # Features/functional changes
 Patch20: httpd-2.0.48-release.patch
@@ -544,6 +544,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Mon Apr 30 2012 Joe Orton <jorton at redhat.com> - 2.2.22-4
+- switch default runtimedir to /var/run/httpd
 - extend _httpd_* macro set per proposed guidelines
 - fix comments in sysconfig file (#771024)