%define mod_name jk
%define apxs /usr/sbin/apxs1
Summary: Apache module that handles communication between Tomcat and Apache 1.3.x
-Summary(pl): Modu³ Apache'a obs³uguj±cy komunikacjê miêdzy Tomcatem a Apachem 1.3.x
+Summary(pl.UTF-8): Moduł Apache'a obsługujący komunikację między Tomcatem a Apachem 1.3.x
Name: apache1-mod_%{mod_name}
-Version: 1.2.18
+Version: 1.2.27
Release: 1
-License: Apache
+License: Apache v2.0
Group: Networking/Daemons
-Source0: http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-%{version}/tomcat-connectors-%{version}-src.tar.gz
-# Source0-md5: 58e1b9406e0cfe11bd4bc297ba146b4f
+Source0: http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/tomcat-connectors-%{version}-src.tar.gz
+# Source0-md5: a15cc9e3813ef5b081c7de10e6a1fbed
Source1: %{name}.conf
URL: http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/doc/
-BuildRequires: %{apxs}
-BuildRequires: apache1-devel >= 1.3.33-2
+BuildRequires: apache1-devel >= 1.3.39
BuildRequires: autoconf
BuildRequires: automake
+BuildRequires: jpackage-utils
BuildRequires: libtool
BuildRequires: perl-base
-BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: rpmbuild(macros) >= 1.300
+Requires: apache1(EAPI)
Requires: apache1-mod_dir >= 1.3.33-2
Obsoletes: jakarta-tomcat-connectors-jk
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
Tomcat-Apache plug-in that handles the communication between Tomcat
and Apache.
-%description -l pl
-JK jest zamiennikiem starego mod_jserv. Jest ca³kowicie now± wtyczk±
-Tomcat-Apache obs³uguj±c± komunikacjê miêdzy Tomcatem a Apachem.
+%description -l pl.UTF-8
+JK jest zamiennikiem starego mod_jserv. Jest całkowicie nową wtyczką
+Tomcat-Apache obsługującą komunikację między Tomcatem a Apachem.
%prep
%setup -q -n tomcat-connectors-%{version}-src
%build
cd native
-
-./buildconf.sh
-
+%{__libtoolize}
+%{__aclocal}
+%{__autoheader}
+%{__automake}
+%{__autoconf}
%configure \
--enable-EAPI \
- --with-apxs=%{apxs}
-
+ --with-apxs=%{apxs} \
+ --with-java-home="%{java_home}"
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/conf.d,/var/lock/mod_jk}
-
-cd native
-
-install apache-1.3/mod_%{mod_name}.so.0.0.0 $RPM_BUILD_ROOT%{_pkglibdir}/mod_%{mod_name}.so
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/conf.d,/var/{lock/mod_jk,log/apache}}
+install native/apache-1.3/mod_%{mod_name}.so.0.0.0 $RPM_BUILD_ROOT%{_pkglibdir}/mod_%{mod_name}.so
install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/90_mod_%{mod_name}.conf
+touch $RPM_BUILD_ROOT/var/log/apache/mod_jk.log
%clean
rm -rf $RPM_BUILD_ROOT
%post
+if [ ! -f /var/log/apache/mod_jk.log ]; then
+ umask 027
+ touch /var/log/apache/mod_jk.log
+ chown root:logs /var/log/apache/mod_jk.log
+fi
%service -q apache restart
%postun
%files
%defattr(644,root,root,755)
-%doc native/{CHANGES,README} docs/*
+%doc native/{CHANGES,README.txt,STATUS.txt,TODO.txt} docs/*
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf
%attr(755,root,root) %{_pkglibdir}/*
-%attr(750,http,http) /var/lock/mod_jk
+%attr(770,root,http) /var/lock/mod_jk
+%attr(640,root,logs) %ghost /var/log/apache/mod_jk.log