[httpd/f17: 2/2] update to 2.2.23

[Jan Kaluža]

commit c28150f5fb5279fdbc94de831113ea304a6a0d27
Merge: c8f9afe 6cd7e16
Author: Jan Kaluza <hanzz.k at gmail.com>
Date:   Tue Jan 29 13:26:51 2013 +0100

    update to 2.2.23

 httpd-2.1.10-layout.patch |   17 -----------------
 httpd-2.2.22-layout.patch |   28 ++++++++++++++++++++++++++++
 httpd.spec                |   25 ++++++++++++++++++-------
 httpd.sysconf             |   14 ++++++++++++++
 4 files changed, 60 insertions(+), 24 deletions(-)
---
diff --cc httpd.spec
index 7fe19a4,f32b719..d9e764d
--- a/httpd.spec
+++ b/httpd.spec
@@@ -30,7 -30,8 +30,7 @@@ Patch1: httpd-2.1.10-apctl.patc
  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
  Patch22: httpd-2.1.10-pod.patch
@@@ -537,9 -538,15 +539,18 @@@ rm -rf $RPM_BUILD_ROO
  %{_sysconfdir}/rpm/macros.httpd
  
  %changelog
 +* Tue Jan 29 2013 Jan Kaluza <jkaluza at redhat.com> - 2.2.23-1
 +- update to 2.2.23
 +
+ * 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)
+ 
+ * Sat Mar 31 2012 Adam Williamson <awilliam at redhat.com> - 2.2.22-3
+ - rebuild against openssl 1.0.0h (previous build was against
+   1.0.1, this is not good) RH #808793
+ 
  * Mon Feb 13 2012 Joe Orton <jorton at redhat.com> - 2.2.22-2
  - fix build against PCRE 8.30