X-Git-Url: https://git.pld-linux.org/?p=packages%2Fapache-mod_python.git;a=blobdiff_plain;f=apache-mod_python.spec;h=5bde137f7a2eb7dbd4265a2799f92263a2fe7388;hp=1599a789622e2dd4ab7d9c4e980e085dd3e3dc64;hb=ab69cabddc30b7fb3d26b2a1cd6d542f2eeaaa3c;hpb=97a6059e3bbdf971fd9faeb704ec29be334640c1

diff --git a/apache-mod_python.spec b/apache-mod_python.spec
index 1599a78..5bde137 100644
--- a/apache-mod_python.spec
+++ b/apache-mod_python.spec
@@ -20,8 +20,8 @@ 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:	14
-License:	Apache
+Release:	52
+License:	Apache v2.0
 Group:		Networking/Daemons/HTTP
 Source0:	http://dist.modpython.org/dist/mod_%{mod_name}-%{version}.tgz
 # Source0-md5:	2e61621e8d030f535f112d8e739161e2
@@ -30,7 +30,10 @@ Source2:	%{name}3.conf
 Patch0:		%{name}-httpd-not-needed.patch
 Patch1:		no-git.patch
 Patch2:		set-request-response-status.patch
-URL:		http://www.modpython.org/
+Patch3:		install.patch
+Patch4:		import.patch
+Patch5:		build.patch
+URL:		http://modpython.org/
 BuildRequires:	apache-devel >= 2.0.52-7
 BuildRequires:	apr-devel >= 1:1.0.0
 BuildRequires:	autoconf
@@ -40,11 +43,11 @@ BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.671
 %if %{with python2}
 BuildRequires:	python
-BuildRequires:	python-devel >= 2.6
+BuildRequires:	python-devel >= 1:2.6
 %endif
 %if %{with python3}
 BuildRequires:	python3
-BuildRequires:	python3-devel >= 3.3
+BuildRequires:	python3-devel >= 1:3.3
 %endif
 Requires(post,preun,postun):	systemd-units >= 38
 Requires:	rc-scripts
@@ -237,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}
@@ -251,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}
@@ -263,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