Browse Source

Shrink and correct build logic, and remove obsolete realpath script.

master
Michael Schloh von Bennewitz 23 years ago committed by Ralf S. Engelschall
parent
commit
4253b25f87
  1. 16
      j2ee/j2ee.spec

16
j2ee/j2ee.spec

@ -77,15 +77,13 @@ AutoReqProv: no
# select vendor source # select vendor source
pkgfile="" pkgfile=""
pkgdir=%{V_filesys} pkgdir="j2sdkee%{V_filesys}"
case "%{l_target}" in case "%{l_target}" in
ix86-linux2.[2-5]* | ix86-freebsd4* ) ix86-linux2.[2-5]* | ix86-freebsd4* )
pkgfile="j2sdkee-%{V_sunjava}-linux.tar.gz" pkgfile="j2sdkee-%{V_sunjava}-linux.tar.gz"
pkgdir="j2sdkee%{V_filesys}"
;; ;;
sparc64-solaris2.[6-9]*) sparc64-solaris2.[6-9]*)
pkgfile="j2sdkee-%{V_sunjava}-solsparc.sh" pkgfile="j2sdkee-%{V_sunjava}-solsparc.sh"
pkgdir="j2sdkee%{V_filesys}"
;; ;;
esac esac
if [ ".$pkgfile" = . ]; then if [ ".$pkgfile" = . ]; then
@ -97,7 +95,6 @@ AutoReqProv: no
%{l_shtool} mkdir -f -p -m 755 \ %{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/bin \ $RPM_BUILD_ROOT%{l_prefix}/bin \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \ $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
$RPM_BUILD_ROOT%{l_prefix}/libexec/j2ee \
$RPM_BUILD_ROOT%{l_prefix}/libexec $RPM_BUILD_ROOT%{l_prefix}/libexec
# unpack vendor distribution # unpack vendor distribution
@ -109,10 +106,11 @@ AutoReqProv: no
;; ;;
sparc64-solaris2.[6-9]*) sparc64-solaris2.[6-9]*)
echo "yes" | sh $RPM_SOURCE_DIR/$pkgfile \ echo "yes" | sh $RPM_SOURCE_DIR/$pkgfile \
>$RPM_BUILD_ROOT%{l_prefix}/libexec/j2ee/COPYING.32 >COPYING.32
;; ;;
esac esac
mv $pkgdir ./j2ee mv $pkgdir j2ee
mv COPYING.32 j2ee/COPYING.32
) )
# fix vendor distribution # fix vendor distribution
@ -136,10 +134,6 @@ AutoReqProv: no
deploytool runclient verifier; do deploytool runclient verifier; do
ln -s ../libexec/j2ee/bin/$bin . ln -s ../libexec/j2ee/bin/$bin .
done done
( echo "#!/bin/sh"
echo "exec %{l_prefix}/libexec/j2ee/bin/j2eepath \"\$@\""
) >j2eepath
chmod 755 j2eepath
) )
# install run-command script # install run-command script
@ -151,5 +145,5 @@ AutoReqProv: no
%files -f files %files -f files
%clean %clean
# rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT

Loading…
Cancel
Save