[SM-Commit] GIT changes to master z-rejected grimoire by George Sherwood (8780190dec6fb42baa8db280967c57bf81927bf8)

George Sherwood scm at mail.sourcemage.org
Sun Aug 13 04:14:24 EDT 2006


GIT changes to master z-rejected grimoire by George Sherwood <chat at sourcemage.org>:

 dev/null                                           |binary
 z-java/jre1.5-bin/DETAILS                          |    4 +--
 z-java/jre1.5-bin/HISTORY                          |    4 +++
 z-java/jre1.5-bin/INSTALL                          |   27 +++++++++++++++++++--
 z-java/jre1.5-bin/jre-1_5_0_07-linux-amd64.bin.sig |    0 
 z-java/jre1.5-bin/jre-1_5_0_07-linux-i586.bin.sig  |    0 
 z-java/jre1.5-bin/jre-1_5_0_08-linux-amd64.bin.sig |binary
 z-java/jre1.5-bin/jre-1_5_0_08-linux-i586.bin.sig  |binary
 8 files changed, 31 insertions(+), 4 deletions(-)

New commits:
commit 8780190dec6fb42baa8db280967c57bf81927bf8
Author: George Sherwood <chat at sourcemage.org>
Commit: George Sherwood <chat at sourcemage.org>

    Updated jre1.5-bin to 1_5_0_08.  Cleaned up install of browser plugins.

diff --git a/z-java/jre1.5-bin/DETAILS b/z-java/jre1.5-bin/DETAILS
index 05af298..e7b5e33 100755
--- a/z-java/jre1.5-bin/DETAILS
+++ b/z-java/jre1.5-bin/DETAILS
@@ -1,7 +1,7 @@
 . $GRIMOIRE/FUNCTIONS
            SPELL=jre1.5-bin
-         VERSION=1_5_0_07
-             VER=1.5.0_07
+         VERSION=1_5_0_08
+             VER=1.5.0_08
 case "${SMGL_COMPAT_ARCHS[0]}" in
 	ia32|32)
           SOURCE=jre-$VERSION-linux-i586.bin
diff --git a/z-java/jre1.5-bin/HISTORY b/z-java/jre1.5-bin/HISTORY
index 4d84d25..7e5d2eb 100644
--- a/z-java/jre1.5-bin/HISTORY
+++ b/z-java/jre1.5-bin/HISTORY
@@ -1,3 +1,7 @@
+2006-08-12 George Sherwood <george at beernabeer.com>
+	* DETAILS: Updated to 1.5.0.8
+	* INSTALL: Cleaned up browser plugin installation.  Now works.
+
 2006-08-06 George Sherwood <george at beernabeer.com>
 	* DETAILS: Updated to 1.5.0.7
 
diff --git a/z-java/jre1.5-bin/INSTALL b/z-java/jre1.5-bin/INSTALL
index cab858d..7620691 100755
--- a/z-java/jre1.5-bin/INSTALL
+++ b/z-java/jre1.5-bin/INSTALL
@@ -5,21 +5,44 @@ yes | sh $SOURCE_CACHE/$SOURCE  &&
 if [[ "${ARCHITECTURE[0]}" == "i386" || "${ARCHITECTURE[0]}" == "i486" ]]
 then
 	message "${PROBLEM_COLOR}The package says i586 so if you really are running an i386 or i486 you may experience problems with this package${DEFAULT_COLOR}"
-fi
+fi &&
 
-if [[ "${SMGL_COMPAT_ARCH[0]}" == "ia32" ]]
+if [[ "${SMGL_COMPAT_ARCHS[1]}" == "ia32" ]]
 then	
+message "${MESSAGE_COLOR}Determine which browser plugins to install${DEFAULT_COLOR}" &&
 	if [ -d ${INSTALL_ROOT}/usr/lib/mozilla/plugins ]
 	then
+                message "${MESSAGE_COLOR}Installing plugin for mozilla${DEFAULT_COLOR}" &&
 		ln -sf ${INSTALL_ROOT}/usr/lib/jre$VER/plugin/i386/ns7/libjavaplugin_oji.so  \
                        ${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}/opt/firefox/plugins ]
+	then
+                message "${MESSAGE_COLOR}Installing plugin for firefox-bin${DEFAULT_COLOR}" &&
+		ln -sf ${INSTALL_ROOT}/usr/lib/jre$VER/plugin/i386/ns7/libjavaplugin_oji.so  \
+                       ${INSTALL_ROOT}/opt/firefox/plugins/libjavaplugin_oji.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/plugin/i386/ns7/libjavaplugin_oji.so  \
+                       ${INSTALL_ROOT}/usr/lib/seamonkey/plugins/libjavaplugin_oji.so
+	fi
+
+        if [ -d ${INSTALL_ROOT}/usr/lib/opera/plugins ]
+	then
+                message "${MESSAGE_COLOR}Installing plugin for opera${DEFAULT_COLOR}" &&
+		ln -sf ${INSTALL_ROOT}/usr/lib/jre$VER/plugin/i386/ns7/libjavaplugin_oji.so  \
+                       ${INSTALL_ROOT}/usr/lib/opera/plugins/libjavaplugin_oji.so
+	fi
 fi  &&
 
 mkdir -p ${INSTALL_ROOT}/etc/profile.d/ &&
diff --git a/z-java/jre1.5-bin/jre-1_5_0_07-linux-amd64.bin.sig b/z-java/jre1.5-bin/jre-1_5_0_07-linux-amd64.bin.sig
deleted file mode 100644
index 815d5cf..0000000
Binary files a/z-java/jre1.5-bin/jre-1_5_0_07-linux-amd64.bin.sig and /dev/null differ
diff --git a/z-java/jre1.5-bin/jre-1_5_0_07-linux-i586.bin.sig b/z-java/jre1.5-bin/jre-1_5_0_07-linux-i586.bin.sig
deleted file mode 100644
index bb34e25..0000000
Binary files a/z-java/jre1.5-bin/jre-1_5_0_07-linux-i586.bin.sig and /dev/null differ
diff --git a/z-java/jre1.5-bin/jre-1_5_0_08-linux-amd64.bin.sig b/z-java/jre1.5-bin/jre-1_5_0_08-linux-amd64.bin.sig
new file mode 100644
index 0000000..1b33e55
Binary files /dev/null and b/z-java/jre1.5-bin/jre-1_5_0_08-linux-amd64.bin.sig differ
diff --git a/z-java/jre1.5-bin/jre-1_5_0_08-linux-i586.bin.sig b/z-java/jre1.5-bin/jre-1_5_0_08-linux-i586.bin.sig
new file mode 100644
index 0000000..eb3ead1
Binary files /dev/null and b/z-java/jre1.5-bin/jre-1_5_0_08-linux-i586.bin.sig differ



More information about the SM-Commit mailing list