%define mod_name python
-%define apxs /usr/sbin/apxs
+%define apxs /usr/sbin/apxs
Summary: An embedded Python interpreter for the Apache Web server
-Summary(cs.UTF-8): Vestavěný interpret Pythonu pro WWW server Apache
-Summary(da.UTF-8): En indbygget Python-fortolker for webtjeneren Apache
-Summary(de.UTF-8): Ein eingebetteter Python-Interpreter für den Apache Web-Server
-Summary(es.UTF-8): Intérprete Perl para el servidor Web Apache
-Summary(fr.UTF-8): Interpréteur Python intégré pour le serveur Web Apache
-Summary(id.UTF-8): Interpreter Perl untuk web server Apache
-Summary(is.UTF-8): Perl túlkur fyrir Apache vefþjóninn
-Summary(it.UTF-8): Interprete Python integrato per il server Web Apache
-Summary(ja.UTF-8): Apache Web サーバー用の組込み Perl インタープリタ
-Summary(nb.UTF-8): En Python-fortolker for webtjeneren Apache
-Summary(pl.UTF-8): Wbudowany interpreter języka Python dla serwera WWW Apache
-Summary(pt.UTF-8): Um interpretador de Perl embebido para o servidor Web Apache
-Summary(ru.UTF-8): Встроенный интерпретатор Perl для WWW-сервера Apache
-Summary(sk.UTF-8): Interpreter jazyka Perl pre webový server Apache
-Summary(sl.UTF-8): Vključeni pythonski tolmač za spletni strežnik Apache
-Summary(sv.UTF-8): En inbyggd Python-interpretator för webbservern Apache
+Summary(cs.UTF-8): Vestavěný interpret Pythonu pro WWW server Apache
+Summary(da.UTF-8): En indbygget Python-fortolker for webtjeneren Apache
+Summary(de.UTF-8): Ein eingebetteter Python-Interpreter für den Apache Web-Server
+Summary(es.UTF-8): Intérprete Perl para el servidor Web Apache
+Summary(fr.UTF-8): Interpréteur Python intégré pour le serveur Web Apache
+Summary(id.UTF-8): Interpreter Perl untuk web server Apache
+Summary(is.UTF-8): Perl túlkur fyrir Apache vefþjóninn
+Summary(it.UTF-8): Interprete Python integrato per il server Web Apache
+Summary(ja.UTF-8): Apache Web サーバー用の組込み Perl インタープリタ
+Summary(nb.UTF-8): En Python-fortolker for webtjeneren Apache
+Summary(pl.UTF-8): Wbudowany interpreter języka Python dla serwera WWW Apache
+Summary(pt.UTF-8): Um interpretador de Perl embebido para o servidor Web Apache
+Summary(ru.UTF-8): Встроенный интерпретатор Perl для WWW-сервера Apache
+Summary(sk.UTF-8): Interpreter jazyka Perl pre webový server Apache
+Summary(sl.UTF-8): Vključeni pythonski tolmač za spletni strežnik Apache
+Summary(sv.UTF-8): En inbyggd Python-interpretator för webbservern Apache
Name: apache-mod_%{mod_name}
-Version: 3.2.10
-Release: 2
-License: Apache Group License
-Group: Networking/Daemons
-Source0: http://www.apache.org/dist/httpd/modpython/mod_%{mod_name}-%{version}.tgz
-# Source0-md5: cc6439f546a6e70cfff7ca51b8c62541
+Version: 3.4.1
+Release: 1
+License: Apache
+Group: Networking/Daemons/HTTP
+Source0: http://dist.modpython.org/dist/mod_%{mod_name}-%{version}.tgz
+# Source0-md5: d27804354f1808ad55d432fd76ed9d05
Source1: %{name}.conf
Patch0: %{name}-httpd-not-needed.patch
-Patch1: %{name}-ldflags.patch
URL: http://www.modpython.org/
-BuildRequires: %{apxs}
BuildRequires: apache-devel >= 2.0.52-7
BuildRequires: apr-devel >= 1:1.0.0
BuildRequires: autoconf
%requires_eq python-libs
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define _pkglibdir %(%{apxs} -q LIBEXECDIR 2>/dev/null)
-%define _sysconfdir %(%{apxs} -q SYSCONFDIR 2>/dev/null)
+%define apachelibdir %(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define apacheconfdir %(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
%description
Mod_python is a module that embeds the Python language interpreter
%prep
%setup -q -n mod_%{mod_name}-%{version}
%patch0 -p1
-%patch1 -p1
%build
%{__aclocal}
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf}
+install -d $RPM_BUILD_ROOT{%{apachelibdir},%{apacheconfdir},%{_bindir}}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/60_mod_python.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{apacheconfdir}/60_mod_python.conf
%py_postclean
%clean
%files
%defattr(644,root,root,755)
-%doc doc-html/* README COPYRIGHT NEWS CREDITS
+%doc doc-html/* README.md COPYRIGHT NEWS CREDITS
%doc examples
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
-%attr(755,root,root) %{_pkglibdir}/*.so
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{apacheconfdir}/*_mod_%{mod_name}.conf
+%attr(755,root,root) %{_bindir}/mod_python
+%attr(755,root,root) %{apachelibdir}/*.so
%dir %{py_sitedir}/mod_%{mod_name}
+%if "%{py_ver}" > "2.4"
+%{py_sitedir}/mod_%{mod_name}-*.egg-info
+%endif
%attr(755,root,root) %{py_sitedir}/mod_%{mod_name}/*.so
%{py_sitedir}/mod_%{mod_name}/*.py[co]