OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 08-Apr-2005 19:58:18
Branch: HEAD Handle: 2005040818581800
Modified files:
openpkg-src/j2se15 j2se15.spec
Log:
fix building under Solaris 10
Summary:
Revision Changes Path
1.7 +9 -5 openpkg-src/j2se15/j2se15.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/j2se15/j2se15.spec
============================================================================
$ cvs diff -u -r1.6 -r1.7 j2se15.spec
--- openpkg-src/j2se15/j2se15.spec 8 Apr 2005 17:54:15 -0000 1.6
+++ openpkg-src/j2se15/j2se15.spec 8 Apr 2005 17:58:18 -0000 1.7
@@ -106,12 +106,12 @@
pkgfile="%{SOURCE jdk-%{V_sunjava}-linux-i586.bin}"
pkgdir="jdk%{V_filesys}"
;;
- sun4u-sunos5.[6-9]* )
+ sun4u-sunos5.[6-9]* | | sun4u-sunos5.10 )
pkgfile="%{SOURCE jdk-%{V_sunjava}-solaris-sparc.sh}"
pkgfile2="%{SOURCE jdk-%{V_sunjava}-solaris-sparcv9.sh}"
pkgdir="jdk%{V_filesys}"
;;
- i?86-sunos5.[6-9]* )
+ i?86-sunos5.[6-9]* | i?86-sunos5.10 )
pkgfile="%{SOURCE jdk-%{V_sunjava}-solaris-i586.sh}"
pkgdir="jdk%{V_filesys}"
;;
@@ -137,14 +137,18 @@
i?86-linux2.[2-6]* | i?86-freebsd[45]* )
echo "yes" | sh $pkgfile >COPYING.32
;;
- sun4u-sunos5.[6-9]* )
+ sun4u-sunos5.[6-9]* | sun4u-sunos5.10 )
echo "yes" | sh $pkgfile >COPYING.32
echo "yes" | sh $pkgfile2 >COPYING.64
;;
- i?86-sunos5.[6-9]* )
+ i?86-sunos5.[6-9]* | i?86-sunos5.10 )
echo "yes" | sh $pkgfile >COPYING.32
;;
esac
+ if [ $? != 0 ]; then
+ echo "ERROR: unpacking failed" 1>&2
+ exit 1
+ fi
mv $pkgdir/* j2se15/
mv COPYING.* j2se15/
rmdir $pkgdir
@@ -156,7 +160,7 @@
cd $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se15/jre/bin
find . -type f -print | xargs chmod u+w
case "%{l_platform -t}" in
- sun4u-sunos5.[6-9]* )
+ sun4u-sunos5.[6-9]* | sun4u-sunos5.10 )
cd $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se15/bin/sparcv9
find . -type f -print | xargs chmod u+w
cd $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se15/jre/bin/sparcv9
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
