X-Git-Url: https://git.pld-linux.org/?p=packages%2Fapache-mod_python.git;a=blobdiff_plain;f=apache-mod_python.spec;h=334f427a6cac6287f69088d37a90501db20012e3;hp=10b537421d51f64063b68c5b2ada448b1e35017e;hb=17fc952;hpb=52a20df308d76d5714a53d7f4625f8b1f639cc14

diff --git a/apache-mod_python.spec b/apache-mod_python.spec
index 10b5374..334f427 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:	2
-License:	Apache
+Release:	49
+License:	Apache v2.0
 Group:		Networking/Daemons/HTTP
 Source0:	http://dist.modpython.org/dist/mod_%{mod_name}-%{version}.tgz
 # Source0-md5:	2e61621e8d030f535f112d8e739161e2
@@ -29,27 +29,34 @@ Source1:	%{name}.conf
 Source2:	%{name}3.conf
 Patch0:		%{name}-httpd-not-needed.patch
 Patch1:		no-git.patch
-URL:		http://www.modpython.org/
+Patch2:		set-request-response-status.patch
+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
 BuildRequires:	automake
 BuildRequires:	flex >= 2.5.31
 BuildRequires:	rpm-pythonprov
-BuildRequires:	rpmbuild(macros) >= 1.268
+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
 Requires:	apache(modules-api) = %apache_modules_api
 Requires:	apr >= 1:1.0.0
 # apache.py uses pdb module
 Requires:	python-devel-tools
 %requires_eq	python-libs
+Requires:	systemd-units >= 38
 Conflicts:	apache-mod_python3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -142,11 +149,14 @@ Summary(ja.UTF-8):	Apache Web サーバー用の組込み Python 3 インター
 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:	rc-scripts
 Requires:	apache(modules-api) = %apache_modules_api
 Requires:	apr >= 1:1.0.0
 # apache.py uses pdb module
 Requires:	python3-devel-tools
 %requires_eq	python3-libs
+Requires:	systemd-units >= 38
 Conflicts:	apache-mod_python
 
 %description -n apache-mod_python3
@@ -229,29 +239,41 @@ prestandan jämfört med den traditionella CGI-metoden.
 %setup -q -n mod_%{mod_name}-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 %{__aclocal}
 %{__autoconf}
+
 %if %{with python2}
 %configure \
 	--with-apxs=%{apxs} \
 	--with-python=%{__python}
+
+%{__make} clean
 %{__make} dso
 install -d apache-mod_python{%{apachelibdir},%{apacheconfdir},%{_bindir}}
 %{__make} install \
-	DESTDIR=`pwd`/apache-mod_python
-%{__make} clean
+	DESTDIR=`pwd`/apache-mod_python \
+	PY_SITESCRIPTDIR=%{py_sitescriptdir} \
+	PY_SITEDIR=%{py_sitedir}
 %endif
 
 %if %{with python3}
 %configure \
 	--with-apxs=%{apxs} \
 	--with-python=%{__python3}
+
+%{__make} clean
 %{__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
@@ -260,9 +282,6 @@ install -d apache-mod_python3{%{apachelibdir},%{apacheconfdir},%{_bindir}}
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{apachelibdir},%{apacheconfdir},%{_bindir}}
 
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
-
 %if %{with python2}
 cp -a apache-mod_python/* $RPM_BUILD_ROOT
 install %{SOURCE1} $RPM_BUILD_ROOT%{apacheconfdir}/60_mod_python.conf
@@ -280,18 +299,22 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 %service -q httpd restart
+%systemd_service_restart httpd.service
 
 %postun
 if [ "$1" = "0" ]; then
 	%service -q httpd restart
+	%systemd_service_restart httpd.service
 fi
 
 %post -n apache-mod_python3
 %service -q httpd restart
+%systemd_service_restart httpd.service
 
 %postun -n apache-mod_python3
 if [ "$1" = "0" ]; then
 	%service -q httpd restart
+	%systemd_service_restart httpd.service
 fi
 
 %if %{with python2}