- rel 4 (rebuild with new apache)

Changed files:
    apache-mod_python.spec -> 1.74

diff --git a/apache-mod_python.spec b/apache-mod_python.spec
index 545fd13e39c6cd9afbfc16c72fc1e84366f89ee7..99ab24e6fd629514b09fce4a5d403415ebd937fa 100644 (file)
--- a/apache-mod_python.spec
+++ b/apache-mod_python.spec
@@ -19,7 +19,7 @@ Summary(sl):  Vklju
 Summary(sv):   En inbyggd Python-interpretator för webbservern Apache
 Name:          apache-mod_%{mod_name}
 Version:       3.1.4
-Release:       3
+Release:       4
 License:       Apache Group License
 Group:         Networking/Daemons
 Source0:       http://www.apache.org/dist/httpd/modpython/mod_%{mod_name}-%{version}.tgz
@@ -30,7 +30,6 @@ Patch1:               %{name}-apr-status-is-success.patch
 Patch2:                %{name}-httpd-not-needed.patch
 URL:           http://www.modpython.org/
 BuildRequires: %{apxs}
-#BuildRequires:        apache >= 2.0.44
 BuildRequires: apache-devel >= 2.0.52-7
 BuildRequires: apr-devel >= 1:1.0.0
 BuildRequires: autoconf
@@ -38,9 +37,8 @@ BuildRequires:        automake
 BuildRequires: flex >= 2.5.31
 BuildRequires: python
 BuildRequires: python-devel >= 2.2
-# without rpm-pythonprov build fails due to missing /usr/lib/rpm/pythondeps.sh 
 BuildRequires: rpm-pythonprov
-Requires(post,preun):  %{apxs}
+Requires:      apache(modules-api) = %apache_modules_api
 Requires:      apache >= 2.0.52-7
 Requires:      apr >= 1:1.0.0
 # apache.py uses pdb module
@@ -48,8 +46,8 @@ Requires:     python-devel-tools
 %pyrequires_eq python
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _sysconfdir     %(%{apxs} -q SYSCONFDIR)
-%define                _pkglibdir      %(%{apxs} -q LIBEXECDIR)
+%define                _pkglibdir      %(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define                _sysconfdir     %(%{apxs} -q SYSCONFDIR 2>/dev/null)
 
 %description
 Mod_python is a module that embeds the Python language interpreter
@@ -147,8 +145,7 @@ CFLAGS="-DEAPI %{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_pkglibdir} \
-       $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT