- optional patch to use /usr/lib64 instead of /usr/lib - allow build on amd64

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

diff --git a/apache-mod_python.spec b/apache-mod_python.spec
index f442e51293b4410df15ba95276d3cbcaab5525d2..5284de29bff2e4c58f5c53b7f74f4c0a30f176b5 100644 (file)
--- a/apache-mod_python.spec
+++ b/apache-mod_python.spec
@@ -2,6 +2,7 @@
 %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
 Summary(cs):   Vestavìný interpret Pythonu pro WWW server Apache
 Summary(da):   En indbygget Python-fortolker for webtjeneren Apache
@@ -20,21 +21,19 @@ Summary(sk):        Interpreter jazyka Perl pre webov
 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.1.0a
-Release:       1
+Version:       3.1.2b
+Release:       3
 License:       Apache Group License
 Group:         Networking/Daemons
-Source0:       http://www.modpython.org/dist/mod_%{mod_name}-%{version}.tgz
-# Source0-md5: 7fa136fafa3f13f84849789a5e388f71
+Source0:       http://www.apache.org/dist/httpd/modpython/mod_%{mod_name}-%{version}.tgz
+# Source0-md5: 0f561ba64e08f2990c9f22a0527ec5b5
 Source1:       %{name}.conf
-Patch0:                %{name}-DESTDIR.patch
-Patch1:                %{name}-no-compile.patch
-Patch2:                %{name}-flex.patch
-Patch3:                %{name}-python.patch
+Patch0:                %{name}-right-mutex-perms.patch
+Patch1:                %{name}-lib64.patch
 URL:           http://www.modpython.org/
 BuildRequires: %{apxs}
 BuildRequires: apache-devel >= 2.0.44
-BuildRequires: apr-devel
+BuildRequires: apr-devel >= 1:0.9.4-1
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: flex >= 2.5.31
@@ -125,9 +124,9 @@ prestandan j
 %prep
 %setup -q -n mod_%{mod_name}-%{version}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%if "%{_libdir}" == "%{_prefix}/lib64"
+%patch1
+%endif
 
 %build
 %{__aclocal}