- cleanups.

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

diff --git a/apache-mod_python.spec b/apache-mod_python.spec
index 922d1ca67795d700de9ce4e2908957ed1d14a9d9..809ea872f8385d850ba69fdc85953b71408a05c0 100644 (file)
--- a/apache-mod_python.spec
+++ b/apache-mod_python.spec
@@ -1,29 +1,31 @@
+%include       /usr/lib/rpm/macros.python
 %define                mod_name        python
 Summary:       A Python for the Apache Web server
 Summary(pl):   Python dla serwera WWW Apache
 Name:          apache-mod_%{mod_name}
 Version:       2.7.6
-Release:       1
+Release:       4
 License:       distributable
 Group:         Networking/Daemons
 Group(de):     Netzwerkwesen/Server
+Group(es):     Red/Servidores
+Group(fr):     Réseau/Serveurs
 Group(pl):     Sieciowe/Serwery
+Group(pt):     Rede/Server
 Source0:       http://www.modpython.org/dist/mod_%{mod_name}-%{version}.tgz
 Patch0:                apache-mod_python-shared.patch
 Patch1:                apache-mod_python-DESTDIR.patch
 URL:           http://www.modpython.org/
-Requires:      apache
-%requires_eq   python
 BuildRequires: autoconf
 BuildRequires: apache
 BuildRequires: apache-devel
-BuildRequires: python-devel
+BuildRequires: python-devel >= 2.2
 BuildRequires: rpm-pythonprov
+Requires:      apache
+%requires_eq   python
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define        apache_moddir  %(/usr/sbin/apxs -q LIBEXECDIR)
-
-%include /usr/lib/rpm/macros.python
+%define                apache_moddir   %(/usr/sbin/apxs -q LIBEXECDIR)
 
 %description
 mod_python allows embedding Python within the Apache Web server for a
@@ -46,7 +48,12 @@ Uwaga: ta wersja nadal powinna by
 
 %build
 autoconf
-%configure --with-apxs=/usr/sbin/apxs
+
+# new apache needs it
+CFLAGS="-DEAPI %{rpmcflags}"
+%configure \
+       --with-apxs=/usr/sbin/apxs
+ 
 %{__make} dso
 
 %install
@@ -76,7 +83,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc doc/*
+%doc doc-html/*
 %doc {README,COPYRIGHT,NEWS,CREDITS}.gz
 %attr(755,root,root) %{apache_moddir}/*
 %{py_sitedir}/mod_%{mod_name}