sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master z-rejected grimoire by Eric Sandall (2870bb8c9dba4dcc3e5d6bf977a5754f1f9a435f)
- From: Eric Sandall <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master z-rejected grimoire by Eric Sandall (2870bb8c9dba4dcc3e5d6bf977a5754f1f9a435f)
- Date: Tue, 11 Jun 2013 17:51:11 -0500
GIT changes to master z-rejected grimoire by Eric Sandall
<sandalle AT sourcemage.org>:
z-java/jre6-bin/HISTORY | 1 +
z-java/jre6-bin/INSTALL | 13 +++++++++++++
z-java/jre7-bin/HISTORY | 1 +
z-java/jre7-bin/INSTALL | 13 +++++++++++++
4 files changed, 28 insertions(+)
New commits:
commit 2870bb8c9dba4dcc3e5d6bf977a5754f1f9a435f
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
jre7-bin: Install plugin for firefox
commit 78c690f054832142c608bf1e19995a6d3c54d6ec
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
jre6-bin: Install plugin for firefox
diff --git a/z-java/jre6-bin/HISTORY b/z-java/jre6-bin/HISTORY
index 0cf2655..580e53e 100644
--- a/z-java/jre6-bin/HISTORY
+++ b/z-java/jre6-bin/HISTORY
@@ -1,5 +1,6 @@
2013-06-11 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 6u45; SECURITY_PATCH++
+ * INSTALL: Install plugin for firefox
2013-05-23 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: Conflicts with jre7-bin
diff --git a/z-java/jre6-bin/INSTALL b/z-java/jre6-bin/INSTALL
index 623c4f6..d6e0b91 100755
--- a/z-java/jre6-bin/INSTALL
+++ b/z-java/jre6-bin/INSTALL
@@ -18,6 +18,13 @@ then
${INSTALL_ROOT}/usr/lib/mozilla/plugins/libjavaplugin_oji.so
fi
+ if [ -d ${INSTALL_ROOT}/usr/lib/firefox/plugins ]
+ then
+ message "${MESSAGE_COLOR}Installing plugin for firefox${DEFAULT_COLOR}"
&&
+ ln -sf
${INSTALL_ROOT}/usr/lib/jre$VER/plugin/i386/ns7/libjavaplugin_oji.so \
+ ${INSTALL_ROOT}/usr/lib/firefox/plugins/libjavaplugin_oji.so
+ fi
+
if [ -d ${INSTALL_ROOT}/usr/lib/xulrunner/plugins ]
then
message "${MESSAGE_COLOR}Installing plugin for
xulrunner${DEFAULT_COLOR}" &&
@@ -52,6 +59,12 @@ elif [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]; then
${INSTALL_ROOT}/usr/lib/mozilla/plugins/libnpjp2.so
fi &&
+ if [ -d ${INSTALL_ROOT}/usr/lib/firefox/plugins ]
+ then
+ ln -sf ${INSTALL_ROOT}/usr/lib/jre$VER/lib/amd64/libnpjp2.so \
+ ${INSTALL_ROOT}/usr/lib/firefox/plugins/libnpjp2.so
+ fi &&
+
if [ -d ${INSTALL_ROOT}/usr/lib/xulrunner/plugins ]
then
message "${MESSAGE_COLOR}Installing plugin for xulrunner${DEFAULT_COLOR}"
diff --git a/z-java/jre7-bin/HISTORY b/z-java/jre7-bin/HISTORY
index f450e80..ed0a1b2 100644
--- a/z-java/jre7-bin/HISTORY
+++ b/z-java/jre7-bin/HISTORY
@@ -1,5 +1,6 @@
2013-06-07 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Disable castfs (STAGED_INSTALL) (see bug #410)
+ * INSTALL: Install plugin for firefox
2013-05-23 Eric Sandall <sandalle AT sourcemage.org>
* Copied and renamed from jre6-bin
diff --git a/z-java/jre7-bin/INSTALL b/z-java/jre7-bin/INSTALL
index 27433c1..15496ac 100755
--- a/z-java/jre7-bin/INSTALL
+++ b/z-java/jre7-bin/INSTALL
@@ -18,6 +18,13 @@ then
${INSTALL_ROOT}/usr/lib/mozilla/plugins/libjavaplugin_oji.so
fi
+ if [ -d ${INSTALL_ROOT}/usr/lib/firefox/plugins ]
+ then
+ message "${MESSAGE_COLOR}Installing plugin for firefox${DEFAULT_COLOR}"
&&
+ ln -sf
${INSTALL_ROOT}/usr/lib/jre$VER/plugin/i386/ns7/libjavaplugin_oji.so \
+ ${INSTALL_ROOT}/usr/lib/firefox/plugins/libjavaplugin_oji.so
+ fi
+
if [ -d ${INSTALL_ROOT}/usr/lib/xulrunner/plugins ]
then
message "${MESSAGE_COLOR}Installing plugin for
xulrunner${DEFAULT_COLOR}" &&
@@ -52,6 +59,12 @@ elif [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]; then
${INSTALL_ROOT}/usr/lib/mozilla/plugins/libnpjp2.so
fi &&
+ if [ -d ${INSTALL_ROOT}/usr/lib/firefox/plugins ]
+ then
+ ln -sf ${INSTALL_ROOT}/usr/lib/jre$VER/lib/amd64/libnpjp2.so \
+ ${INSTALL_ROOT}/usr/lib/firefox/plugins/libnpjp2.so
+ fi &&
+
if [ -d ${INSTALL_ROOT}/usr/lib/xulrunner/plugins ]
then
message "${MESSAGE_COLOR}Installing plugin for xulrunner${DEFAULT_COLOR}"
- [SM-Commit] GIT changes to master z-rejected grimoire by Eric Sandall (2870bb8c9dba4dcc3e5d6bf977a5754f1f9a435f), Eric Sandall, 06/11/2013
Archive powered by MHonArc 2.6.24.