X-Git-Url: https://git.pld-linux.org/?p=packages%2Fapache-mod_python.git;a=blobdiff_plain;f=apache-mod_python.spec;h=44bb78616d0e58b20a06c9e0d82f72018aeeffa5;hp=f53d69f1d03b63a1e6e4791ea1b645872fc44947;hb=7caf45e1f67b02e6237a1055aa46c12748e81a37;hpb=3409c261b40b14dde555dddce4a3f624cb73d7ef

diff --git a/apache-mod_python.spec b/apache-mod_python.spec
index f53d69f..44bb786 100644
--- a/apache-mod_python.spec
+++ b/apache-mod_python.spec
@@ -13,7 +13,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
@@ -21,13 +21,14 @@ 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.1.2b
-Release:	1
+Version:	3.1.3
+Release:	3
 License:	Apache Group License
 Group:		Networking/Daemons
 Source0:	http://www.apache.org/dist/httpd/modpython/mod_%{mod_name}-%{version}.tgz
-# Source0-md5:	0f561ba64e08f2990c9f22a0527ec5b5
+# Source0-md5:	2e1983e35edd428f308b0dfeb1c23bfe
 Source1:	%{name}.conf
+Patch0:		%{name}-lib64.patch
 URL:		http://www.modpython.org/
 BuildRequires:	%{apxs}
 BuildRequires:	apache-devel >= 2.0.44
@@ -39,6 +40,8 @@ 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)
 
@@ -121,6 +124,9 @@ prestandan j
 
 %prep
 %setup -q -n mod_%{mod_name}-%{version}
+%if "%{_libdir}" == "%{_prefix}/lib64"
+%patch0
+%endif
 
 %build
 %{__aclocal}
@@ -135,19 +141,14 @@ CFLAGS="-DEAPI %{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{apache_moddir},%{py_sitedir}/mod_%{mod_name}} \
+install -d $RPM_BUILD_ROOT%{apache_moddir} \
 	$RPM_BUILD_ROOT%{_sysconfdir}/httpd/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}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -169,4 +170,5 @@ fi
 %{_sysconfdir}/httpd/httpd.conf/60_mod_python.conf
 %attr(755,root,root) %{apache_moddir}/*
 %dir %{py_sitedir}/mod_%{mod_name}
+%attr(755,root,root) %{py_sitedir}/mod_%{mod_name}/*.so
 %{py_sitedir}/mod_%{mod_name}/*.py[co]