Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master z-rejected grimoire by Julien ROZO (fc53b6f5603d9900052de5bd3720a978796e2d73)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Julien ROZO <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master z-rejected grimoire by Julien ROZO (fc53b6f5603d9900052de5bd3720a978796e2d73)
  • Date: Fri, 28 Mar 2008 02:39:28 -0500

GIT changes to master z-rejected grimoire by Julien ROZO <julien AT rozo.org>:

dev/null |binary
z-java/j2sdk-bin/HISTORY | 3 +++
z-java/j2sdk-bin/JAVA_WARNING | 2 +-
z-java/jdk1.5-bin/DETAILS | 10 +++++-----
z-java/jdk1.5-bin/HISTORY | 3 +++
z-java/jdk6-bin/DETAILS | 10 +++++-----
z-java/jdk6-bin/HISTORY | 3 +++
z-java/jre1.5-bin/CONFIGURE | 2 +-
z-java/jre1.5-bin/DEPENDS | 10 +++++++++-
z-java/jre1.5-bin/DETAILS | 12 ++++++------
z-java/jre1.5-bin/HISTORY | 8 ++++++++
z-java/jre1.5-bin/JAVA_WARNING | 14 ++++++++++++++
z-java/jre1.5-bin/jre-1_5_0_12-linux-amd64.bin.sig | 0
z-java/jre1.5-bin/jre-1_5_0_12-linux-i586.bin.sig | 0
14 files changed, 58 insertions(+), 19 deletions(-)

New commits:
commit fc53b6f5603d9900052de5bd3720a978796e2d73
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

jre1.5-bin: updated version to 1_5_0_15
fixed WEB_SITE
modified CONFIGURE to use a new JAVA_WARNING script in SPELL_DIRECTORY
instead of the one in SECTION_DIRECTORY, as there's no DJL version for
jre 1.5.0. Instead, the new JAVA_WARNING script warns users they have
to download the source file before casting the spell
added alsa-lib as a dependency, and X11-LIBS as an optional one

commit 49c0cab8d2928550e34224f59e9413e472670bc0
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

j2sdk-bin: fixed the text color in JAVA_WARNING at the end of the first
message

commit 178da85feaa30409dd6f67432d6bd9e655c8125a
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

jdk1.5-bin: updated version to 1.5.0_15 / 5.0u15

commit 769999d708c5571a11cfdaa187afcfadd5cd380f
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

jdk6-bin: updated version to 6u5

diff --git a/z-java/j2sdk-bin/HISTORY b/z-java/j2sdk-bin/HISTORY
index 182ee38..affb2fb 100644
--- a/z-java/j2sdk-bin/HISTORY
+++ b/z-java/j2sdk-bin/HISTORY
@@ -1,3 +1,6 @@
+2008-03-27 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * JAVA_WARNING: fixed the text color at the end of the first message
+
2008-03-08 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 1_4_2_17
* CONFIGURE: now uses JAVA_WARNING in SPELL_DIRECTORY instead of the
one
diff --git a/z-java/j2sdk-bin/JAVA_WARNING b/z-java/j2sdk-bin/JAVA_WARNING
index 88af5d9..388a86c 100755
--- a/z-java/j2sdk-bin/JAVA_WARNING
+++ b/z-java/j2sdk-bin/JAVA_WARNING
@@ -5,7 +5,7 @@ message "\n${MESSAGE_COLOR}For $SPELL you need to manually
download the sources
${DEFAULT_COLOR}\n http://java.sun.com/j2se/1.4.2/download.html \
\n${MESSAGE_COLOR}Put the downloaded file in \
${DEFAULT_COLOR}/var/spool/sorcery/ \
-${MESSAGE_COLOR}so cast will find it.\n" &&
+${MESSAGE_COLOR}so cast will find it.\n${DEFAULT_COLOR}" &&

