- ver. 3.1.0a

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

diff --git a/apache-mod_python.spec b/apache-mod_python.spec
index 65cc697dcc6ea06bb5ae4b09f2f4def3a73a31aa..f442e51293b4410df15ba95276d3cbcaab5525d2 100644 (file)
--- a/apache-mod_python.spec
+++ b/apache-mod_python.spec
@@ -20,23 +20,27 @@ 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.0.3
+Version:       3.1.0a
 Release:       1
 License:       Apache Group License
 Group:         Networking/Daemons
 Source0:       http://www.modpython.org/dist/mod_%{mod_name}-%{version}.tgz
-# Source0-md5: 39f8db0bafac6ce241599d2299b5d853
+# Source0-md5: 7fa136fafa3f13f84849789a5e388f71
 Source1:       %{name}.conf
 Patch0:                %{name}-DESTDIR.patch
 Patch1:                %{name}-no-compile.patch
+Patch2:                %{name}-flex.patch
+Patch3:                %{name}-python.patch
 URL:           http://www.modpython.org/
+BuildRequires: %{apxs}
+BuildRequires: apache-devel >= 2.0.44
+BuildRequires: apr-devel
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: apache-devel >= 2.0.44
+BuildRequires: flex >= 2.5.31
 BuildRequires: python-devel >= 2.2
 BuildRequires: rpm-pythonprov
-BuildRequires: %{apxs}
-Prereq:                %{_sbindir}/apxs
+Requires(post,preun):  %{apxs}
 Requires:      apache >= 2.0.44
 %pyrequires_eq python
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -122,6 +126,8 @@ prestandan j
 %setup -q -n mod_%{mod_name}-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 %{__aclocal}
@@ -139,8 +145,10 @@ rm -rf $RPM_BUILD_ROOT
 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
+%{__make} install_py_lib \
+       DESTDIR=$RPM_BUILD_ROOT
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/httpd.conf/60_mod_python.conf
 
@@ -164,8 +172,7 @@ 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}