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

diff --git a/apache-mod_python.spec b/apache-mod_python.spec
index 42a6bc5..fadd099 100644
--- a/apache-mod_python.spec
+++ b/apache-mod_python.spec
@@ -1,9 +1,4 @@
 
-#
-# todo:
-# - configuration file in /etc/httpd/httpd.conf/ _directory_
-#
-
 %include	/usr/lib/rpm/macros.python
 %define		mod_name	python
 %define 	apxs		/usr/sbin/apxs
@@ -18,34 +13,32 @@ Summary(is):	Perl t
 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(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.2
+Version:	3.0.3
+Release:	2
 License:	Apache Group License
 Group:		Networking/Daemons
 Source0:	http://www.modpython.org/dist/mod_%{mod_name}-%{version}.tgz
-#Patch0:		%{name}-shared.patch
-Patch1:		%{name}-DESTDIR.patch
-Patch2:		%{name}-no-compile.patch
-Patch3:		%{name}-cleanup.patch
-# PLD keeps static libs in /usr/lib default python install stores them in .../config/
-Patch4:		%{name}-static-lib-dir-fix.patch
-
+# Source0-md5:	39f8db0bafac6ce241599d2299b5d853
+Source1:	%{name}.conf
+Patch0:		%{name}-DESTDIR.patch
+Patch1:		%{name}-no-compile.patch
+Patch2:		%{name}-LONG.patch
 URL:		http://www.modpython.org/
+BuildRequires:	%{apxs}
+BuildRequires:	apache-devel >= 2.0.44
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	apache-devel >= 2.0.44
 BuildRequires:	python-devel >= 2.2
 BuildRequires:	rpm-pythonprov
-BuildRequires:	%{apxs}
-Prereq:		%{_sbindir}/apxs
-Requires:	apache
+Requires(post,preun):	%{apxs}
+Requires:	apache >= 2.0.44
 %pyrequires_eq	python
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -128,13 +121,9 @@ prestandan j
 
 %prep
 %setup -q -n mod_%{mod_name}-%{version}
-# Patch reverted. Dynamic build makes apache segfault on all my i686 machines
-# No working reports collected on IRC/mailing lists.
-#%patch0 -p1
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
-#%patch3 -p1
-#%patch4 -p1
 
 %build
 %{__aclocal}
@@ -149,9 +138,15 @@ 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},%{py_sitedir}/mod_%{mod_name}} \
+	$RPM_BUILD_ROOT%{_sysconfdir}/httpd/httpd.conf
+
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
+%{__make} install_py_lib \
+	DESTDIR=$RPM_BUILD_ROOT
 
-%{__make} install 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}
@@ -173,8 +168,8 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc doc-html/*
-%doc README COPYRIGHT NEWS CREDITS
+%doc doc-html/* README COPYRIGHT NEWS CREDITS
+%{_sysconfdir}/httpd/httpd.conf/60_mod_python.conf
 %attr(755,root,root) %{apache_moddir}/*
 %dir %{py_sitedir}/mod_%{mod_name}
 %{py_sitedir}/mod_%{mod_name}/*.py[co]