[packages/apache-mod_python] - fix for ap_requires removed from apache 2.4 API - rel 20

[baggins]

commit f26c3e1685d3374d94f9a717e77ab880071d5748
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Jun 21 00:44:31 2013 +0200

    - fix for ap_requires removed from apache 2.4 API
    - rel 20

 apache-mod_python-apache24.patch | 16 ++++++++++++++++
 apache-mod_python.spec           |  4 ++--
 2 files changed, 18 insertions(+), 2 deletions(-)
---
diff --git a/apache-mod_python.spec b/apache-mod_python.spec
index 28c9f28..14220da 100644
--- a/apache-mod_python.spec
+++ b/apache-mod_python.spec
@@ -1,5 +1,5 @@
 %define		mod_name	python
-%define 	apxs		/usr/sbin/apxs
+%define		apxs		/usr/sbin/apxs
 Summary:	An embedded Python interpreter for the Apache Web server
 Summary(cs.UTF-8):	Vestavěný interpret Pythonu pro WWW server Apache
 Summary(da.UTF-8):	En indbygget Python-fortolker for webtjeneren Apache
@@ -19,7 +19,7 @@ Summary(sl.UTF-8):	Vključeni pythonski tolmač za spletni strežnik Apache
 Summary(sv.UTF-8):	En inbyggd Python-interpretator för webbservern Apache
 Name:		apache-mod_%{mod_name}
 Version:	3.3.1
-Release:	19
+Release:	20
 License:	Apache
 Group:		Networking/Daemons/HTTP
 Source0:	http://www.apache.org/dist/httpd/modpython/mod_%{mod_name}-%{version}.tgz
diff --git a/apache-mod_python-apache24.patch b/apache-mod_python-apache24.patch
index 565f9e3..3c39678 100644
--- a/apache-mod_python-apache24.patch
+++ b/apache-mod_python-apache24.patch
@@ -60,3 +60,19 @@
      }
      else if (strcmp(name, "notes") == 0) {
          Py_INCREF(self->notes);
+--- mod_python-3.3.1/src/requestobject.c~	2006-12-03 05:36:37.000000000 +0100
++++ mod_python-3.3.1/src/requestobject.c	2013-06-21 00:41:47.635302626 +0200
+@@ -1230,7 +1230,12 @@
+        follow requires, e.g. "requires role terminator".
+     */
+ 
+-    const apr_array_header_t *reqs_arr = ap_requires(self->request_rec);
++    const apr_array_header_t *reqs_arr =
++#if AP_SERVER_MAJORVERSION_NUMBER > 2 || AP_SERVER_MINORVERSION_NUMBER >= 3
++    NULL;
++#else
++    ap_requires(self->request_rec);
++#endif
+     require_line *reqs;
+     int i, ti = 0;
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/apache-mod_python.git/commitdiff/f26c3e1685d3374d94f9a717e77ab880071d5748