OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 15-Apr-2004 13:20:42
Branch: HEAD Handle: 2004041512204200
Modified files:
openpkg-src/tomcat4-adapter
tomcat4-adapter.spec
Log:
- rename with_webapp to with_mod_webapp for consistency
- use sub-shells to change to subdirs or building both modules would fail
- fix dependency, because mod_jk requires automake
- cleanup some comments
Summary:
Revision Changes Path
1.17 +36 -31 openpkg-src/tomcat4-adapter/tomcat4-adapter.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/tomcat4-adapter/tomcat4-adapter.spec
============================================================================
$ cvs diff -u -r1.16 -r1.17 tomcat4-adapter.spec
--- openpkg-src/tomcat4-adapter/tomcat4-adapter.spec 15 Apr 2004 11:05:53 -0000
1.16
+++ openpkg-src/tomcat4-adapter/tomcat4-adapter.spec 15 Apr 2004 11:20:42 -0000
1.17
@@ -37,8 +37,8 @@
Release: 20040415
# package options
-%option with_webapp yes
-%option with_mod_jk no
+%option with_mod_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
@@ -48,8 +48,13 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, apache, perl, autoconf, libtool, gcc,
make
+BuildPreReq: OpenPKG, openpkg >= 20040130
PreReq: OpenPKG, openpkg >= 20040130
+BuildPreReq: apache, perl, gcc, make
+BuildPreReq: autoconf, libtool
+%if "%{with_mod_jk}" == "yes"
+BuildPreReq: automake
+%endif
BuildPreReq: apr
PreReq: apr
AutoReq: no
@@ -57,7 +62,8 @@
%description
Apache Jakarta Tomcat Webserver Adapter %{version} is a glue code
- between the Apache webserver and Tomcat.
+ between the Apache webserver and Tomcat. This package contains
+ mod_webapp and optionally also mod_jk.
%track
prog tomcat4-adapter = {
@@ -73,34 +79,33 @@
%patch -p0
%build
- # optionally build webapp connector
-%if "%{with_webapp}" == "yes"
- # create installation tree
- cd webapp
-
- ./support/buildconf.sh
- ./configure \
- --prefix=%{l_prefix} \
- --disable-java \
- --without-ant \
- --with-apr=%{l_prefix}
- %{l_make} %{l_mflags}
+ # optionally build mod_webapp connector
+%if "%{with_mod_webapp}" == "yes"
+ ( cd webapp
+ ./support/buildconf.sh
+ ./configure \
+ --prefix=%{l_prefix} \
+ --disable-java \
+ --without-ant \
+ --with-apr=%{l_prefix}
+ %{l_make} %{l_mflags}
+ ) || exit $?
%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
+ ( 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
+ ) || exit $?
%endif
%install
@@ -117,9 +122,8 @@
%{SOURCE tomcat4-adapter.conf} \
$RPM_BUILD_ROOT%{l_prefix}/etc/tomcat4-adapter/
- # optionally install webapp DSO
-%if "%{with_webapp}" == "yes"
- # install DSO
+ # optionally install mod_webapp DSO
+%if "%{with_mod_webapp}" == "yes"
%{l_shtool} install -c -m 755 \
webapp/build/mod_webapp.so \
$RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat4-adapter/
@@ -132,6 +136,7 @@
$RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat4-adapter/mod_jk.so
%endif
+ # determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%files -f files
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
