OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web, openpkg-src Date: 26-Sep-2002 21:30:41
Branch: HEAD Handle: 2002092620304000
Modified files:
openpkg-src/j2ee j2ee.spec
openpkg-web news.txt
Log:
Final touches to remove conflicts and inconsistency.
Summary:
Revision Changes Path
1.2 +10 -10 openpkg-src/j2ee/j2ee.spec
1.1626 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
Index: openpkg-src/j2ee/j2ee.spec
============================================================
$ cvs diff -u -r1.1 -r1.2 j2ee.spec
--- openpkg-src/j2ee/j2ee.spec 26 Sep 2002 17:33:59 -0000 1.1
+++ openpkg-src/j2ee/j2ee.spec 26 Sep 2002 19:30:40 -0000 1.2
@@ -47,8 +47,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020714, JDK, tar, gzip
-PreReq: OpenPKG, openpkg >= 20020714, JDK
+BuildPreReq: OpenPKG, openpkg >= 20020714, JRE, tar, gzip
+PreReq: OpenPKG, openpkg >= 20020714, JRE
AutoReq: no
AutoReqProv: no
@@ -97,8 +97,8 @@
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/bin \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
- $RPM_BUILD_ROOT%{l_prefix}/libexec \
- $RPM_BUILD_ROOT%{l_prefix}/share/j2ee/doc
+ $RPM_BUILD_ROOT%{l_prefix}/libexec/j2ee \
+ $RPM_BUILD_ROOT%{l_prefix}/libexec
# unpack vendor distribution
( umask 022
@@ -109,10 +109,10 @@
;;
sparc64-solaris2.[6-9]*)
echo "yes" | sh $RPM_SOURCE_DIR/$pkgfile \
- >$RPM_BUILD_ROOT%{l_prefix}/share/j2ee/doc/COPYING.32
+ >$RPM_BUILD_ROOT%{l_prefix}/libexec/j2ee/COPYING.32
;;
esac
- mv $pkgdir j2ee
+ mv $pkgdir ./j2ee
)
# fix vendor distribution
@@ -133,13 +133,13 @@
( cd $RPM_BUILD_ROOT%{l_prefix}/bin
for bin in cleanup j2ee packager setenv.sh \
cloudscape j2eeadmin realmtool userconfig.sh \
- deploytool keytool runclient verifier; do
+ deploytool runclient verifier; do
ln -s ../libexec/j2ee/bin/$bin .
done
( echo "#!/bin/sh"
- echo "exec %{l_prefix}/libexec/j2ee/bin/realpath \"\$@\""
- ) >realpath
- chmod 755 realpath
+ echo "exec %{l_prefix}/libexec/j2ee/bin/j2eepath \"\$@\""
+ ) >j2eepath
+ chmod 755 j2eepath
)
# install run-command script
Index: openpkg-web/news.txt
============================================================
$ cvs diff -u -r1.1625 -r1.1626 news.txt
--- openpkg-web/news.txt 26 Sep 2002 18:57:33 -0000 1.1625
+++ openpkg-web/news.txt 26 Sep 2002 19:30:40 -0000 1.1626
@@ -1,3 +1,4 @@
+26-Sep-2002: Upgraded package: P<j2ee-1.3.1.00-20020926>
26-Sep-2002: Upgraded package: P<j2se-1.4.1.00-20020926>
26-Sep-2002: Upgraded package: P<openpkg-20020926-20020926>
26-Sep-2002: New package: P<j2ee-1.3.1.00-20020926>
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
