- fix build for apache 2.2

- fixed duplicate files
- rel 3

Changed files:
    apache-mod_suphp.spec -> 1.30

diff --git a/apache-mod_suphp.spec b/apache-mod_suphp.spec
index 62bc9049d14e502f9e4210341603164e045c206d..ee6b5049801f1d2afd08518e4c60d7f1f03b1b96 100644 (file)
--- a/apache-mod_suphp.spec
+++ b/apache-mod_suphp.spec
@@ -1,7 +1,6 @@
 #
 # Available build options:
-%bcond_with    checkpath       # enable check if php execution is within
-                               # DOCUMENT_ROOT of the vhost
+%bcond_with    checkpath       # enable check if php execution is within DOCUMENT_ROOT of the vhost
 #
 %define                mod_name        suphp
 %define        apxs            /usr/sbin/apxs
@@ -9,7 +8,7 @@ Summary:        Apache module: suPHP - execute PHP scripts with the permissions of thei
 Summary(pl):   Modu³ do apache: suPHP - uruchamianie skryptów PHP z uprawnieniami ich w³a¶cicieli
 Name:          apache-mod_%{mod_name}
 Version:       0.6.0
-Release:       1
+Release:       3
 License:       GPL
 Group:         Networking/Daemons
 Source0:       http://www.suphp.org/download/%{mod_name}-%{version}.tar.gz
@@ -18,21 +17,21 @@ Source1:    %{name}.logrotate
 Source2:       %{name}.conf
 Patch0:                %{name}-apr.patch
 Patch1:                %{name}-compiler-flags.patch
+Patch2:                %{name}-apache_version.patch
 URL:           http://www.suphp.org/
 BuildRequires: %{apxs}
-# FIXME! (needs /usr/sbin/httpd.prefork)
-BuildRequires: apache
 BuildRequires: apache-devel >= 2.0.52-2
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libstdc++-devel
 Requires(post,preun):  %{apxs}
+Requires:      apache(modules-api) = %apache_modules_api
 Requires:      apache >= 2.0.52-2
 Requires:      php-cgi
 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
 suPHP is a tool for executing PHP scripts with the permissions of
@@ -50,12 +49,14 @@ modu
 %setup -q -n %{mod_name}-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__aclocal}
 %{__autoconf}
 %{__autoheader}
 chmod 755 configure
+export APACHE_VERSION=$(rpm -q --qf '%%{version}' apache-apxs)
 %configure \
        %{?with_checkpath: --enable-checkpath} \
        %{!?with_checkpath: --disable-checkpath} \
@@ -91,14 +92,12 @@ install doc/suphp.conf-example $RPM_BUILD_ROOT%{_datadir}/suphp
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%{apxs} -e -a -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
 if [ -f /var/lock/subsys/httpd ]; then
        /etc/rc.d/init.d/httpd restart 1>&2
 fi
 
 %preun
 if [ "$1" = "0" ]; then
-       %{apxs} -e -A -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
        if [ -f /var/lock/subsys/httpd ]; then
                /etc/rc.d/init.d/httpd restart 1>&2
        fi
@@ -109,7 +108,7 @@ fi
 %doc README AUTHORS ChangeLog doc
 %attr(4755,root,root) %{_sbindir}/suphp
 %attr(755,root,root) %{_pkglibdir}/*
-%attr(755,root,root) %{_datadir}/suphp
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/*
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*
+%dir %{_datadir}/suphp
 %{_datadir}/suphp/*