- configration and BR are now separate for apache1 and apache2

Changed files:
    apache-mod_jk.spec -> 1.18

diff --git a/apache-mod_jk.spec b/apache-mod_jk.spec
index 5145f5d3ca9761df15649c1eae7bd81c85c8527b..8598aa3a3ba97b2ab5f9e257885f3519433463c5 100644 (file)
--- a/apache-mod_jk.spec
+++ b/apache-mod_jk.spec
@@ -1,4 +1,5 @@
-%define        apxs    /usr/sbin/apxs
+%define                _apache2        %(rpm -q apache-devel 2> /dev/null | grep -Eq '\\-2\\.[0-9]+\\.' && echo 1 || echo 0)
+%define        apxs            /usr/sbin/apxs
 Summary:       Apache module that handles communication between Tomcat and Apache
 Summary(pl):   Modu³ Apache'a obs³uguj±cy komunikacjê miêdzy Tomcatem a Apachem
 %define                mod_name        jk
@@ -18,9 +19,17 @@ BuildRequires:       automake
 BuildRequires: autoconf
 BuildRequires: perl-base
 BuildRequires:  rpmbuild(macros) >= 1.120
-Requires(post,preun):  %{apxs}
+%if %{_apache2}
+PreReq:         apache >= 2.0.40
+Requires:       apache(modules-api) = %{apache_modules_api}
+%else
+PreReq:         apache(EAPI) < 2.0.0
+PreReq:         apache(EAPI) >= 1.3.9
+Requires(post,preun):   %{apxs}
+Requires(post,preun):   %{__perl}
 Requires(post,preun):  grep
 Requires(preun):       fileutils
+%endif
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     jakarta-tomcat-connectors-jk
 
@@ -59,7 +68,7 @@ export JAVA_HOME
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd,/var/lock/mod_jk}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd/httpd.conf,/var/lock/mod_jk}
 
 cd jk/native
 
@@ -68,27 +77,37 @@ cd jk/native
        APXS="%{apxs} -S LIBEXECDIR=$RPM_BUILD_ROOT$(%{apxs} -q LIBEXECDIR)" \
        libexecdir=$RPM_BUILD_ROOT%{_pkglibdir}
 
+%if %{_apache2}
+echo "LoadModule jk_module     %{_pkglibdir}/mod_jk.so" > $RPM_BUILD_ROOT%{_sysconfdir}/httpd/httpd.conf/80_mod_jk.conf
+cat %{SOURCE1} >> $RPM_BUILD_ROOT%{_sysconfdir}/httpd/httpd.conf/80_mod_jk.conf
+%else
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/mod_jk.conf
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post
+%if ! %{_apache2}
 %{apxs} -e -a -n %{mod_name} %{_pkglibdir}/lib%{mod_name}.so 1>&2
 if [ -f /etc/httpd/httpd.conf ] && ! grep -q "^Include.*mod_jk.conf" /etc/httpd/httpd.conf; then
        echo "Include /etc/httpd/mod_jk.conf" >> /etc/httpd/httpd.conf
 fi
+%endif
 if [ -f /var/lock/subsys/httpd ]; then
        /etc/rc.d/init.d/httpd restart 1>&2
 fi
 
 %preun
 if [ "$1" = "0" ]; then
+%if ! %{_apache2}
        %{apxs} -e -A -n %{mod_name} %{_pkglibdir}/lib%{mod_name}.so 1>&2
        umask 027
        grep -v "^Include.*mod_jk.conf" /etc/httpd/httpd.conf > \
                /etc/httpd/httpd.conf.tmp
        mv -f /etc/httpd/httpd.conf.tmp /etc/httpd/httpd.conf
+%endif
        if [ -f /var/lock/subsys/httpd ]; then
                /etc/rc.d/init.d/httpd restart 1>&2
        fi
@@ -97,6 +116,10 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc jk/native/{README,CHANGES.txt} jk/docs/*
+%if %{_apache2}
+%config(noreplace) %{_sysconfdir}/httpd/httpd.conf/80_mod_jk.conf
+%else
 %config(noreplace) %{_sysconfdir}/httpd/mod_jk.conf
+%endif
 %attr(755,root,root) %{_pkglibdir}/*
 %attr(750,http,http) /var/lock/mod_jk