X-Git-Url: https://git.pld-linux.org/?p=packages%2Fapache-mod_python.git;a=blobdiff_plain;f=apache-mod_python.spec;h=c66df8eef0314435a881d8aedd29f7aba4240e08;hp=af65dfc4f595927bd4fccc676a55a3467dc6b95d;hb=151bab84a217d4bd4d4a232f21b07a22edc0947c;hpb=d67ddad70ebde76e93eda3653a95b80a0ccf032b

diff --git a/apache-mod_python.spec b/apache-mod_python.spec
index af65dfc..c66df8e 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,35 +10,45 @@ 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(pl):	Wbudowany interpreter Pythona dla serwera WWW 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
 Summary(sk):	Interpreter jazyka Perl pre webový server Apache
 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.1
-Release:	0.3
+Version:	3.1.4
+Release:	5
 License:	Apache Group License
 Group:		Networking/Daemons
-Source0:	http://www.modpython.org/dist/mod_%{mod_name}-%{version}.tgz
+Source0:	http://www.apache.org/dist/httpd/modpython/mod_%{mod_name}-%{version}.tgz
+# Source0-md5:	607175958137b06bcda91110414c82a1
 Source1:	%{name}.conf
-Patch0:		%{name}-DESTDIR.patch
-Patch1:		%{name}-no-compile.patch
+Patch0:		%{name}-lib64.patch
+Patch1:		%{name}-apr-status-is-success.patch
+Patch2:		%{name}-httpd-not-needed.patch
+Patch3:		%{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
 BuildRequires:	automake
-BuildRequires:	apache-devel >= 2.0.44
+BuildRequires:	flex >= 2.5.31
+BuildRequires:	python
 BuildRequires:	python-devel >= 2.2
 BuildRequires:	rpm-pythonprov
-BuildRequires:	%{apxs}
-Prereq:		%{_sbindir}/apxs
-Requires:	apache >= 2.0.44
-%pyrequires_eq	python
+BuildRequires:	rpmbuild(macros) >= 1.268
+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
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		apache_moddir	%(%{apxs} -q LIBEXECDIR)
+%define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)
 
 %description
 Mod_python is a module that embeds the Python language interpreter
@@ -119,52 +127,47 @@ prestandan j
 
 %prep
 %setup -q -n mod_%{mod_name}-%{version}
-%patch0 -p1
+%if "%{_libdir}" == "%{_prefix}/lib64"
+%patch0
+%endif
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 %{__aclocal}
 %{__autoconf}
-
-# new apache needs it
-CFLAGS="-DEAPI %{rpmcflags}"
 %configure \
 	--with-apxs=%{apxs}
-
 %{__make} dso
 
 %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
-
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf}
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/httpd.conf/60_mod_python.conf
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
 
-%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
+%py_postclean
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ -f /var/lock/subsys/httpd ]; then
-	/etc/rc.d/init.d/httpd restart 1>&2
-fi
+%service -q httpd restart
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/httpd ]; then
-		/etc/rc.d/init.d/httpd restart 1>&2
-	fi
+	%service -q httpd restart
 fi
 
 %files
 %defattr(644,root,root,755)
-%doc doc-html/*
-%doc README COPYRIGHT NEWS CREDITS
-%{_sysconfdir}/httpd/httpd.conf/60_mod_python.conf
-%attr(755,root,root) %{apache_moddir}/*
+%doc doc-html/* README 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
 %dir %{py_sitedir}/mod_%{mod_name}
+%attr(755,root,root) %{py_sitedir}/mod_%{mod_name}/*.so
 %{py_sitedir}/mod_%{mod_name}/*.py[co]