Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master z-rejected grimoire by David Kowis (8ebeef92003d2be880081c150aa697f088047971)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master z-rejected grimoire by David Kowis (8ebeef92003d2be880081c150aa697f088047971)

Chronological Thread  
    < Chronological >       < Thread >
  • From: David Kowis <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master z-rejected grimoire by David Kowis (8ebeef92003d2be880081c150aa697f088047971)
  • Date: Thu, 8 Feb 2007 20:33:43 -0600
GIT changes to master z-rejected grimoire by David Kowis <dkowis AT shlrm.org>:

ChangeLog | 3 ++
z-java/j2sdk-bin/CONFLICTS | 3 +-
z-java/j2sdk-bin/HISTORY | 3 ++
z-java/j2sdk/CONFLICTS | 3 +-
z-java/j2sdk/HISTORY | 3 ++
z-java/jdk1.5-bin/CONFLICTS | 3 +-
z-java/jdk1.5-bin/HISTORY | 4 +++
z-java/jdk6-bin/BUILD | 1
z-java/jdk6-bin/CONFIGURE | 7 ++++++
z-java/jdk6-bin/CONFLICTS | 3 ++
z-java/jdk6-bin/DEPENDS | 6 +++++
z-java/jdk6-bin/DETAILS | 43
++++++++++++++++++++++++++++++++++++++++++
z-java/jdk6-bin/FINAL | 3 ++
z-java/jdk6-bin/HISTORY | 2 +
z-java/jdk6-bin/INSTALL | 27 ++++++++++++++++++++++++++
z-java/jdk6-bin/PRE_BUILD | 1
z-java/jdk6-bin/PROVIDES | 2 +
z-java/jdk6-bin/UNATTEND_SAFE | 1
z-java/jdk6-bin/volatiles | 2 +
z-java/jre1.5-bin/CONFLICTS | 3 +-
z-java/jre1.5-bin/HISTORY | 3 ++
21 files changed, 122 insertions(+), 4 deletions(-)

New commits:
commit 8ebeef92003d2be880081c150aa697f088047971
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

jdk6-bin
Added jdk6-bin to the grimoire

