OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 26-Sep-2002 21:47:39
Branch: HEAD Handle: 2002092620473800
Modified files:
openpkg-src/j2ee j2ee.spec
Log:
Shrink and correct build logic, and remove obsolete realpath script.
Summary:
Revision Changes Path
1.3 +5 -11 openpkg-src/j2ee/j2ee.spec
____________________________________________________________________________
Index: openpkg-src/j2ee/j2ee.spec
============================================================
$ cvs diff -u -r1.2 -r1.3 j2ee.spec
--- openpkg-src/j2ee/j2ee.spec 26 Sep 2002 19:30:40 -0000 1.2
+++ openpkg-src/j2ee/j2ee.spec 26 Sep 2002 19:47:38 -0000 1.3
@@ -77,15 +77,13 @@
# select vendor source
pkgfile=""
- pkgdir=%{V_filesys}
+ pkgdir="j2sdkee%{V_filesys}"
case "%{l_target}" in
ix86-linux2.[2-5]* | ix86-freebsd4* )
pkgfile="j2sdkee-%{V_sunjava}-linux.tar.gz"
- pkgdir="j2sdkee%{V_filesys}"
;;
sparc64-solaris2.[6-9]*)
pkgfile="j2sdkee-%{V_sunjava}-solsparc.sh"
- pkgdir="j2sdkee%{V_filesys}"
;;
esac
if [ ".$pkgfile" = . ]; then
@@ -97,7 +95,6 @@
%{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/j2ee \
$RPM_BUILD_ROOT%{l_prefix}/libexec
# unpack vendor distribution
@@ -109,10 +106,11 @@
;;
sparc64-solaris2.[6-9]*)
echo "yes" | sh $RPM_SOURCE_DIR/$pkgfile \
- >$RPM_BUILD_ROOT%{l_prefix}/libexec/j2ee/COPYING.32
+ >COPYING.32
;;
esac
- mv $pkgdir ./j2ee
+ mv $pkgdir j2ee
+ mv COPYING.32 j2ee/COPYING.32
)
# fix vendor distribution
@@ -136,10 +134,6 @@
deploytool runclient verifier; do
ln -s ../libexec/j2ee/bin/$bin .
done
- ( echo "#!/bin/sh"
- echo "exec %{l_prefix}/libexec/j2ee/bin/j2eepath \"\$@\""
- ) >j2eepath
- chmod 755 j2eepath
)
# install run-command script
@@ -151,5 +145,5 @@
%files -f files
%clean
-# rm -rf $RPM_BUILD_ROOT
+ rm -rf $RPM_BUILD_ROOT
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
