From ed919c57e5b13134404597f440131639c1aee02b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20R=C4=99korajski?= <baggins@pld-linux.org>
Date: Sun, 6 Mar 2016 12:18:06 +0100
Subject: [PATCH] - fix install with current python dirs layout - rel 18

---
 apache-mod_python.spec | 12 +++++++++---
 install.patch          | 14 ++++++++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 install.patch

diff --git a/apache-mod_python.spec b/apache-mod_python.spec
index 0d5e5bd..294d080 100644
--- a/apache-mod_python.spec
+++ b/apache-mod_python.spec
@@ -20,7 +20,7 @@ Summary(pl.UTF-8):	Wbudowany interpreter języka Python dla serwera WWW Apache
 Summary(sv.UTF-8):	En inbyggd Python-interpretator för webbservern Apache
 Name:		apache-mod_%{mod_name}
 Version:	3.5.0
-Release:	17
+Release:	18
 License:	Apache
 Group:		Networking/Daemons/HTTP
 Source0:	http://dist.modpython.org/dist/mod_%{mod_name}-%{version}.tgz
@@ -30,6 +30,7 @@ Source2:	%{name}3.conf
 Patch0:		%{name}-httpd-not-needed.patch
 Patch1:		no-git.patch
 Patch2:		set-request-response-status.patch
+Patch3:		install.patch
 URL:		http://www.modpython.org/
 BuildRequires:	apache-devel >= 2.0.52-7
 BuildRequires:	apr-devel >= 1:1.0.0
@@ -237,6 +238,7 @@ prestandan jämfört med den traditionella CGI-metoden.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__aclocal}
@@ -251,7 +253,9 @@ prestandan jämfört med den traditionella CGI-metoden.
 %{__make} dso
 install -d apache-mod_python{%{apachelibdir},%{apacheconfdir},%{_bindir}}
 %{__make} install \
-	DESTDIR=`pwd`/apache-mod_python
+	DESTDIR=`pwd`/apache-mod_python \
+	PY_SITESCRIPTDIR=%{py_sitescriptdir} \
+	PY_SITEDIR=%{py_sitedir}
 %endif
 
 %if %{with python3}
@@ -263,7 +267,9 @@ install -d apache-mod_python{%{apachelibdir},%{apacheconfdir},%{_bindir}}
 %{__make} dso
 install -d apache-mod_python3{%{apachelibdir},%{apacheconfdir},%{_bindir}}
 %{__make} install \
-	DESTDIR=`pwd`/apache-mod_python3
+	DESTDIR=`pwd`/apache-mod_python3 \
+	PY_SITESCRIPTDIR=%{py3_sitescriptdir} \
+	PY_SITEDIR=%{py3_sitedir}
 %{__mv} apache-mod_python3%{_bindir}/mod_python{,3}
 %{__mv} apache-mod_python3%{apachelibdir}/mod_python{,3}.so
 %endif
diff --git a/install.patch b/install.patch
new file mode 100644
index 0000000..5b9249b
--- /dev/null
+++ b/install.patch
@@ -0,0 +1,14 @@
+--- mod_python-3.5.0/dist/Makefile.in~	2013-11-12 04:21:34.000000000 +0100
++++ mod_python-3.5.0/dist/Makefile.in	2016-03-06 12:15:34.649626272 +0100
+@@ -34,9 +34,9 @@
+ install_py_lib: mod_python src
+ 	@cd src; $(MAKE) psp_parser.c
+ 	if test -z "$(DESTDIR)" ; then \
+-		$(PYTHON_BIN) setup.py install --optimize 2 --force ; \
++		$(PYTHON_BIN) setup.py install --optimize 2 --force --install-purelib=$(PY_SITESCRIPTDIR) --install-platlib=$(PY_SITEDIR) ; \
+ 	else \
+-		$(PYTHON_BIN) setup.py install --optimize 2 --force --root $(DESTDIR) ; \
++		$(PYTHON_BIN) setup.py install --optimize 2 --force --root $(DESTDIR) --install-purelib=$(PY_SITESCRIPTDIR) --install-platlib=$(PY_SITEDIR) ; \
+ 	fi
+ 
+ mod_python.so:
-- 
2.43.0