diff --git a/ChangeLog b/ChangeLog
index 925e3a7..847c95f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2007-02-08 David Kowis <dkowis AT shlrm.org>
+ * z-java/jdk6-bin: New spell for the 1.6.0 series of java
+
2006-12-28 David Kowis <dkowis AT shlrm.org>
* z-java/JAVA_WARNING: made it bypass the java warning if the files
have
already been downloaded. Reduces irritation significantly.
diff --git a/z-java/j2sdk-bin/CONFLICTS b/z-java/j2sdk-bin/CONFLICTS
index 3b54481..55d579f 100755
--- a/z-java/j2sdk-bin/CONFLICTS
+++ b/z-java/j2sdk-bin/CONFLICTS
@@ -1,3 +1,4 @@
conflicts j2sdk &&
conflicts jdk1.5-bin &&
-conflicts jre1.5-bin
+conflicts jre1.5-bin &&
+conflicts jdk6-bin
diff --git a/z-java/j2sdk-bin/HISTORY b/z-java/j2sdk-bin/HISTORY
index 4feb2e7..a1c88a0 100644
--- a/z-java/j2sdk-bin/HISTORY
+++ b/z-java/j2sdk-bin/HISTORY
@@ -1,3 +1,6 @@
+2007-02-08 David Kowis <dkowis AT shlrm.org>
+ * CONFLICTS: Made conflict with jdk6-bin
+
2006-10-18 Flavien Bridault <vlaaad AT sourcemage.org>
* DETAILS: Updated to 1_4_2_12
* DEPENDS: No longer needs gcc33
diff --git a/z-java/j2sdk/CONFLICTS b/z-java/j2sdk/CONFLICTS
index 8a623bf..e4080b9 100755
--- a/z-java/j2sdk/CONFLICTS
+++ b/z-java/j2sdk/CONFLICTS
@@ -1,3 +1,4 @@
conflicts j2sdk-bin &&
conflicts jdk1.5-bin &&
-conflicts jre1.5-bin
+conflicts jre1.5-bin &&
+conflicts jdk6-bin
diff --git a/z-java/j2sdk/HISTORY b/z-java/j2sdk/HISTORY
index f3d6290..12828ff 100644
--- a/z-java/j2sdk/HISTORY
+++ b/z-java/j2sdk/HISTORY
@@ -1,3 +1,6 @@
+2007-02-08 David Kowis <dkowis AT shlrm.org>
+ * CONFLICTS: Made conflict with jdk6-bin
+
2006-12-17 Juuso Alasuutari <iuso AT sourcemage.org>
* PRE_BUILD: Replaced 'uname -r' with get_running_kernel_version
(bug #10940).
diff --git a/z-java/jdk1.5-bin/CONFLICTS b/z-java/jdk1.5-bin/CONFLICTS
index 20e3319..66a7c84 100755
--- a/z-java/jdk1.5-bin/CONFLICTS
+++ b/z-java/jdk1.5-bin/CONFLICTS
@@ -1,3 +1,4 @@
conflicts j2sdk &&
conflicts j2sdk-bin &&
-conflicts jre1.5-bin
+conflicts jre1.5-bin &&
+conflicts jdk6-bin
diff --git a/z-java/jdk1.5-bin/HISTORY b/z-java/jdk1.5-bin/HISTORY
index 310b827..ac3ef8d 100644
--- a/z-java/jdk1.5-bin/HISTORY
+++ b/z-java/jdk1.5-bin/HISTORY
@@ -1,3 +1,7 @@
+2006-02-08 David Kowis <dkowis AT shlrm.org>
+ * CONFLICTS: added a conflicts on jdk6-bin. Technically they don't
conflict
+ We just dont' have a way to select which one would be active...
+
2006-12-24 David Kowis <dkowis AT shlrm.org>
* DEPENDS: Changed X11-LIBS to optional, because it's only needed to
run guis. not everything

diff --git a/z-java/jdk6-bin/BUILD b/z-java/jdk6-bin/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/z-java/jdk6-bin/BUILD
@@ -0,0 +1 @@
+true
diff --git a/z-java/jdk6-bin/CONFIGURE b/z-java/jdk6-bin/CONFIGURE
new file mode 100755
index 0000000..44c9e1f
--- /dev/null
+++ b/z-java/jdk6-bin/CONFIGURE
@@ -0,0 +1,7 @@
+# download java sources warning.
+#
+source $SECTION_DIRECTORY/JAVA_WARNING &&
+
+# Standard rejected warnings.
+#
+source $GRIMOIRE/REJECTED_MSG
diff --git a/z-java/jdk6-bin/CONFLICTS b/z-java/jdk6-bin/CONFLICTS
new file mode 100755
index 0000000..20e3319
--- /dev/null
+++ b/z-java/jdk6-bin/CONFLICTS
@@ -0,0 +1,3 @@
+conflicts j2sdk &&
+conflicts j2sdk-bin &&
+conflicts jre1.5-bin
diff --git a/z-java/jdk6-bin/DEPENDS b/z-java/jdk6-bin/DEPENDS
new file mode 100755
index 0000000..0b2cf2c
--- /dev/null
+++ b/z-java/jdk6-bin/DEPENDS
@@ -0,0 +1,6 @@
+depends unixodbc &&
+optional_depends X11-LIBS "" "" "To run gui applications" &&
+
+if [ "$(get_spell_provider $SPELL X11-LIBS)" == "xorg-server" ]; then
+ depends libxi
+fi
diff --git a/z-java/jdk6-bin/DETAILS b/z-java/jdk6-bin/DETAILS
new file mode 100755
index 0000000..b9d64cf
--- /dev/null
+++ b/z-java/jdk6-bin/DETAILS
@@ -0,0 +1,43 @@
+. $GRIMOIRE/FUNCTIONS
+ SPELL=jdk6-bin
+ VERSION=6
+ VER=1.6.0
+case "${SMGL_COMPAT_ARCHS[0]}" in
+ ia32|32)
+ SOURCE=jdk-$VERSION-linux-i586.bin
+
SOURCE_HASH=sha512:1528e21305f1483e19572db09edf886518b7e8be349a71e49341f12a6fb0c101ce6686dfd67dc5b0e156789425ebf911fa6718225fa76c7583011d65757648d8
+ ;;
+ x86-64|64)
+ if [[ "${SMGL_COMPAT_ARCHS[@]/32/}" == "${SMGL_COMPAT_ARCHS[@]}" ]]
+ then
+ SOURCE=jdk-$VERSION-linux-amd64.bin
+
SOURCE_HASH=sha512:5cd3403cfeb8129512c67e1810459394cbd9cf13474526a27e02e9f99dce1ae0e958d65c0ada2cc0abf039857979a7175813d1a1e2fb70720f1d7cee7ee67136
+ else
+ SOURCE=jdk-$VERSION-linux-i586.bin
+
SOURCE_HASH=sha512:1528e21305f1483e19572db09edf886518b7e8be349a71e49341f12a6fb0c101ce6686dfd67dc5b0e156789425ebf911fa6718225fa76c7583011d65757648d8
+ fi
+ ;;
+###########################################################################
+# Missing support for sparc and sparcv9 tarballs say solaris not linux :\
+###########################################################################
+ *)
+ SOURCE=
+ VERSION=Unsupported
+ VER=Unsupported
+ ;;
+esac
+ WEB_SITE=http://java.sun.com/javase/downloads/index.jsp
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/jdk$VER
+ ENTERED=20070208
+ ARCHIVE="off"
+ REJECT="is non-source"
+ SHORT="jdk6-bin is the Java Software Development Kit"
+cat << EOF
+The Java Development Kit is a feature-complete development and
+deployment platform. The JDK contains the Java Plug-In for Netscape 4.x
+and Mozilla/Netscape 6.x, if you've installed the i586.
+
+Note: You need to download the JDK installer yourself from the Sun Website,
+see 'gaze website $SPELL' for the location. Put the downloaded file in
+/var/spool/sorcery so cast will find it.
+EOF
diff --git a/z-java/jdk6-bin/FINAL b/z-java/jdk6-bin/FINAL
new file mode 100755
index 0000000..4d405ec
--- /dev/null
+++ b/z-java/jdk6-bin/FINAL
@@ -0,0 +1,3 @@
+# ensure the JAVA_HOME is available.
+#
+source /etc/profile.d/java.sh
diff --git a/z-java/jdk6-bin/HISTORY b/z-java/jdk6-bin/HISTORY
new file mode 100644
index 0000000..6d41c79
--- /dev/null
+++ b/z-java/jdk6-bin/HISTORY
@@ -0,0 +1,2 @@
+2007-02-08 David Kowis <dkowis AT shlrm.org>
+ * ALL: created spell based off the jdk1.5-bin spell
diff --git a/z-java/jdk6-bin/INSTALL b/z-java/jdk6-bin/INSTALL
new file mode 100755
index 0000000..68c96d0
--- /dev/null
+++ b/z-java/jdk6-bin/INSTALL
@@ -0,0 +1,27 @@
+cd ${INSTALL_ROOT}/usr/lib &&
+
+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
+
+if [[ "${SMGL_COMPAT_ARCH[0]}" == "ia32" ]]
+then
+ if [ -d ${INSTALL_ROOT}/usr/lib/mozilla/plugins ]
+ then
+ ln -sf
${INSTALL_ROOT}/usr/lib/jdk$VER/jre/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
+ ln -sf
${INSTALL_ROOT}/usr/lib/jdk$VER/jre/plugin/i386/ns7/libjavaplugin_oji.so \
+
${INSTALL_ROOT}/usr/lib/firefox/plugins/libjavaplugin_oji.so
+ fi
+fi &&
+
+mkdir -p ${INSTALL_ROOT}/etc/profile.d/ &&
+install -m 0644 $SECTION_DIRECTORY/java.sh ${INSTALL_ROOT}/etc/profile.d/ &&
+ln -sfn ${INSTALL_ROOT}/usr/lib/jdk$VER/ ${INSTALL_ROOT}/usr/lib/j2sdk
diff --git a/z-java/jdk6-bin/PRE_BUILD b/z-java/jdk6-bin/PRE_BUILD
new file mode 100755
index 0000000..b65c931
--- /dev/null
+++ b/z-java/jdk6-bin/PRE_BUILD
@@ -0,0 +1 @@
+unpack_file ''
diff --git a/z-java/jdk6-bin/PROVIDES b/z-java/jdk6-bin/PROVIDES
new file mode 100755
index 0000000..1dd7c10
--- /dev/null
+++ b/z-java/jdk6-bin/PROVIDES
@@ -0,0 +1,2 @@
+JAVA
+JDK
diff --git a/z-java/jdk6-bin/UNATTEND_SAFE b/z-java/jdk6-bin/UNATTEND_SAFE
new file mode 100644
index 0000000..9a3364d
--- /dev/null
+++ b/z-java/jdk6-bin/UNATTEND_SAFE
@@ -0,0 +1 @@
+License has already been agreed to when user gets sources seperately.
diff --git a/z-java/jdk6-bin/volatiles b/z-java/jdk6-bin/volatiles
new file mode 100755
index 0000000..f3ef0d6
--- /dev/null
+++ b/z-java/jdk6-bin/volatiles
@@ -0,0 +1,2 @@
+^/usr/lib/jdk1\.5\.0_06/demo/jvmti/heapTracker/lib/libheapTracker_g\.so$
+^/usr/lib/jdk1\.5\.0_06/demo/jvmti/mtrace/lib/libmtrace_g\.so$
diff --git a/z-java/jre1.5-bin/CONFLICTS b/z-java/jre1.5-bin/CONFLICTS
index 03f7548..5d8c35c 100755
--- a/z-java/jre1.5-bin/CONFLICTS
+++ b/z-java/jre1.5-bin/CONFLICTS
@@ -1,3 +1,4 @@
conflicts j2sdk &&
conflicts j2sdk-bin &&
-conflicts jdk1.5-bin
+conflicts jdk1.5-bin &&
+conflicts jdk6-bin
diff --git a/z-java/jre1.5-bin/HISTORY b/z-java/jre1.5-bin/HISTORY
index 43771c9..4fbfb1b 100644
--- a/z-java/jre1.5-bin/HISTORY
+++ b/z-java/jre1.5-bin/HISTORY
@@ -1,3 +1,6 @@
+2007-02-08 David Kowis <dkowis AT shlrm.org>
+ * CONFLICTS: made conflict with jdk6-bin
+
2007-01-02 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated ot 1.5.0.10



  • [SM-Commit] GIT changes to master z-rejected grimoire by David Kowis (8ebeef92003d2be880081c150aa697f088047971), David Kowis, 02/08/2007

Archive powered by MHonArc 2.6.24.

Top of Page