OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 15-Apr-2004 13:05:54
Branch: HEAD Handle: 2004041512055300
Modified files:
openpkg-src/tomcat4-adapter
tomcat4-adapter.spec
Log:
quick hack for mod_jk connector
Summary:
Revision Changes Path
1.16 +34 -1 openpkg-src/tomcat4-adapter/tomcat4-adapter.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/tomcat4-adapter/tomcat4-adapter.spec
============================================================================
$ cvs diff -u -r1.15 -r1.16 tomcat4-adapter.spec
--- openpkg-src/tomcat4-adapter/tomcat4-adapter.spec 12 Feb 2004 19:20:42 -0000
1.15
+++ openpkg-src/tomcat4-adapter/tomcat4-adapter.spec 15 Apr 2004 11:05:53 -0000
1.16
@@ -34,7 +34,11 @@
Group: Web
License: Apache Software License 1.1
Version: 4.1.30
-Release: 20040212
+Release: 20040415
+
+# package options
+%option with_webapp yes
+%option with_mod_jk no
# list of sources
Source0:
http://www.apache.org/dist/jakarta/tomcat-4/v%{version}/src/jakarta-tomcat-connectors-%{version}-src.tar.gz
@@ -69,6 +73,8 @@
%patch -p0
%build
+ # optionally build webapp connector
+%if "%{with_webapp}" == "yes"
# create installation tree
cd webapp
@@ -79,6 +85,23 @@
--without-ant \
--with-apr=%{l_prefix}
%{l_make} %{l_mflags}
+%endif
+
+ # optionally build mod_jk connector
+%if "%{with_mod_jk}" == "yes"
+ cd jk/native
+ libtoolize --force --automake --copy
+ aclocal
+ automake -a --foreign -i --copy
+ autoconf
+
+ ./configure \
+ --prefix=%{l_prefix} \
+ --with-apr=%{l_prefix} \
+ --with-apxs=%{l_prefix}/sbin/apxs \
+ --enable-EAPI
+ %{l_make} %{l_mflags} LIBTOOL=$PWD/libtool
+%endif
%install
rm -rf $RPM_BUILD_ROOT
@@ -94,10 +117,20 @@
%{SOURCE tomcat4-adapter.conf} \
$RPM_BUILD_ROOT%{l_prefix}/etc/tomcat4-adapter/
+ # optionally install webapp DSO
+%if "%{with_webapp}" == "yes"
# install DSO
%{l_shtool} install -c -m 755 \
webapp/build/mod_webapp.so \
$RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat4-adapter/
+%endif
+
+ # optionally install mod_jk DSO
+%if "%{with_mod_jk}" == "yes"
+ %{l_shtool} install -c -m 755 \
+ jk/native/apache-1.3/mod_jk.so.0.0.0 \
+ $RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat4-adapter/mod_jk.so
+%endif
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