if ! query "HAVE YOU DOWNLOADED THE SOURCES AND WISH TO CONTINUE CASTING?" n;
then
diff --git a/z-java/jdk1.5-bin/DETAILS b/z-java/jdk1.5-bin/DETAILS
index c577b1d..156189d 100755
--- a/z-java/jdk1.5-bin/DETAILS
+++ b/z-java/jdk1.5-bin/DETAILS
@@ -1,20 +1,20 @@
. $GRIMOIRE/FUNCTIONS
SPELL=jdk1.5-bin
- VERSION=5.0u14
- VER=1.5.0_14
+ VERSION=5.0u15
+ VER=1.5.0_15
case "${SMGL_COMPAT_ARCHS[0]}" in
ia32|32)
SOURCE=jdk-$VERSION-dlj-linux-i586.bin
-
SOURCE_HASH=sha512:e242ab463bf1dc596ee63fcbf9664c76523ee301d169ea76f7cfb1bf4687458c6709f5b7015e278eea69ff3d8cdbf02b56d3e88f3ac48aca1a9c7c0853733a97
+
SOURCE_HASH=sha512:3d5b99a0e4a4249dde129865f7ff5ee57516037016d45d5c8c2b2f15b3bcaedd78c9f9a377f9ae2160e8766ee092d4ced61110712b802594498f434764b3c0e6
;;
x86-64|64)
if [[ "${SMGL_COMPAT_ARCHS[@]/32/}" == "${SMGL_COMPAT_ARCHS[@]}" ]]
then
SOURCE=jdk-$VERSION-dlj-linux-amd64.bin
-
SOURCE_HASH=sha512:9f6486a4eb4a3e195ff8c795cbe6968a98d3745876c33112619a9806cb7c91220d40bb4f526e0b4280f50c053a62233fa22da1830ef9e526ba8d9fdf506128ef
+
SOURCE_HASH=sha512:7d77e9361b7d821244fa072f3ee9c58a19d6874547706ef66bb402d533224c990a8e02d9bf53090e2479f87689ec255aa34a3bd5a6ec90ef2fda4410354ccaca
else
SOURCE=jdk-$VERSION-dlj-linux-i586.bin
-
SOURCE_HASH=sha512:e242ab463bf1dc596ee63fcbf9664c76523ee301d169ea76f7cfb1bf4687458c6709f5b7015e278eea69ff3d8cdbf02b56d3e88f3ac48aca1a9c7c0853733a97
+
SOURCE_HASH=sha512:3d5b99a0e4a4249dde129865f7ff5ee57516037016d45d5c8c2b2f15b3bcaedd78c9f9a377f9ae2160e8766ee092d4ced61110712b802594498f434764b3c0e6
fi
;;
###########################################################################
diff --git a/z-java/jdk1.5-bin/HISTORY b/z-java/jdk1.5-bin/HISTORY
index 14033fb..52d7396 100644
--- a/z-java/jdk1.5-bin/HISTORY
+++ b/z-java/jdk1.5-bin/HISTORY
@@ -1,3 +1,6 @@
+2008-03-27 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 1.5.0_15 / 5.0u15
+
2008-03-04 Julien "_kaze_" ROZO <julien AT rozo.org>
* DEPENDS: added alsa-lib

