Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master z-rejected grimoire by Vlad Glagolev (de6646221b49d04be15f742d3fa0197a6605d505)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master z-rejected grimoire by Vlad Glagolev (de6646221b49d04be15f742d3fa0197a6605d505)
  • Date: Fri, 14 Jan 2011 07:30:02 -0600

GIT changes to master z-rejected grimoire by Vlad Glagolev
<stealth AT sourcemage.org>:

z-java/jre6-bin/DETAILS | 10 +++++-----
z-java/jre6-bin/HISTORY | 5 +++++
z-java/jre6-bin/INSTALL | 7 +++++++
z-java/jre6-bin/PRE_BUILD | 4 ++++
4 files changed, 21 insertions(+), 5 deletions(-)

New commits:
commit de6646221b49d04be15f742d3fa0197a6605d505
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

jre6-bin: => 6u23

diff --git a/z-java/jre6-bin/DETAILS b/z-java/jre6-bin/DETAILS
index 85b5e27..1ada650 100755
--- a/z-java/jre6-bin/DETAILS
+++ b/z-java/jre6-bin/DETAILS
@@ -1,20 +1,20 @@
. $GRIMOIRE/FUNCTIONS
SPELL=jre6-bin
- VERSION=6u22
- VER=1.6.0_22
+ VERSION=6u23
+ VER=1.6.0_23
case "${SMGL_COMPAT_ARCHS[0]}" in
ia32|32)
SOURCE=jre-$VERSION-linux-i586.bin
-
SOURCE_HASH=sha512:31a864b27ebe043eeeeb76504684241718c7f52758d3c4d1aab9e30842747b338e088ac273694132493e49917ddbea1ce674ceba6fe3901571dcfee35b1f9f61
+
SOURCE_HASH=sha512:3641d9f9ebaeb96e93dc287a3f045c7486856aac559f536b28d17636b1e6789672931c45d97fd7e8f11fcaa0cb039569281c0cf51fb1486a46666c8fac803bde
;;
x86-64|64)
if [[ "${SMGL_COMPAT_ARCHS[@]/32/}" == "${SMGL_COMPAT_ARCHS[@]}" ]]
then
SOURCE=jre-$VERSION-linux-x64.bin
-
SOURCE_HASH=sha512:ec3a93b3f2cf710bec67ed75386aec5c6e4c74b38237f56978565e4ea95b4aa6618cc25593b0b526a3405bf11afe28acc56db2fa1e91062dc3431f091a6bfb24
+
SOURCE_HASH=sha512:377ebb06104ea2d8cb2017b172b8af0369b3ced751a15367e2d5a1f2b1c6ab1b9d279d7fb930980d99916b456a79ecf7cd9a26b9086198e81d6abef1fce6c575
else
SOURCE=jre-$VERSION-linux-i586.bin
-
SOURCE_HASH=sha512:31a864b27ebe043eeeeb76504684241718c7f52758d3c4d1aab9e30842747b338e088ac273694132493e49917ddbea1ce674ceba6fe3901571dcfee35b1f9f61
+
SOURCE_HASH=sha512:3641d9f9ebaeb96e93dc287a3f045c7486856aac559f536b28d17636b1e6789672931c45d97fd7e8f11fcaa0cb039569281c0cf51fb1486a46666c8fac803bde
fi
;;
###########################################################################
diff --git a/z-java/jre6-bin/HISTORY b/z-java/jre6-bin/HISTORY
index 5736185..0a3a595 100644
--- a/z-java/jre6-bin/HISTORY
+++ b/z-java/jre6-bin/HISTORY
@@ -1,3 +1,8 @@
+2011-01-14 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 6u23
+ * INSTALL: added installation of plugin for seamonkey on x86_64 arch
+ * PRE_BUILD: fixed installation on x86_64 system
+
2010-11-01 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 6u22

diff --git a/z-java/jre6-bin/INSTALL b/z-java/jre6-bin/INSTALL
index a14b701..0aa9646 100755
--- a/z-java/jre6-bin/INSTALL
+++ b/z-java/jre6-bin/INSTALL
@@ -65,6 +65,13 @@ elif [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]; then
ln -sf ${INSTALL_ROOT}/usr/lib/jre$VER/lib/amd64/libnpjp2.so \
${INSTALL_ROOT}/opt/firefox/plugins/libnpjp2.so
fi
+
+ if [ -d ${INSTALL_ROOT}/usr/lib/seamonkey/plugins ]
+ then
+ message "${MESSAGE_COLOR}Installing plugin for
seamonkey${DEFAULT_COLOR}" &&
+ ln -sf ${INSTALL_ROOT}/usr/lib/jre$VER/lib/amd64/libnpjp2.so \
+ ${INSTALL_ROOT}/usr/lib/seamonkey/plugins/libnpjp2.so
+ fi
fi &&

mkdir -p ${INSTALL_ROOT}/etc/profile.d/ &&
diff --git a/z-java/jre6-bin/PRE_BUILD b/z-java/jre6-bin/PRE_BUILD
index 03df2dc..036cf56 100755
--- a/z-java/jre6-bin/PRE_BUILD
+++ b/z-java/jre6-bin/PRE_BUILD
@@ -1 +1,5 @@
+if [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]] && [[ ! -h
"$INSTALL_ROOT/lib64" ]]; then
+ ln -vsf "$TRACK_ROOT/lib" "$INSTALL_ROOT/lib64"
+fi &&
+
unpack_file ''



  • [SM-Commit] GIT changes to master z-rejected grimoire by Vlad Glagolev (de6646221b49d04be15f742d3fa0197a6605d505), Vlad Glagolev, 01/14/2011

Archive powered by MHonArc 2.6.24.

Top of Page