OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 09-Jul-2003 21:23:02
Branch: HEAD Handle: 2003070920225804
Modified files:
openpkg-src/j2se j2se.spec rc.j2se
openpkg-src/j2se14 j2se14.spec rc.j2se14
openpkg-src/tomcat rc.tomcat
openpkg-src/tomcat-adapter
tomcat-adapter.spec
openpkg-src/tomcat4 rc.tomcat4
openpkg-web news.txt
Log:
remove jre|jdk|java special case
Summary:
Revision Changes Path
1.28 +1 -1 openpkg-src/j2se/j2se.spec
1.6 +3 -5 openpkg-src/j2se/rc.j2se
1.14 +1 -1 openpkg-src/j2se14/j2se14.spec
1.5 +3 -4 openpkg-src/j2se14/rc.j2se14
1.19 +2 -2 openpkg-src/tomcat-adapter/tomcat-adapter.spec
1.10 +3 -3 openpkg-src/tomcat/rc.tomcat
1.8 +3 -3 openpkg-src/tomcat4/rc.tomcat4
1.5487 +3 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/j2se/j2se.spec
============================================================================
$ cvs diff -u -r1.27 -r1.28 j2se.spec
--- openpkg-src/j2se/j2se.spec 8 Jul 2003 14:40:14 -0000 1.27
+++ openpkg-src/j2se/j2se.spec 9 Jul 2003 19:23:00 -0000 1.28
@@ -42,7 +42,7 @@
Group: Language
License: Commercial
Version: %{V_openpkg}
-Release: 20030707
+Release: 20030709
# package options
%option with_native yes
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/j2se/rc.j2se
============================================================================
$ cvs diff -u -r1.5 -r1.6 rc.j2se
--- openpkg-src/j2se/rc.j2se 7 Jul 2003 22:04:59 -0000 1.5
+++ openpkg-src/j2se/rc.j2se 9 Jul 2003 19:23:00 -0000 1.6
@@ -6,14 +6,12 @@
%config
j2se_enable="yes"
j2se_home="@l_prefix@/libexec/j2se"
- # generic variables for JDK/JRE packages
- jre_home=$j2se_home
- jdk_home=$j2se_home
- java_home=$j2se_home
+ JRE_home=$j2se_home
+ JDK_home=$j2se_home
%env
if opServiceEnabled j2se; then
- JAVA_HOME="$java_home"
+ JAVA_HOME="$JDK_home"
export JAVA_HOME
fi
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/j2se14/j2se14.spec
============================================================================
$ cvs diff -u -r1.13 -r1.14 j2se14.spec
--- openpkg-src/j2se14/j2se14.spec 8 Jul 2003 14:40:15 -0000 1.13
+++ openpkg-src/j2se14/j2se14.spec 9 Jul 2003 19:23:00 -0000 1.14
@@ -38,7 +38,7 @@
Group: Language
License: Commercial
Version: %{V_openpkg}
-Release: 20030629
+Release: 20030709
# list of sources
Source0: http://java.sun.com/j2se/::/j2sdk-%{V_sunjava}-linux-i586.bin
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/j2se14/rc.j2se14
============================================================================
$ cvs diff -u -r1.4 -r1.5 rc.j2se14
--- openpkg-src/j2se14/rc.j2se14 24 Jun 2003 12:07:50 -0000 1.4
+++ openpkg-src/j2se14/rc.j2se14 9 Jul 2003 19:23:00 -0000 1.5
@@ -6,13 +6,12 @@
%config
j2se14_enable="yes"
j2se14_home="@l_prefix@/libexec/j2se14"
- jre_home=$j2se14_home
- jdk_home=$j2se14_home
- java_home=$j2se14_home
+ JRE_home=$j2se14_home
+ JDK_home=$j2se14_home
%env
if opServiceEnabled j2se14; then
- JAVA_HOME="$java_home"
+ JAVA_HOME="$JDK_home"
export JAVA_HOME
fi
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/tomcat-adapter/tomcat-adapter.spec
============================================================================
$ cvs diff -u -r1.18 -r1.19 tomcat-adapter.spec
--- openpkg-src/tomcat-adapter/tomcat-adapter.spec 8 Jul 2003 14:42:55 -0000
1.18
+++ openpkg-src/tomcat-adapter/tomcat-adapter.spec 9 Jul 2003 19:23:01 -0000
1.19
@@ -33,7 +33,7 @@
Group: Web
License: Apache Software License 1.1
Version: 3.2.4
-Release: 20030408
+Release: 20030709
# list of sources
Source0:
http://jakarta.apache.org/builds/jakarta-tomcat/release/v%{version}/src/jakarta-tomcat-%{version}-src.tar.gz
@@ -64,7 +64,7 @@
esac
# create installation tree
- j=`%{l_prefix}/etc/rc --query java_home`
+ j=`%{l_prefix}/etc/rc --query JDK_home`
cd src/native/apache1.3
%{l_prefix}/sbin/apxs \
$opts \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/tomcat/rc.tomcat
============================================================================
$ cvs diff -u -r1.9 -r1.10 rc.tomcat
--- openpkg-src/tomcat/rc.tomcat 9 Jul 2003 14:06:28 -0000 1.9
+++ openpkg-src/tomcat/rc.tomcat 9 Jul 2003 19:23:01 -0000 1.10
@@ -9,19 +9,19 @@
%start -p 200 -u @l_rusr@
opServiceEnabled tomcat || exit 0
- JAVA_HOME="$jdk_home"; export JAVA_HOME
+ JAVA_HOME="$JDK_home"; export JAVA_HOME
TOMCAT_HOME="$tomcat_home"; export TOMCAT_HOME
$TOMCAT_HOME/bin/tomcat.sh start
%stop -p 200 -u @l_rusr@
opServiceEnabled tomcat || exit 0
- JAVA_HOME="$jdk_home"; export JAVA_HOME
+ JAVA_HOME="$JDK_home"; export JAVA_HOME
TOMCAT_HOME="$tomcat_home"; export TOMCAT_HOME
$TOMCAT_HOME/bin/tomcat.sh stop
%restart -p 200 -u @l_rusr@
opServiceEnabled tomcat || exit 0
- JAVA_HOME="$jdk_home"; export JAVA_HOME
+ JAVA_HOME="$JDK_home"; export JAVA_HOME
TOMCAT_HOME="$tomcat_home"; export TOMCAT_HOME
$TOMCAT_HOME/bin/tomcat.sh stop
$TOMCAT_HOME/bin/tomcat.sh start
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/tomcat4/rc.tomcat4
============================================================================
$ cvs diff -u -r1.7 -r1.8 rc.tomcat4
--- openpkg-src/tomcat4/rc.tomcat4 9 Jul 2003 14:06:28 -0000 1.7
+++ openpkg-src/tomcat4/rc.tomcat4 9 Jul 2003 19:23:02 -0000 1.8
@@ -9,19 +9,19 @@
%start -p 200 -u @l_rusr@
opServiceEnabled tomcat4 || exit 0
- JAVA_HOME="$java_home"; export JAVA_HOME
+ JAVA_HOME="$JDK_home"; export JAVA_HOME
CATALINA_HOME="$tomcat4_home"; export CATALINA_HOME
$CATALINA_HOME/bin/startup.sh
%stop -p 200 -u @l_rusr@
opServiceEnabled tomcat4 || exit 0
- JAVA_HOME="$java_home"; export JAVA_HOME
+ JAVA_HOME="$JDK_home"; export JAVA_HOME
CATALINA_HOME="$tomcat4_home"; export CATALINA_HOME
$CATALINA_HOME/bin/shutdown.sh
%restart -p 200 -u @l_rusr@
opServiceEnabled tomcat4 || exit 0
- JAVA_HOME="$java_home"; export JAVA_HOME
+ JAVA_HOME="$JDK_home"; export JAVA_HOME
CATALINA_HOME="$tomcat4_home"; export CATALINA_HOME
$CATALINA_HOME/bin/shutdown.sh
$CATALINA_HOME/bin/startup.sh
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5486 -r1.5487 news.txt
--- openpkg-web/news.txt 9 Jul 2003 15:16:22 -0000 1.5486
+++ openpkg-web/news.txt 9 Jul 2003 19:22:58 -0000 1.5487
@@ -1,3 +1,6 @@
+09-Jul-2003: Upgraded package: P<tomcat-adapter-3.2.4-20030709>
+09-Jul-2003: Upgraded package: P<j2se14-1.4.2-20030709>
+09-Jul-2003: Upgraded package: P<j2se-1.3.1-20030709>
09-Jul-2003: Upgraded package: P<siege-2.56-20030709>
09-Jul-2003: Upgraded package: P<xemacs-21.4.13-20030709>
09-Jul-2003: Upgraded package: P<max-7.4.2-20030709>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
