- release 1: fixed build, cleanups, unifications

- dropped apache2 bcond (apache1-*.spec if you need it)

Changed files:
    apache-mod_jk.spec -> 1.23

diff --git a/apache-mod_jk.spec b/apache-mod_jk.spec
index 6c56bd7a5fd95a34942d4d8fa74d166693c7637f..af25392e2e2c16f2524e0f222dc2d48d3e3825bb 100644 (file)
--- a/apache-mod_jk.spec
+++ b/apache-mod_jk.spec
@@ -1,11 +1,10 @@
-%define                _apache2        %(rpm -q apache-devel 2> /dev/null | grep -Eq '\\-2\\.[0-9]+\\.' && echo 1 || echo 0)
+%define                mod_name        jk
 %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
 Name:          apache-mod_%{mod_name}
 Version:       1.2.4
-Release:       0.1
+Release:       1
 License:       Apache
 Group:         Networking/Daemons
 Source0:       http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/release/v%{version}/src/jakarta-tomcat-connectors-jk-%{version}-src.tar.gz
@@ -17,24 +16,14 @@ BuildRequires:      libtool
 BuildRequires: automake
 BuildRequires: autoconf
 BuildRequires: perl-base
-%if %{_apache2}
 BuildRequires: rpmbuild(macros) >= 1.120
 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
 
 %define                _pkglibdir      %(%{apxs} -q LIBEXECDIR)
-%define                _javalibdir     /usr/share/java
-%define                _tomcatdir      %{_libdir}/tomcat
+%define                _sysconfdir     %(%{apxs} -q SYSCONFDIR)
 
 %description
 JK is a replacement to the elderly mod_jserv. It was a completely new
@@ -62,49 +51,33 @@ export JAVA_HOME
        --with-apxs=%{apxs} \
        --with-java-home=${JAVA_HOME}
 
-%{__make}
+%{__make} \
+       EXTRA_CFLAGS="`apr-config --includes` `apu-config --includes`"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd/httpd.conf,/var/lock/mod_jk}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf,/var/lock/mod_jk}
 
 cd jk/native
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
-       APXS="%{apxs} -S LIBEXECDIR=$RPM_BUILD_ROOT$(%{apxs} -q LIBEXECDIR)" \
+       APXS="%{apxs} -S LIBEXECDIR=$RPM_BUILD_ROOT%{_pkglibdir}" \
        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
+echo "LoadModule jk_module     %{_pkglibdir}/mod_jk.so" > $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/80_mod_jk.conf
+cat %{SOURCE1} >> $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/80_mod_jk.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%if ! %{_apache2}
-%{apxs} -e -a -n %{mod_name} %{_pkglibdir}/mod_%{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}/mod_%{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
@@ -113,10 +86,6 @@ 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
+%config(noreplace) %{_sysconfdir}/httpd.conf/80_mod_jk.conf
 %attr(755,root,root) %{_pkglibdir}/*
 %attr(750,http,http) /var/lock/mod_jk