X-Git-Url: https://git.pld-linux.org/?p=packages%2Fapache-mod_python.git;a=blobdiff_plain;f=apache-mod_python.spec;h=ef0a749a15696514bdc544cfc0f3f9c708ed0e52;hp=fadd099f5995861d032c0edf983329fd9038d8ed;hb=1a7b3fd3693f9205c7ead02133490b94518cbb1c;hpb=496ae653acce6a95a5f914ba7537005c87471cb1

diff --git a/apache-mod_python.spec b/apache-mod_python.spec
index fadd099..ef0a749 100644
--- a/apache-mod_python.spec
+++ b/apache-mod_python.spec
@@ -1,5 +1,3 @@
-
-%include	/usr/lib/rpm/macros.python
 %define		mod_name	python
 %define 	apxs		/usr/sbin/apxs
 Summary:	An embedded Python interpreter for the Apache Web server
@@ -12,7 +10,7 @@ Summary(id):	Interpreter Perl untuk web server Apache
 Summary(is):	Perl túlkur fyrir Apache vefþjóninn
 Summary(it):	Interprete Python integrato per il server Web Apache
 Summary(ja):	Apache Web ¥µ¡¼¥Ð¡¼ÍѤÎÁȹþ¤ß Perl ¥¤¥ó¥¿¡¼¥×¥ê¥¿
-Summary(no):	En Python-fortolker for webtjeneren Apache
+Summary(nb):	En Python-fortolker for webtjeneren Apache
 Summary(pl):	Wbudowany interpreter jêzyka Python dla serwera WWW Apache
 Summary(pt):	Um interpretador de Perl embebido para o servidor Web Apache
 Summary(ru):	÷ÓÔÒÏÅÎÎÙÊ ÉÎÔÅÒÐÒÅÔÁÔÏÒ Perl ÄÌÑ WWW-ÓÅÒ×ÅÒÁ Apache
@@ -20,29 +18,34 @@ Summary(sk):	Interpreter jazyka Perl pre webov
 Summary(sl):	Vkljuèeni pythonski tolmaè za spletni stre¾nik Apache
 Summary(sv):	En inbyggd Python-interpretator för webbservern Apache
 Name:		apache-mod_%{mod_name}
-Version:	3.0.3
-Release:	2
+Version:	3.1.3
+Release:	5
 License:	Apache Group License
 Group:		Networking/Daemons
-Source0:	http://www.modpython.org/dist/mod_%{mod_name}-%{version}.tgz
-# Source0-md5:	39f8db0bafac6ce241599d2299b5d853
+Source0:	http://www.apache.org/dist/httpd/modpython/mod_%{mod_name}-%{version}.tgz
+# Source0-md5:	2e1983e35edd428f308b0dfeb1c23bfe
 Source1:	%{name}.conf
-Patch0:		%{name}-DESTDIR.patch
-Patch1:		%{name}-no-compile.patch
-Patch2:		%{name}-LONG.patch
+Patch0:		%{name}-lib64.patch
+Patch1:		%{name}-apr-status-is-success.patch
 URL:		http://www.modpython.org/
 BuildRequires:	%{apxs}
+BuildRequires:	apache >= 2.0.44
 BuildRequires:	apache-devel >= 2.0.44
+BuildRequires:	apr-devel >= 1:0.9.4-1
 BuildRequires:	autoconf
 BuildRequires:	automake
+BuildRequires:	flex >= 2.5.31
 BuildRequires:	python-devel >= 2.2
 BuildRequires:	rpm-pythonprov
 Requires(post,preun):	%{apxs}
 Requires:	apache >= 2.0.44
+# apache.py uses pdb module
+Requires:	python-devel-tools
 %pyrequires_eq	python
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		apache_moddir	%(%{apxs} -q LIBEXECDIR)
+%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR)
+%define		_pkglibdir	%(%{apxs} -q LIBEXECDIR)
 
 %description
 Mod_python is a module that embeds the Python language interpreter
@@ -121,9 +124,10 @@ prestandan j
 
 %prep
 %setup -q -n mod_%{mod_name}-%{version}
-%patch0 -p1
+%if "%{_libdir}" == "%{_prefix}/lib64"
+%patch0
+%endif
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__aclocal}
@@ -138,18 +142,13 @@ CFLAGS="-DEAPI %{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{apache_moddir},%{py_sitedir}/mod_%{mod_name}} \
-	$RPM_BUILD_ROOT%{_sysconfdir}/httpd/httpd.conf
+install -d $RPM_BUILD_ROOT%{_pkglibdir} \
+	$RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
-%{__make} install_py_lib \
-	DESTDIR=$RPM_BUILD_ROOT
-
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/httpd.conf/60_mod_python.conf
 
-%py_comp $RPM_BUILD_ROOT%{py_sitedir}
-%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/60_mod_python.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -169,7 +168,8 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc doc-html/* README COPYRIGHT NEWS CREDITS
-%{_sysconfdir}/httpd/httpd.conf/60_mod_python.conf
-%attr(755,root,root) %{apache_moddir}/*
+%{_sysconfdir}/httpd.conf/60_mod_python.conf
+%attr(755,root,root) %{_pkglibdir}/*.so
 %dir %{py_sitedir}/mod_%{mod_name}
+%attr(755,root,root) %{py_sitedir}/mod_%{mod_name}/*.so
 %{py_sitedir}/mod_%{mod_name}/*.py[co]