X-Git-Url: https://git.pld-linux.org/?p=packages%2Fapache-mod_python.git;a=blobdiff_plain;f=apache-mod_python.spec;h=ebe2d49eef8b31e5020a60d0018c784d354485f8;hp=451c6284d22485cd1e779a08ad749d6e417b4ebb;hb=79184ed7aeeb00997dc855ff6b28b978ef99c0e8;hpb=07cf98be6312fa6ae780b6eb8d316aa2bd6db98a

diff --git a/apache-mod_python.spec b/apache-mod_python.spec
index 451c628..ebe2d49 100644
--- a/apache-mod_python.spec
+++ b/apache-mod_python.spec
@@ -1,4 +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
@@ -11,35 +10,43 @@ 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:	2.7.6
-Release:	6
-License:	distributable
+Version:	3.2.10
+Release:	2
+License:	Apache Group License
 Group:		Networking/Daemons
-Source0:	http://www.modpython.org/dist/mod_%{mod_name}-%{version}.tgz
-Patch0:		apache-mod_python-shared.patch
-Patch1:		apache-mod_python-DESTDIR.patch
-Patch2:		apache-mod_python-Makefile-in.patch
+Source0:	http://www.apache.org/dist/httpd/modpython/mod_%{mod_name}-%{version}.tgz
+# Source0-md5:	cc6439f546a6e70cfff7ca51b8c62541
+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
 BuildRequires:	automake
-BuildRequires:	apache-devel
+BuildRequires:	flex >= 2.5.31
+BuildRequires:	python
 BuildRequires:	python-devel >= 2.2
 BuildRequires:	rpm-pythonprov
-BuildRequires:	%{apxs}
-Prereq:		%{_sbindir}/apxs
-Requires:	apache
-%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
@@ -49,13 +56,11 @@ Mod_python brings together the versatility of Python and the power of
 the Apache Web server for a considerable boost in flexibility and
 performance over the traditional CGI approach.
 
-
 %description -l cs
 Balíèek mod_python obsahuje modul, který umo¾ní serveru Apache pøímo
 interpretovat CGI skripty napsané v jazyce Python. To vede k výraznému
 zvý¹ení rychlosti jejich provedení.
 
-
 %description -l de
 Mod_python ist ein Modul, das den Python-Sprachinterpreter innerhalb
 des Servers einbettet und es den Apache-Handlern ermöglicht, in Python
@@ -66,7 +71,6 @@ Leistungsst
 Flexibilität und Leistung gegenüber dem traditionellen CGI-Ansatz
 bedeutet.
 
-
 %description -l es
 Mod_python es un módulo que activa el intérprete de Python en el
 servidor, permitiendo que se escriban gestores para Apache en Python.
@@ -75,7 +79,6 @@ Mod_python proporciona la versatilidad y el poder del servidor web
 Apache para acelerar considerablemente la flexibilidad y prestaciones
 en comparación a una aproximación tradicional con CGI.
 
-
 %description -l fr
 Mod_python est un module qui intègre l'interpréteur de langage Python
 dans le serveur, permettant aux gestionnaires Apache d'être écrits en
@@ -86,7 +89,6 @@ serveur Web Apache de fa
 flexibilité et la performance par rapport à une approche CGI
 traditionnelle.
 
-
 %description -l it
 Mod_python è un modulo che integra nel server l'interprete del
 linguaggio Python, in modo che i programmi di gestione possano essere
@@ -97,7 +99,6 @@ server Web Apache, con un conseguente accrescimento di flessibilit
 un miglioramento notevole nelle prestazioni rispetto all'approccio
 tradizionale CGI.
 
-
 %description -l ja
 Mod_python ¤Ï¥µ¡¼¥Ð¡¼Æâ¤Ë Python
 ¸À¸ì¥¤¥ó¥¿¡¼¥×¥ê¥¿¤òÁȤ߹þ¤ó¤À¥â¥¸¥å¡¼¥ë ¤Ç¤¹¡£¤³¤ì¤Ë¤è¤ê¡¢Apache
@@ -105,7 +106,6 @@ Mod_python 
 Apache Web ¥µ¡¼¥Ð¡¼¤Î¥Ñ¥ï¡¼¤òÁȤ߹ç¤ï¤»¤ë ¤³¤È¤Ë¤è¤ê¡¢½¾Íè¤Î CGI
 ¥¢¥×¥í¡¼¥Á¤«¤é½ÀÆðÀ­¤È¥Ñ¥Õ¥©¡¼¥Þ¥ó¥¹¤òÂçÉý¤Ë¸þ¾å¤µ¤»¤Þ¤¹¡£
 
-
 %description -l pl
 mod_python jest modu³em osadzaj±cym interpreter jêzyka Python w
 serwerze WWW Apache, umo¿liwiaj±c mu obs³ugê kodu napisanego w
@@ -115,7 +115,6 @@ mod_python 
 WWW, co daje zwiêkszon± elastyczno¶æ i zauwa¿aln± poprawê wydajno¶ci w
 stosunku do tradycyjnego rozwi±zania opartego na CGI.
 
-
 %description -l sv
 Mod_python är en modul som bygger in en interpretator för språket
 Python i servern, och låter Apach-hanterare skrivas i Python.
@@ -124,52 +123,45 @@ Mod_python sammanf
 webbservern Apache till en avsevärd ökning av flexibiliteten och
 prestandan jämfört med den traditionella CGI-metoden.
 
-
 %prep
 %setup -q -n mod_%{mod_name}-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
-aclocal
-autoconf
-
-# new apache needs it
-CFLAGS="-DEAPI %{rpmcflags}"
+%{__aclocal}
+%{__autoconf}
 %configure \
 	--with-apxs=%{apxs}
-
 %{__make} dso
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{apache_moddir},%{py_sitedir}/mod_%{mod_name}}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf}
 
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
 
-gzip -9nf README COPYRIGHT NEWS CREDITS
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/60_mod_python.conf
+%py_postclean
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%{_sbindir}/apxs -e -a -n %{mod_name} %{apache_moddir}/mod_%{mod_name}.so 1>&2
-if [ -f /var/lock/subsys/httpd ]; then
-	/etc/rc.d/init.d/httpd restart 1>&2
-fi
+%service -q httpd restart
 
-%preun
+%postun
 if [ "$1" = "0" ]; then
-	%{_sbindir}/apxs -e -A -n %{mod_name} %{apache_moddir}/mod_%{mod_name}.so 1>&2
-	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}.gz
-%attr(755,root,root) %{apache_moddir}/*
-%{py_sitedir}/mod_%{mod_name}
+%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]