[SM-Commit] GIT changes to master grimoire by Eric Sandall (6bab253bc6cd4792fefa8f386e233dd1f89f7327)

Eric Sandall scm at sourcemage.org
Sun Jul 13 06:57:44 EDT 2008


GIT changes to master grimoire by Eric Sandall <sandalle at sourcemage.org>:

 science/jmol/DETAILS                     |   10 ++++----
 science/jmol/HISTORY                     |    9 +++++++
 science/jmol/INSTALL                     |    1 
 science/jmol/PRE_BUILD                   |    3 ++
 science/jmol/jmol-11.4.5-full.tar.gz.sig |binary
 science/jmol/no-signed.patch             |   36 +++++++++++++++++++++++++++++++
 6 files changed, 53 insertions(+), 6 deletions(-)

New commits:
commit 6bab253bc6cd4792fefa8f386e233dd1f89f7327
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    jmol: Updated to 11.4.5

diff --git a/science/jmol/DETAILS b/science/jmol/DETAILS
index d0b5693..a8cf9bc 100755
--- a/science/jmol/DETAILS
+++ b/science/jmol/DETAILS
@@ -1,14 +1,14 @@
            SPELL=jmol
-         VERSION=10.00
+         VERSION=11.4.5
           SOURCE=${SPELL}-${VERSION}-full.tar.gz
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
    SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
-     SOURCE_HASH=sha512:1a4e720bd6ce80d6db3ed6bb5c03b8886e793709196dba306b6685a7986e42e59e03d9f857a95041618135275ecfa242910cafa2467345be8385b984f12e6bcc
-          MD5[0]=39eb9772075c5fd16e91b981b9b76a61
-        WEB_SITE=http://jmol.sourceforge.net/
+#     SOURCE_HASH=sha512:1a4e720bd6ce80d6db3ed6bb5c03b8886e793709196dba306b6685a7986e42e59e03d9f857a95041618135275ecfa242910cafa2467345be8385b984f12e6bcc
+      SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
       LICENSE[0]=GNU
-         ENTERED=20030517
+        WEB_SITE=http://jmol.sourceforge.net/
         KEYWORDS="java science"
+         ENTERED=20030517
            SHORT="Jmol is a free, open source molecule viewer written in Java."
 cat << EOF
  Jmol is a collaboratively developed visualization and measurement tool for scientists and educators.
diff --git a/science/jmol/HISTORY b/science/jmol/HISTORY
index 794638c..c7aeede 100644
--- a/science/jmol/HISTORY
+++ b/science/jmol/HISTORY
@@ -1,3 +1,12 @@
+2008-07-13 Eric Sandall <sandalle at sourcemage.org>
+	* DETAILS: Updated to 11.4.5
+	  Removed MD5!
+	* PRE_BUILD: Apply no-signed.patch
+	* INSTALL: No more samples! :(
+	* no-signed.patch: Don't sign, even the upstream devs aren't sure
+	  what to do, see:
+	  http://www.mail-archive.com/jmol-users@lists.sourceforge.net/msg10457.html
+
 2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/science/jmol/INSTALL b/science/jmol/INSTALL
index 58dedb9..0240716 100755
--- a/science/jmol/INSTALL
+++ b/science/jmol/INSTALL
@@ -1,6 +1,5 @@
 mkdir /usr/share/doc/jmol                                                     &&
 cp -a build/doc/* /usr/share/doc/jmol                                         &&
 mkdir /usr/share/jmol                                                   &&
-cp -a samples /usr/share/jmol                                           &&
 cp Jmol.jar /usr/share/jmol                                             &&
 cp jmol /usr/bin
diff --git a/science/jmol/PRE_BUILD b/science/jmol/PRE_BUILD
new file mode 100755
index 0000000..aaa1882
--- /dev/null
+++ b/science/jmol/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build  &&
+cd  $SOURCE_DIRECTORY  &&
+patch -p1 < $SCRIPT_DIRECTORY/no-signed.patch
diff --git a/science/jmol/jmol-11.4.5-full.tar.gz.sig b/science/jmol/jmol-11.4.5-full.tar.gz.sig
new file mode 100644
index 0000000..e76dc29
Binary files /dev/null and b/science/jmol/jmol-11.4.5-full.tar.gz.sig differ
diff --git a/science/jmol/no-signed.patch b/science/jmol/no-signed.patch
new file mode 100644
index 0000000..aad1d9c
--- /dev/null
+++ b/science/jmol/no-signed.patch
@@ -0,0 +1,36 @@
+diff -Naur jmol-11.4.5.orig/build.xml jmol-11.4.5/build.xml
+--- jmol-11.4.5.orig/build.xml	2008-07-13 03:19:13.520201121 -0700
++++ jmol-11.4.5/build.xml	2008-07-13 03:24:27.395453842 -0700
+@@ -380,10 +380,6 @@
+       <fileset dir="${appjars.dir}" includes="**/*"/>
+       <fileset dir="src/org/jmol/translation/Jmol" includes="Messages*.class"/>
+     </jar>
+-    <signjar jar="${jmol.build.dir}/JmolUnsigned.jar"
+-             signedjar="${jmol.build.dir}/Jmol.jar"
+-             keystore="selfSignedCertificate/selfSignedCertificate.store"
+-             storepass="selfSignedCertificate" alias="selfSignedCertificate" />
+     <!-- to verify that a .jar file is signed: jarsigner -verify foo.jar -->
+     <copy todir="${jmol.build.dir}">
+       <fileset dir=".">
+@@ -412,12 +408,6 @@
+       <fileset dir="${appjars.dir}" includes="**/*"/>
+     </jar>
+ 
+-  	<signjar jar="${jmol.build.dir}/JvxlUnsigned.jar"
+-             signedjar="${jmol.build.dir}/Jvxl.jar"
+-             keystore="selfSignedCertificate/selfSignedCertificate.store"
+-             storepass="selfSignedCertificate" alias="selfSignedCertificate" />
+-    <delete file="${jmol.build.dir}/JvxlUnsigned.jar"/>
+-
+   </target>
+ 
+   <target name="apis-jar" id="apis-jar" depends="init,apisio-classes">
+@@ -772,7 +762,7 @@
+   </target>
+ 
+   <target name="dist" id="dist"
+-          depends="doc,main-i18n,main,signed-applet">
++          depends="doc,main-i18n,main">
+     <!-- first build binary distribution -->
+     <delete dir="build/dist/jmol-${version}"/>
+     <mkdir dir="build/dist/jmol-${version}"/>



More information about the SM-Commit mailing list