[jmol] Update to 14.0.3.
Susi Lehtola
jussilehtola at fedoraproject.org
Wed Jan 1 21:27:09 UTC 2014
commit 8f8f505a9b671f32938c2244ee5b6db5ef1d960e
Author: Susi Lehtola <jussilehtola at fedoraproject.org>
Date: Wed Jan 1 23:27:02 2014 +0200
Update to 14.0.3.
jmol-14.0.3-dontsign.patch | 64 ++++++++++++++++++++++++++++++++++++++
jmol-14.0.3-fedorabuild.patch | 69 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 133 insertions(+), 0 deletions(-)
---
diff --git a/jmol-14.0.3-dontsign.patch b/jmol-14.0.3-dontsign.patch
new file mode 100644
index 0000000..cd1a88b
--- /dev/null
+++ b/jmol-14.0.3-dontsign.patch
@@ -0,0 +1,64 @@
+diff -up jmol-14.0.3/build.xml.nosign jmol-14.0.3/build.xml
+--- jmol-14.0.3/build.xml.nosign 2014-01-01 23:14:09.418488188 +0200
++++ jmol-14.0.3/build.xml 2014-01-01 23:18:35.610407535 +0200
+@@ -153,7 +153,7 @@ Bob Hanson hansonr at stolaf.edu 11/26/2013
+ </fileset>
+ </path>
+
+- <target name="main" id="main" depends="init,jar,applet-jar,signed-applet,smiles-applet-jar"/>
++ <target name="main" id="main" depends="init,jar,applet-jar,smiles-applet-jar"/>
+
+ <target name="all" id="all" depends="doc,main"/>
+
+@@ -517,10 +517,10 @@ all support for previous versions remove
+ <fileset dir="${appjars.dir}" includes="**/*"/>
+ <fileset dir="src/org/jmol/translation/Jmol" includes="Messages*.class"/>
+ </jar>
+- <antcall target="sign-jar-file">
++ <!--<antcall target="sign-jar-file">
+ <param name="sign-jar-file-dir" value="build" />
+ <param name="sign-jar-file-name" value="Jmol.jar" />
+- </antcall>
++ </antcall>-->
+
+ <jar destfile="build/JmolData.jar"
+ manifest="manifest/applicationData.txt">
+@@ -551,10 +551,10 @@ all support for previous versions remove
+ <fileset dir="${appjars.dir}" includes="**/cli/** **/naga/**" />
+ <fileset dir="src/org/jmol/translation/Jmol" includes="Messages*.class"/>
+ </jar>
+- <antcall target="sign-jar-file">
++ <!--<antcall target="sign-jar-file">
+ <param name="sign-jar-file-dir" value="build" />
+ <param name="sign-jar-file-name" value="JmolData.jar" />
+- </antcall>
++ </antcall>-->
+
+ <copy todir="build">
+ <fileset dir=".">
+@@ -583,10 +583,10 @@ all support for previous versions remove
+ </fileset>
+ <fileset dir="${appjars.dir}" includes="**/*"/>
+ </jar>
+- <antcall target="sign-jar-file">
++ <!--<antcall target="sign-jar-file">
+ <param name="sign-jar-file-dir" value="build" />
+ <param name="sign-jar-file-name" value="Jvxl.jar" />
+- </antcall>
++ </antcall>-->
+ <!--
+ <jar destfile="ChimeToJmol.jar"
+ manifest="manifest/chimetojmol.txt">
+@@ -1151,10 +1151,10 @@ all support for previous versions remove
+ </indexjars>
+ </jar>
+ <echo> signing JmolApplet*.jar</echo>
+- <antcall target="sign-jar-file">
++ <!--<antcall target="sign-jar-file">
+ <param name="sign-jar-file-dir" value="build" />
+ <param name="sign-jar-file-name" value="JmolApplet*.jar" />
+- </antcall>
++ </antcall>-->
+
+ </target>
+
diff --git a/jmol-14.0.3-fedorabuild.patch b/jmol-14.0.3-fedorabuild.patch
new file mode 100644
index 0000000..23dff3f
--- /dev/null
+++ b/jmol-14.0.3-fedorabuild.patch
@@ -0,0 +1,69 @@
+diff -up jmol-14.0.3/build.xml.fedorabuild jmol-14.0.3/build.xml
+--- jmol-14.0.3/build.xml.fedorabuild 2013-12-30 03:27:17.000000000 +0200
++++ jmol-14.0.3/build.xml 2014-01-01 23:13:51.023979589 +0200
+@@ -62,7 +62,7 @@ Bob Hanson hansonr at stolaf.edu 11/26/2013
+ <!-- pull developer-specific settings from their home directory -->
+ <property file="${user.home}/.jmol.build.properties" />
+ <!-- compile options -->
+- <property name="build.sysclasspath" value="ignore" />
++ <property name="build.sysclasspath" value="last" />
+ <property name="build.compiler" value="javac1.6" />
+ <!-- for some reason, I can't get ant to use this ${java.version}
+ property as the value of the source parameter -->
+@@ -95,13 +95,13 @@ Bob Hanson hansonr at stolaf.edu 11/26/2013
+ <echo message="version=${version}" />
+ <property name="jvxl_version" value="0.1" />
+
+- <input message="private property file:" addproperty="Private.propertyFile" defaultValue="none" />
++ <!--<input message="private property file:" addproperty="Private.propertyFile" defaultValue="none" />-->
+ <if><available file="${Private.propertyFile}" /><then>
+ <property file="${Private.propertyFile}" />
+ <echo>using ${Private.keystore} ${Private.storetype}</echo>
+ </then></if>
+ <property name="tests.source.dir" value="source-tests" />
+- <property name="lib.dir" value="jars" />
++ <property name="lib.dir" value="/usr/share/java" />
+ <property name="plugin.dir" value="plugin-jars" />
+ <property name="appjars.dir" value="build/appjars" />
+ <property name="classes.dir" value="build/classes" />
+@@ -113,8 +113,8 @@ Bob Hanson hansonr at stolaf.edu 11/26/2013
+ <property name="jmol.applet.web.dir" value="appletweb" />
+ <property name="docbook-xsl" value="docbook-xsl-1.76.1" />
+ <property name="docbook-xml" value="docbook-xml-4.4" />
+- <property name="naga.jar" value="naga-3_0.jar" />
+- <property name="commons-cli.jar" value="commons-cli-1.0.jar" />
++ <property name="naga.jar" value="naga.jar" />
++ <property name="commons-cli.jar" value="commons-cli.jar" />
+ <property name="saxon.jar" value="saxon.jar" />
+ <property name="saxon.main" value="com.icl.saxon.StyleSheet" />
+ <property name="selfsign.store" value="ca-cert/selfSignedCertificate/selfSignedCertificate.store" />
+@@ -438,7 +438,8 @@ all support for previous versions remove
+ <!-- srcfiles dir="${lib.dir}" includes="Acme.jar"/ -->
+ <!-- srcfiles dir="${lib.dir}" includes="${itext.jar}"/ -->
+ <srcfiles dir="${lib.dir}" includes="${commons-cli.jar}"/>
+- <srcfiles dir="${lib.dir}" includes="JSpecView.jar"/>
++ <srcfiles dir="${lib.dir}" includes="jspecview.app.jar"/>
++ <srcfiles dir="${lib.dir}" includes="jspecview.applet.jar"/>
+ </uptodate>
+ <uptodate targetfile="build/libjars.timestamp"
+ srcfile="${appjars.dir}"/>
+@@ -471,7 +472,8 @@ all support for previous versions remove
+ <!-- unjar dest="${appjars.dir}" src="${lib.dir}/Acme.jar"/ -->
+ <!-- unjar dest="${appjars.dir}" src="${lib.dir}/${itext.jar}"/ -->
+ <unjar dest="${appjars.dir}" src="${lib.dir}/${commons-cli.jar}"/>
+- <unjar dest="${appjars.dir}" src="${lib.dir}/JSpecView.jar"/>
++ <unjar dest="${appjars.dir}" src="${lib.dir}/jspecview.app.jar"/>
++ <unjar dest="${appjars.dir}" src="${lib.dir}/jspecview.applet.jar"/>
+ <delete dir="${appjars.dir}/javajs" />
+ <delete dir="${appjars.dir}/org/jmol" />
+ <delete dir="${appjars.dir}/META-INF" />
+@@ -1223,7 +1225,8 @@ all support for previous versions remove
+ <include name="JmolLib.jar" />
+ </fileset>
+ <fileset dir="jars">
+- <include name="JSpecView.jar" />
++ <include name="jspecview.app.jar" />
++ <include name="jspecview.applet.jar" />
+ </fileset>
+ <fileset dir=".">
+ <include name="jmol" />
More information about the scm-commits
mailing list