From 4253b25f87694c613e4dc16eaee81b2225eedf96 Mon Sep 17 00:00:00 2001
From: Michael Schloh von Bennewitz <ms@openpkg.org>
Date: Thu, 26 Sep 2002 19:47:38 +0000
Subject: [PATCH] Shrink and correct build logic, and remove obsolete realpath
 script.

---
 j2ee/j2ee.spec | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/j2ee/j2ee.spec b/j2ee/j2ee.spec
index ace3b199b2..cd85b65f54 100644
--- a/j2ee/j2ee.spec
+++ b/j2ee/j2ee.spec
@@ -77,15 +77,13 @@ AutoReqProv:  no
 
     #   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 @@ AutoReqProv:  no
     %{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 @@ AutoReqProv:  no
                 ;;
             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 @@ AutoReqProv:  no
           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 @@ AutoReqProv:  no
 %files -f files
 
 %clean
-#    rm -rf $RPM_BUILD_ROOT
+    rm -rf $RPM_BUILD_ROOT