OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 18-Feb-2003 14:48:55
Branch: HEAD Handle: 2003021813485301
Modified files:
openpkg-src/tomcat-adapter
tomcat-adapter.spec
openpkg-web news.txt
Log:
use generic path to java
Summary:
Revision Changes Path
1.16 +4 -3 openpkg-src/tomcat-adapter/tomcat-adapter.spec
1.3345 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/tomcat-adapter/tomcat-adapter.spec
============================================================================
$ cvs diff -u -r1.15 -r1.16 tomcat-adapter.spec
--- openpkg-src/tomcat-adapter/tomcat-adapter.spec 3 Jan 2003 10:55:21 -0000
1.15
+++ openpkg-src/tomcat-adapter/tomcat-adapter.spec 18 Feb 2003 13:48:54 -0000
1.16
@@ -33,7 +33,7 @@
Group: Web
License: Apache Software License 1.1
Version: 3.2.4
-Release: 20021220
+Release: 20030218
# list of sources
Source0:
http://jakarta.apache.org/builds/jakarta-tomcat/release/v%{version}/src/jakarta-tomcat-%{version}-src.tar.gz
@@ -64,13 +64,14 @@
esac
# create installation tree
+ j=`%{l_prefix}/etc/rc --query java_home`
cd src/native/apache1.3
%{l_prefix}/sbin/apxs \
$opts \
-S CC=%{l_prefix}/bin/gcc \
-S LD_SHLIB=%{l_prefix}/bin/gcc \
- -I../jk -I%{l_prefix}/libexec/j2se/include \
- -I../jk -I%{l_prefix}/libexec/j2se/include/$subdir \
+ -I../jk -I$j/include \
+ -I../jk -I$j/include/$subdir \
-o mod_jk.so \
-c mod_jk.c ../jk/*.c
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.3344 -r1.3345 news.txt
--- openpkg-web/news.txt 18 Feb 2003 11:46:54 -0000 1.3344
+++ openpkg-web/news.txt 18 Feb 2003 13:48:53 -0000 1.3345
@@ -1,3 +1,4 @@
+18-Feb-2003: Upgraded package: P<tomcat-adapter-3.2.4-20030218>
18-Feb-2003: Upgraded package: P<flex-2.5.4a-20030218>
18-Feb-2003: Upgraded package: P<tomcat-3.3.1a-20030218>
18-Feb-2003: Upgraded package: P<vim-6.1.341-20030218>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