diff --git a/z-java/jdk6-bin/DETAILS b/z-java/jdk6-bin/DETAILS
index 315bb80..45e4f53 100755
--- a/z-java/jdk6-bin/DETAILS
+++ b/z-java/jdk6-bin/DETAILS
@@ -1,20 +1,20 @@
. $GRIMOIRE/FUNCTIONS
SPELL=jdk6-bin
- VERSION=6u4
- VER=1.6.0_04
+ VERSION=6u5
+ VER=1.6.0_05
case "${SMGL_COMPAT_ARCHS[0]}" in
ia32|32)
SOURCE=jdk-$VERSION-dlj-linux-i586.bin
-
SOURCE_HASH=sha512:f8b047b9314f3357655897195edeeeffaa9a705cf03f570d374fd3476bbbc3e31a3b55c5a3fc91f3a1e39d6bceddb58b0f405a33254ea2ced7a90915ffbd2dd3
+
SOURCE_HASH=sha512:7abbfd9cbab82165b4192b35c0d40199831037356c056d56cac497bfb6b361b7d8becad532e04a0cdce14c7742be4508b605816bc36540c860e91b20c5c7cb2a
;;
x86-64|64)
if [[ "${SMGL_COMPAT_ARCHS[@]/32/}" == "${SMGL_COMPAT_ARCHS[@]}" ]]
then
SOURCE=jdk-$VERSION-dlj-linux-amd64.bin
-
SOURCE_HASH=sha512:9263ea88aab86cbd422f8b460d2f9901dc4f21d80dc9005a0337f45d3257b20039fc76138a9d739612f1056cab1e07646b388b149711fd53d4055dbf483522f8
+
SOURCE_HASH=sha512:c35734f8a34c9aa53c9eb0d5b7f9de79c124fdbb5959b5e8d34e9cef980245ff566bc89977d3f4af11d47bd3a66073de023353804e7679afec70d06edc714192
else
SOURCE=jdk-$VERSION-dlj-linux-i586.bin
-
SOURCE_HASH=sha512:f8b047b9314f3357655897195edeeeffaa9a705cf03f570d374fd3476bbbc3e31a3b55c5a3fc91f3a1e39d6bceddb58b0f405a33254ea2ced7a90915ffbd2dd3
+
SOURCE_HASH=sha512:7abbfd9cbab82165b4192b35c0d40199831037356c056d56cac497bfb6b361b7d8becad532e04a0cdce14c7742be4508b605816bc36540c860e91b20c5c7cb2a
fi
;;
###########################################################################
diff --git a/z-java/jdk6-bin/HISTORY b/z-java/jdk6-bin/HISTORY
index 28fa07f..d397145 100644
--- a/z-java/jdk6-bin/HISTORY
+++ b/z-java/jdk6-bin/HISTORY
@@ -1,3 +1,6 @@
+2008-03-27 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 6u5
+
2008-01-20 Julien "_kaze_" ROZO <julien AT rozo.org>
* DEPENDS: added alsa-lib and gcc33

diff --git a/z-java/jre1.5-bin/CONFIGURE b/z-java/jre1.5-bin/CONFIGURE
index 44c9e1f..ee38dba 100755
--- a/z-java/jre1.5-bin/CONFIGURE
+++ b/z-java/jre1.5-bin/CONFIGURE
@@ -1,6 +1,6 @@
# download java sources warning.
#
-source $SECTION_DIRECTORY/JAVA_WARNING &&
+source $SPELL_DIRECTORY/JAVA_WARNING &&

