[pki-tps] The API changed between httpd 2.2 and 2.4. We now need to pass the module index to ap_log_error() w

[mharmsen]

commit fda36cea9e1d0473f84bdc3a1aa325e3b84ed747
Author: Matthew Harmsen <mharmsen at redhat.com>
Date:   Tue Aug 7 16:12:34 2012 -0700

    The API changed between httpd 2.2 and 2.4.  We now need to pass
    the module index to ap_log_error() when calling it.  The remote_ip
    member of the connection struct also was renamed to client_ip.

 pki-tps.spec |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)
---
diff --git a/pki-tps.spec b/pki-tps.spec
index b591e1a..65595eb 100644
--- a/pki-tps.spec
+++ b/pki-tps.spec
@@ -1,6 +1,6 @@
 Name:             pki-tps
 Version:          9.0.7
-Release:          3%{?dist}
+Release:          4%{?dist}
 Summary:          Certificate System - Token Processing System
 URL:              http://pki.fedoraproject.org/
 License:          LGPLv2
@@ -45,6 +45,8 @@ Requires:         initscripts
 
 Source0:          http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz
 
+Patch0:	          0001-Port-TPS-to-httpd-2.4.patch
+
 %global overview                                                          \
 Certificate System (CS) is an enterprise software system designed         \
 to manage enterprise Public Key Infrastructure (PKI) deployments.         \
@@ -98,6 +100,10 @@ ${overview}
 
 %setup -q -n %{name}-%{version}
 
+%if 0%{?fedora} >= 18
+%patch0 -p2 -b .f18
+%endif
+
 cat << \EOF > %{name}-prov
 #!/bin/sh
 %{__perl_provides} $* |\
@@ -215,6 +221,12 @@ fi
 
 
 %changelog
+* Tue Aug  7 2012 Nathan Kinder <nkinder at redhat.com> 9.0.7-4
+- The API changed between httpd 2.2 and 2.4.  We now need to pass
+  the module index to ap_log_error() when calling it.  The remote_ip
+  member of the connection struct also was renamed to client_ip.
+  (Patch for Fedora 18 only)
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 9.0.7-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild