Final touches to remove conflicts and inconsistency.

j2ee/j2ee.spec

@@ -47,8 +47,8 @@ Source3:      rc.j2ee
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20020714, JDK, tar, gzip
+BuildPreReq:  OpenPKG, openpkg >= 20020714, JRE, tar, gzip
-PreReq:       OpenPKG, openpkg >= 20020714, JDK
+PreReq:       OpenPKG, openpkg >= 20020714, JRE
 AutoReq:      no
 AutoReqProv:  no
 
@@ -97,8 +97,8 @@ 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 \
+        $RPM_BUILD_ROOT%{l_prefix}/libexec/j2ee \
-        $RPM_BUILD_ROOT%{l_prefix}/share/j2ee/doc
+        $RPM_BUILD_ROOT%{l_prefix}/libexec
 
     #   unpack vendor distribution
     (   umask 022
@@ -109,10 +109,10 @@ AutoReqProv:  no
                 ;;
             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 @@ AutoReqProv:  no
     ( 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 \"\$@\""
+        echo "exec %{l_prefix}/libexec/j2ee/bin/j2eepath \"\$@\""
-      ) >realpath
+      ) >j2eepath
-      chmod 755 realpath
+      chmod 755 j2eepath
     )
 
     #   install run-command script