# TODO:
-# - fix looking for /usr/lib/apache/lib/apache/build/config_vars.mk....
# - logrotate file
-# /TODO
%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
Name: apache-mod_%{mod_name}
-Version: 1.2.13
+Version: 1.2.15
Release: 0.1
-License: Apache
+License: Apache License 2.0
Group: Networking/Daemons
-Source0: http://www.apache.org/dist/jakarta/tomcat-connectors/jk/source/jk-%{version}/jakarta-tomcat-connectors-%{version}-src.tar.gz
-# Source0-md5: 028e39a84b81847b62d07ed9cd9427ae
+Source0: http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-%{version}/jakarta-tomcat-connectors-%{version}-src.tar.gz
+# Source0-md5: b815a666329f7de097775113547539e0
Source1: %{name}.conf
-URL: http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/doc/
+Patch0: %{name}-libtool.patch
+URL: http://tomcat.apache.org/connectors-doc/
BuildRequires: %{apxs}
-BuildRequires: apache-devel >= 2.0.40
+BuildRequires: apache-devel >= 2.2.0-6.1
BuildRequires: apr-devel >= 1:1.0
BuildRequires: apr-util-devel >= 1:1.0
BuildRequires: autoconf
BuildRequires: libtool
BuildRequires: perl-base
BuildRequires: rpmbuild(macros) >= 1.120
-PreReq: apache >= 2.0.40
Requires: apache(modules-api) = %{apache_modules_api}
Obsoletes: jakarta-tomcat-connectors-jk
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define _pkglibdir %(%{apxs} -q LIBEXECDIR)
-%define _sysconfdir %(%{apxs} -q SYSCONFDIR)
+%define _pkglibdir %(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define _sysconfdir %(%{apxs} -q SYSCONFDIR 2>/dev/null)
%description
JK is a replacement to the elderly mod_jserv. It was a completely new
%prep
%setup -q -n jakarta-tomcat-connectors-%{version}-src
+%patch0 -p1
%build
cd jk/native
-
-if [ -z "$JAVA_HOME" ]; then
- JAVA_HOME=%{_libdir}/java
-fi
-export JAVA_HOME
-
-# ugly speed hack
-sed -i 's#`.*exp_installbuilddir`#/usr/lib/apache/build/#' configure.in
-
-./buildconf.sh
-
+%{__libtoolize}
+%{__aclocal}
+%{__autoheader}
+%{__automake}
+%{__autoconf}
%configure \
- --enable-EAPI \
--with-apxs=%{apxs} \
- --with-java-home=${JAVA_HOME}
-
-%{__make} \
- EXTRA_CFLAGS="`apr-1-config --includes` `apu-1-config --includes`"
+ --with-java-home="${JAVA_HOME:-%{_libdir}/java}"
+%{__make}
%install
rm -rf $RPM_BUILD_ROOT
APXS="%{apxs} -S LIBEXECDIR=$RPM_BUILD_ROOT%{_pkglibdir}" \
libexecdir=$RPM_BUILD_ROOT%{_pkglibdir}
-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
-
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/80_mod_jk.conf
touch $RPM_BUILD_ROOT/var/log/httpd/mod_jk.log
%clean
%files
%defattr(644,root,root,755)
%doc jk/native/{README,CHANGES}
-%config(noreplace) %{_sysconfdir}/httpd.conf/80_mod_jk.conf
-%attr(755,root,root) %{_pkglibdir}/*
-%attr(750,http,http) /var/lock/mod_jk
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
+%attr(755,root,root) %{_pkglibdir}/*.so
+%attr(770,root,http) /var/lock/mod_jk
%attr(640,root,logs) %ghost /var/log/httpd/mod_jk.log