X-Git-Url: https://git.pld-linux.org/?p=packages%2Fapache-mod_python.git;a=blobdiff_plain;f=apache-mod_python.spec;h=28cdbaf99e79f9a91bddc55ef3ad5f5d84218d46;hp=a8edc75eefe4e541cc5aec15e32927a25671ac26;hb=594e0805eae2b9ef0e969121cf0c9250eadc3125;hpb=d94e9fa1664e0e5b2a1e99a70af9adac8599caed;ds=sidebyside

diff --git a/apache-mod_python.spec b/apache-mod_python.spec
index a8edc75..28cdbaf 100644
--- a/apache-mod_python.spec
+++ b/apache-mod_python.spec
@@ -20,11 +20,11 @@ Summary(sl):	Vklju
 Summary(sv):	En inbyggd Python-interpretator för webbservern Apache
 Name:		apache-mod_%{mod_name}
 Version:	2.7.8
-Release:	3
+Release:	4
 License:	distributable
 Group:		Networking/Daemons
 Source0:	http://www.modpython.org/dist/mod_%{mod_name}-%{version}.tgz
-Patch0:		%{name}-shared.patch
+#Patch0:		%{name}-shared.patch
 Patch1:		%{name}-DESTDIR.patch
 Patch2:		%{name}-Makefile-in.patch
 Patch3:		%{name}-cleanup.patch
@@ -33,6 +33,8 @@ BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	apache-devel
 BuildRequires:	python-devel >= 2.2
+# Necessary /usr/lib/python2.2/config/libpython2.2.a -> /usr/lib/libpython2.2.a added in 2.2.1-20
+BuildRequires:  python-static >= 2.2.1-20
 BuildRequires:	rpm-pythonprov
 BuildRequires:	%{apxs}
 Prereq:		%{_sbindir}/apxs
@@ -119,13 +121,15 @@ prestandan j
 
 %prep
 %setup -q -n mod_%{mod_name}-%{version}
-%patch0 -p1
+# Patch reverted. Dynamic build makes apache segfault on all my i686 machines
+# No working reports collected on IRC/mailing lists.
+#%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 
 %build
-aclocal
+%{__aclocal}
 %{__autoconf}
 
 # new apache needs it
@@ -141,20 +145,18 @@ install -d $RPM_BUILD_ROOT{%{apache_moddir},%{py_sitedir}/mod_%{mod_name}}
 
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
-gzip -9nf README COPYRIGHT NEWS CREDITS
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%{_sbindir}/apxs -e -a -n %{mod_name} %{apache_moddir}/mod_%{mod_name}.so 1>&2
+%{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
 
 %preun
 if [ "$1" = "0" ]; then
-	%{_sbindir}/apxs -e -A -n %{mod_name} %{apache_moddir}/mod_%{mod_name}.so 1>&2
+	%{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
@@ -163,6 +165,6 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc doc-html/*
-%doc {README,COPYRIGHT,NEWS,CREDITS}.gz
+%doc README COPYRIGHT NEWS CREDITS
 %attr(755,root,root) %{apache_moddir}/*
 %{py_sitedir}/mod_%{mod_name}