- also works with apache2 (todo: apache 2 configuration file)

Changed files:
    apache-mod_suphp.spec -> 1.9

diff --git a/apache-mod_suphp.spec b/apache-mod_suphp.spec
index d4d073a7ff4f7b872094f9b2b54d2dba85b2235c..2fad032c48747e18855051f4944bd932611b9ad3 100644 (file)
--- a/apache-mod_suphp.spec
+++ b/apache-mod_suphp.spec
@@ -5,11 +5,12 @@
 #
 %define                mod_name        suphp
 %define        apxs            /usr/sbin/apxs
+%define        _apache1        %(rpm -q apache-devel 2> /dev/null | grep -Eq '\\-2\\.[0-9]+\\.' && echo 0 || echo 1)
 Summary:       Apache module: suPHP - execute PHP scripts with the permissions of their owners
 Summary(pl):   Modu³ do apache: suPHP - uruchamianie skryptów PHP z uprawnieniami ich w³a¶cicieli
 Name:          apache-mod_%{mod_name}
 Version:       0.5
-Release:       0.1
+Release:       0.2
 License:       GPL
 Group:         Networking/Daemons
 Source0:       http://www.suphp.org/download/%{mod_name}-%{version}.tar.gz     
@@ -17,7 +18,7 @@ Source0:      http://www.suphp.org/download/%{mod_name}-%{version}.tar.gz
 Source1:       apache-mod_suphp.logrotate
 URL:           http://www.suphp.org/
 BuildRequires: %{apxs}
-BuildRequires: apache-devel <= 1.4
+BuildRequires: apache-devel
 BuildRequires: autoconf
 BuildRequires: automake
 Requires(post,preun):  %{apxs}
@@ -63,7 +64,11 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sbindir},%{_pkglibdir}}
 
 install src/suphp $RPM_BUILD_ROOT%{_sbindir}
+%if %{_apache1}
 install src/apache/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
+%else
+install src/apache2/.libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
+%endif
 
 install -d $RPM_BUILD_ROOT/etc/logrotate.d
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/logrotate.d/apache-mod_suphp
@@ -71,6 +76,7 @@ install %{SOURCE1} $RPM_BUILD_ROOT/etc/logrotate.d/apache-mod_suphp
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%if %{_apache1}
 %post
 %{apxs} -e -a -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
 if [ -f /var/lock/subsys/httpd ]; then
@@ -84,6 +90,7 @@ if [ "$1" = "0" ]; then
                /etc/rc.d/init.d/httpd restart 1>&2
        fi
 fi
+%endif
 
 %files
 %defattr(644,root,root,755)