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: 18-Mar-2005 20:32:22
Branch: HEAD Handle: 2005031819322200
Modified files:
openpkg-src/j2se14 j2se14.spec
Log:
apply some additional fixes and cleanups from Matthias Kurz
Summary:
Revision Changes Path
1.40 +11 -5 openpkg-src/j2se14/j2se14.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/j2se14/j2se14.spec
============================================================================
$ cvs diff -u -r1.39 -r1.40 j2se14.spec
--- openpkg-src/j2se14/j2se14.spec 8 Mar 2005 18:03:06 -0000 1.39
+++ openpkg-src/j2se14/j2se14.spec 18 Mar 2005 19:32:22 -0000 1.40
@@ -40,7 +40,7 @@
Group: Language
License: Commercial
Version: %{V_openpkg}
-Release: 20050308
+Release: 20050318
# package options
%option with_demo no
@@ -139,17 +139,23 @@
echo "yes" | sh $pkgfile \
>$RPM_BUILD_ROOT%{l_prefix}/share/j2se14/COPYING.32
;;
- sun4u-sunos5.[6-9]* )
+ sun4u-sunos5.[6-9]* | sun4u-sunos5.10 )
echo "yes" | sh $pkgfile \
- >$RPM_BUILD_ROOT%{l_prefix}/share/j2se14/COPYING.32
+ >$RPM_BUILD_ROOT%{l_prefix}/share/j2se14/COPYING.32 && \
echo "yes" | sh $suppfile \
>$RPM_BUILD_ROOT%{l_prefix}/share/j2se14/COPYING.64
;;
- i?86-sunos5.[6-9]* | sun4u-sunos5.10 )
+ i?86-sunos5.[6-9]* | i?86-sunos5.10 )
echo "yes" | sh $pkgfile \
>$RPM_BUILD_ROOT%{l_prefix}/share/j2se14/COPYING.32
;;
+ *) false
+ ;;
esac
+ if [ $? != 0 ]; then
+ echo "ERROR: unpacking failed" 1>&2
+ exit 1
+ fi
mv $pkgdir j2se14
) || exit $?
@@ -159,7 +165,7 @@
cd $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se14/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/j2se14/bin/sparcv9
find . -type f -print | xargs chmod u+w
cd $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se14/jre/bin/sparcv9
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
