X-Git-Url: https://git.pld-linux.org/?p=packages%2Fapache-mod_python.git;a=blobdiff_plain;f=apache-mod_python.spec;h=eff7ab166ecf3cbc73cfd129cbdbb6ebf9c05444;hp=3dc3c1e2c48eac4b145520f7c3b5917c7c155f5d;hb=76c494c72c2529d5033dd9c7dd426a81d43e7ba5;hpb=604cd759607869406e5deac3b4bff9a7fc781e47

diff --git a/apache-mod_python.spec b/apache-mod_python.spec
index 3dc3c1e..eff7ab1 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:	4
+Release:	40
 License:	Apache
 Group:		Networking/Daemons/HTTP
 Source0:	http://dist.modpython.org/dist/mod_%{mod_name}-%{version}.tgz
@@ -30,6 +30,9 @@ Source2:	%{name}3.conf
 Patch0:		%{name}-httpd-not-needed.patch
 Patch1:		no-git.patch
 Patch2:		set-request-response-status.patch
+Patch3:		install.patch
+Patch4:		import.patch
+Patch5:		build.patch
 URL:		http://www.modpython.org/
 BuildRequires:	apache-devel >= 2.0.52-7
 BuildRequires:	apr-devel >= 1:1.0.0
@@ -47,7 +50,6 @@ BuildRequires:	python3
 BuildRequires:	python3-devel >= 3.3
 %endif
 Requires(post,preun,postun):	systemd-units >= 38
-Requires(post,preun):	sbin/chkconfig
 Requires:	rc-scripts
 Requires:	apache(modules-api) = %apache_modules_api
 Requires:	apr >= 1:1.0.0
@@ -148,7 +150,6 @@ Summary(pl.UTF-8):	Wbudowany interpreter języka Python 3 dla serwera WWW Apache
 Summary(sv.UTF-8):	En inbyggd Python3-interpretator för webbservern Apache
 Group:		Networking/Daemons/HTTP
 Requires(post,preun,postun):	systemd-units >= 38
-Requires(post,preun):	sbin/chkconfig
 Requires:	rc-scripts
 Requires:	apache(modules-api) = %apache_modules_api
 Requires:	apr >= 1:1.0.0
@@ -239,6 +240,9 @@ prestandan jämfört med den traditionella CGI-metoden.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 %{__aclocal}
@@ -253,7 +257,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}
@@ -265,7 +271,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