# Standard rejected warnings.
#
diff --git a/z-java/jre1.5-bin/DEPENDS b/z-java/jre1.5-bin/DEPENDS
index 5746e1d..b85a552 100755
--- a/z-java/jre1.5-bin/DEPENDS
+++ b/z-java/jre1.5-bin/DEPENDS
@@ -1 +1,9 @@
-depends unixodbc
+depends unixodbc &&
+depends alsa-lib &&
+
+optional_depends X11-LIBS "" "" "To run gui applications" &&
+
+. $GRIMOIRE/FUNCTIONS &&
+if check_if_xorg_modular_libs; then
+ depends libxi
+fi
diff --git a/z-java/jre1.5-bin/DETAILS b/z-java/jre1.5-bin/DETAILS
index 670d747..8c36d6e 100755
--- a/z-java/jre1.5-bin/DETAILS
+++ b/z-java/jre1.5-bin/DETAILS
@@ -1,20 +1,20 @@
. $GRIMOIRE/FUNCTIONS
SPELL=jre1.5-bin
- VERSION=1_5_0_12
- VER=1.5.0_12
+ VERSION=1_5_0_15
+ VER=1.5.0_15
case "${SMGL_COMPAT_ARCHS[0]}" in
ia32|32)
SOURCE=jre-$VERSION-linux-i586.bin
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+
SOURCE_HASH=sha512:a52008d7ab731fd8b16cece053e9efe146b46afccd0200c3e2716a1f54380c132afd6fe8180f4d9834b3021cf924dd6c500f94cbfe2fb834f03d441590477537
;;
x86-64|64)
if [[ "${SMGL_COMPAT_ARCHS[@]/32/}" == "${SMGL_COMPAT_ARCHS[@]}" ]]
then
SOURCE=jre-$VERSION-linux-amd64.bin
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+
SOURCE_HASH=sha512:fa8f1773fb8edf6fd516af87634eccb2d6b604830ee9898a8f24546cdb7e5e8138a3b4a9b27a9ca50afee03c921cda1833900994a33c58d3e61d4c5558d4b4ed
else
SOURCE=jre-$VERSION-linux-i586.bin
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+
SOURCE_HASH=sha512:a52008d7ab731fd8b16cece053e9efe146b46afccd0200c3e2716a1f54380c132afd6fe8180f4d9834b3021cf924dd6c500f94cbfe2fb834f03d441590477537
fi
;;
###########################################################################
@@ -26,7 +26,7 @@ case "${SMGL_COMPAT_ARCHS[0]}" in
VER=Unsupported
;;
esac
- WEB_SITE=http://java.sun.com/j2se/1.5.0/download.html
+ WEB_SITE=http://java.sun.com/javase/downloads/index_jdk5.jsp
SOURCE_DIRECTORY=$BUILD_DIRECTORY/jre$VER
ENTERED=20051101
ARCHIVE="off"
diff --git a/z-java/jre1.5-bin/HISTORY b/z-java/jre1.5-bin/HISTORY
index b93d187..a42a66c 100644
--- a/z-java/jre1.5-bin/HISTORY
+++ b/z-java/jre1.5-bin/HISTORY
@@ -1,3 +1,11 @@
+2008-03-27 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 1_5_0_15, fixed WEB_SITE
+ * DEPENDS: added alsa-lib as dependency, and X11-LIBS as optional one
+ * CONFIGURE: now uses JAVA_WARNING in SPELL_DIRECTORY instead of the
one
+ in SECTION_DIRECTORY (there's no DJL version for jre 1.5.0)
+ * JAVA_WARNING: added, to warn users they have to download the source
+ file before casting
+
2007-06-30 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to 1.5.0_12

diff --git a/z-java/jre1.5-bin/JAVA_WARNING b/z-java/jre1.5-bin/JAVA_WARNING
new file mode 100644
index 0000000..9b282a5
--- /dev/null
+++ b/z-java/jre1.5-bin/JAVA_WARNING
@@ -0,0 +1,14 @@
+# Special messages with regards to JRE 1.5.0 sources.
+#
+message "\n${MESSAGE_COLOR}For $SPELL you need to manually download the
sources for JRE \
+\nversion 1.5.0 in self-extracting format from Sun's website: \
+${DEFAULT_COLOR}\n http://java.sun.com/javase/downloads/index_jdk5.jsp \
+\n${MESSAGE_COLOR}Put the downloaded file in \
+${DEFAULT_COLOR}/var/spool/sorcery/ \
+${MESSAGE_COLOR}so cast will find it.\n${DEFAULT_COLOR}" &&
+
+if ! query "HAVE YOU DOWNLOADED THE SOURCES AND WISH TO CONTINUE CASTING?" n;
+then
+ message "${MESSAGE_COLOR}Please recast when you have the
sources!\n${DEFAULT_COLOR}"
+ return 1
+fi
diff --git a/z-java/jre1.5-bin/jre-1_5_0_12-linux-amd64.bin.sig
b/z-java/jre1.5-bin/jre-1_5_0_12-linux-amd64.bin.sig
deleted file mode 100644
index 56a7bdb..0000000
Binary files a/z-java/jre1.5-bin/jre-1_5_0_12-linux-amd64.bin.sig and
/dev/null differ
diff --git a/z-java/jre1.5-bin/jre-1_5_0_12-linux-i586.bin.sig
b/z-java/jre1.5-bin/jre-1_5_0_12-linux-i586.bin.sig
deleted file mode 100644
index eeafe14..0000000
Binary files a/z-java/jre1.5-bin/jre-1_5_0_12-linux-i586.bin.sig and
/dev/null differ



  • [SM-Commit] GIT changes to master z-rejected grimoire by Julien ROZO (fc53b6f5603d9900052de5bd3720a978796e2d73), Julien ROZO, 03/28/2008

Archive powered by MHonArc 2.6.24.

Top of Page