From 277dec43316d76c0974bbd33e5de5349c91b5a82 Mon Sep 17 00:00:00 2001
From: Artur Frysiak <artur@frysiak.net>
Date: Thu, 11 Mar 2010 12:06:14 +0000
Subject: [PATCH] - up to 3.2 - added python3 bcond

Changed files:
    apache-mod_wsgi-apache-version.patch -> 1.2
    apache-mod_wsgi.spec -> 1.10
---
 apache-mod_wsgi-apache-version.patch | 15 ---------------
 apache-mod_wsgi.spec                 | 21 +++++++++++++++------
 2 files changed, 15 insertions(+), 21 deletions(-)
 delete mode 100644 apache-mod_wsgi-apache-version.patch

diff --git a/apache-mod_wsgi-apache-version.patch b/apache-mod_wsgi-apache-version.patch
deleted file mode 100644
index 5390127..0000000
--- a/apache-mod_wsgi-apache-version.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- mod_wsgi-1.0/configure.ac~	2007-07-31 15:13:08.000000000 +0300
-+++ mod_wsgi-1.0/configure.ac	2007-12-26 20:27:23.190556576 +0200
-@@ -88,8 +88,10 @@
- AC_SUBST(LDLIBS)
- 
- AC_MSG_CHECKING(Apache version)
--HTTPD="`${APXS} -q SBINDIR`/`${APXS} -q TARGET`"
--HTTPD_VERSION=`$HTTPD -v | awk '/version/ {print $3}' | awk -F/ '{print $2}'`
-+if test -z "$HTTPD_VERSION"; then
-+    HTTPD="`${APXS} -q SBINDIR`/`${APXS} -q TARGET`"
-+    HTTPD_VERSION=`$HTTPD -v | awk '/version/ {print $3}' | awk -F/ '{print $2}'`
-+fi
- AC_MSG_RESULT($HTTPD_VERSION)
- 
- LIBEXECDIR="`${APXS} -q LIBEXECDIR`"
diff --git a/apache-mod_wsgi.spec b/apache-mod_wsgi.spec
index 2470250..0c6cea6 100644
--- a/apache-mod_wsgi.spec
+++ b/apache-mod_wsgi.spec
@@ -1,23 +1,28 @@
+%bcond_with	python3
+#
 %define		mod_name	wsgi
 %define 	apxs		/usr/sbin/apxs
 Summary:	WSGI interface for the Apache Web server
 Summary(pl.UTF-8):	Interfejs WSGI dla serwera WWW Apache
 Name:		apache-mod_%{mod_name}
-Version:	2.5
+Version:	3.2
 Release:	1
 License:	Apache
 Group:		Networking/Daemons
 Source0:	http://modwsgi.googlecode.com/files/mod_%{mod_name}-%{version}.tar.gz
-# Source0-md5:	43ad11c477799e2f780c50197c420afd
+# Source0-md5:	7e4f7f443f562f21f61d1bd06defa1d8
 Source1:	%{name}.conf
-Patch0:		%{name}-apache-version.patch
 URL:		http://code.google.com/p/modwsgi/
 BuildRequires:	%{apxs}
 BuildRequires:	apache-devel >= 2.0.52-7
 BuildRequires:	apr-devel >= 1:1.0.0
 BuildRequires:	autoconf
 BuildRequires:	automake
+%if %{with python3}
+BuildRequires:	python3-devel
+%else
 BuildRequires:	python-devel >= 2.3
+%endif
 BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	apache(modules-api) = %apache_modules_api
 Requires:	apr >= 1:1.0.0
@@ -43,14 +48,18 @@ lub CGI.
 
 %prep
 %setup -q -n mod_%{mod_name}-%{version}
-%patch0 -p1
 
 %build
 %{__aclocal}
 %{__autoconf}
-HTTPD_VERSION=$(rpm -q --qf '%{V}' apache-devel); export HTTPD_VERSION
+%if %{with python3}
+PYTHONBIN=%{__python3}
+%else
+PYTHONBIN=%{__python}
+%endif
 %configure \
-	--with-apxs=%{apxs}
+	--with-apxs=%{apxs} \
+	--with-python=$PYTHONBIN
 
 %install
 rm -rf $RPM_BUILD_ROOT
-- 
2.43.0