-%define apxs /usr/sbin/apxs
+# TODO:
+# - logrotate file
+%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 apache_version 1.3.27
-%define mod_name jk
Name: apache-mod_%{mod_name}
-Version: 1.2.4
+Version: 1.2.15
Release: 0.1
-License: Apache
+License: Apache License 2.0
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
-# Source0-md5: 9641a826b87e64692377161215cfd5e1
+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(EAPI)-devel >= %{apache_version}
-BuildRequires: jakarta-ant >= 1.5.1
-BuildRequires: jakarta-tomcat
-Requires(post,preun): %{apxs}
-Requires(post,preun): grep
-Requires(preun): fileutils
-Requires: apache(EAPI) >= %{apache_version}
-BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+BuildRequires: apache-devel >= 2.2.0-6.1
+BuildRequires: apr-devel >= 1:1.0
+BuildRequires: apr-util-devel >= 1:1.0
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
+BuildRequires: perl-base
+BuildRequires: rpmbuild(macros) >= 1.120
+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 _javalibdir /usr/share/java
-%define _tomcatdir %{_libdir}/tomcat
+%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
Tomcat-Apache obs³uguj±c± komunikacjê miêdzy Tomcatem a Apachem.
%prep
-%setup -q -n jakarta-tomcat-connectors-jk-%{version}-src
+%setup -q -n jakarta-tomcat-connectors-%{version}-src
+%patch0 -p1
%build
-cd jk
-
-if [ -z "$JAVA_HOME" ]; then
- JAVA_HOME=/usr/lib/java
-fi
-ANT_HOME=%{_javalibdir}
-export JAVA_HOME ANT_HOME
-
-cat > build.properties << EOF
-#tomcat5.home=%{_libdir}/tomcat
-tomcat40.home=%{_tomcatdir}
-#tomcat41.home==%{_libdir}/tomcat
-#apache2.home=/opt/apache2
-apache13.home=%{_libdir}
-apr.home=\${apache2.home}
-apr.include=%{_includedir}/apache
-apr-util.include=%{_includedir}/apache
-apr.lib=%{_libdir}
-apr-util.lib=%{_libdir}
-#apache2.lib=%{_libdir}
-so.debug=false
-so.optimize=true
-so.profile=false
-EOF
-
-ant native
+cd jk/native
+%{__libtoolize}
+%{__aclocal}
+%{__autoheader}
+%{__automake}
+%{__autoconf}
+%configure \
+ --with-apxs=%{apxs} \
+ --with-java-home="${JAVA_HOME:-%{_libdir}/java}"
+%{__make}
%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.conf,/var/{lock/mod_jk,log/httpd}}
+
+%{__make} -C jk/native install \
+ DESTDIR=$RPM_BUILD_ROOT \
+ APXS="%{apxs} -S LIBEXECDIR=$RPM_BUILD_ROOT%{_pkglibdir}" \
+ libexecdir=$RPM_BUILD_ROOT%{_pkglibdir}
-install lib%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/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
rm -rf $RPM_BUILD_ROOT
%post
-%{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
if [ -f /var/lock/subsys/httpd ]; then
/etc/rc.d/init.d/httpd restart 1>&2
fi
+if [ ! -f /var/log/httpd/mod_jk.log ]; then
+ umask 027
+ touch /var/log/httpd/mod_jk.log
+ chown root:logs /var/log/httpd/mod_jk.log
+fi
%preun
if [ "$1" = "0" ]; then
- %{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
if [ -f /var/lock/subsys/httpd ]; then
/etc/rc.d/init.d/httpd restart 1>&2
fi
%files
%defattr(644,root,root,755)
-%doc README CHANGES INSTALL LICENSE.html
-%config(noreplace) %{_sysconfdir}/httpd/mod_jk.conf
-%attr(755,root,root) %{_pkglibdir}/*
-%attr(750,http,http) /var/lock/mod_jk
+%doc jk/native/{README,CHANGES}
+%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
projects / packages / apache-mod_jk.git / blobdiff