- mod_python 3 config for apache 2.

[packages/apache-mod_python.git] / apache-mod_python.spec

diff --git a/apache-mod_python.spec b/apache-mod_python.spec
index 948a0437c7ce32497a26e69796eff98c50a6e9b3..0cc45aac2caa12d01a29ffd7c6c732a39c970cb8 100644 (file)
--- a/apache-mod_python.spec
+++ b/apache-mod_python.spec
@@ -20,19 +20,23 @@ 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:       5
 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
+# PLD keeps static libs in /usr/lib default python install stores them in .../config/
+Patch4:        %{name}-static-lib-dir-fix.patch
+
 URL:           http://www.modpython.org/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: apache-devel
 BuildRequires: python-devel >= 2.2
+BuildRequires:  python-static >= 2.2
 BuildRequires: rpm-pythonprov
 BuildRequires: %{apxs}
 Prereq:                %{_sbindir}/apxs
@@ -119,13 +123,16 @@ 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
+%patch4 -p1
 
 %build
-aclocal
+%{__aclocal}
 %{__autoconf}
 
 # new apache needs it
@@ -141,8 +148,6 @@ 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
 
@@ -163,6 +168,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}