[jmol/f14/master] Update to 12.0.41.
Jussi Lehtola
jussilehtola at fedoraproject.org
Thu Apr 28 13:09:58 UTC 2011
commit 7c7bef95f2e4c9206fb458bbaf4ceefd91b56699
Author: Jussi Lehtola <jussilehtola at fedoraproject.org>
Date: Thu Apr 28 16:09:47 2011 +0300
Update to 12.0.41.
jmol-11.8.14-dontsign.patch | 49 -------
jmol-12.0.41-dontsign.patch | 132 ++++++++++++++++++++
...rabuild.patch => jmol-12.0.41-fedorabuild.patch | 12 +-
...ocation.patch => jmol-12.0.41-jarlocation.patch | 10 +-
jmol.spec | 18 ++-
sources | 2 +-
6 files changed, 157 insertions(+), 66 deletions(-)
---
diff --git a/jmol-12.0.41-dontsign.patch b/jmol-12.0.41-dontsign.patch
new file mode 100644
index 0000000..0325a2f
--- /dev/null
+++ b/jmol-12.0.41-dontsign.patch
@@ -0,0 +1,132 @@
+diff -up jmol-12.0.41/build.xml.nosign jmol-12.0.41/build.xml
+--- jmol-12.0.41/build.xml.nosign 2011-04-28 15:51:50.356440735 +0300
++++ jmol-12.0.41/build.xml 2011-04-28 15:52:46.113118352 +0300
+@@ -418,13 +418,13 @@ all support for previous versions remove
+ <fileset dir="${appjars.dir}" includes="**/*"/>
+ <fileset dir="src/org/jmol/translation/Jmol" includes="Messages*.class"/>
+ </jar>
+- <signjar jar="${jmol.build.dir}/JmolUnsigned.jar"
++ <!--<signjar jar="${jmol.build.dir}/JmolUnsigned.jar"
+ signedjar="${jmol.build.dir}/Jmol.jar"
+ keystore="selfSignedCertificate/selfSignedCertificate.store"
+- storepass="selfSignedCertificate" alias="selfSignedCertificate" />
++ storepass="selfSignedCertificate" alias="selfSignedCertificate" />-->
+ <!-- to verify that a .jar file is signed: jarsigner -verify foo.jar -->
+
+- <delete file="${jmol.build.dir}/JmolUnsigned.jar"/>
++ <!--<delete file="${jmol.build.dir}/JmolUnsigned.jar"/>-->
+ <jar destfile="${jmol.build.dir}/JmolUnsignedF.jar"
+ manifest="manifest/applicationData.txt">
+ <fileset dir="${classes.dir}" >
+@@ -453,13 +453,13 @@ all support for previous versions remove
+ <fileset dir="${appjars.dir}" includes="**/cli/** **/vecmath/**" />
+ <fileset dir="src/org/jmol/translation/Jmol" includes="Messages*.class"/>
+ </jar>
+- <signjar jar="${jmol.build.dir}/JmolUnsignedF.jar"
++ <!--<signjar jar="${jmol.build.dir}/JmolUnsignedF.jar"
+ signedjar="${jmol.build.dir}/JmolData.jar"
+ keystore="selfSignedCertificate/selfSignedCertificate.store"
+- storepass="selfSignedCertificate" alias="selfSignedCertificate" />
++ storepass="selfSignedCertificate" alias="selfSignedCertificate" />-->
+ <!-- to verify that a .jar file is signed: jarsigner -verify foo.jar -->
+
+- <delete file="${jmol.build.dir}/JmolUnsignedF.jar"/>
++ <!--<delete file="${jmol.build.dir}/JmolUnsignedF.jar"/>-->
+ <copy todir="${jmol.build.dir}">
+ <fileset dir=".">
+ <include name="jmol" />
+@@ -485,11 +485,11 @@ all support for previous versions remove
+ <fileset dir="${appjars.dir}" includes="**/*"/>
+ </jar>
+
+- <signjar jar="${jmol.build.dir}/JvxlUnsigned.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"/>
++ <delete file="${jmol.build.dir}/JvxlUnsigned.jar"/>-->
+
+ </target>
+
+@@ -756,7 +756,8 @@ all support for previous versions remove
+ </fileset>
+ <fileset dir="${appletjars.dir}" includes="**/*"/>
+ </jar>
+- <signjar jar="${jmol.applet.build.dir}/JmolAppletSigned.jar.temp"
++
++ <!--<signjar jar="${jmol.applet.build.dir}/JmolAppletSigned.jar.temp"
+ signedjar="${jmol.applet.build.dir}/JmolAppletSigned.jar"
+ keystore="selfSignedCertificate/selfSignedCertificate.store"
+ storepass="selfSignedCertificate" alias="selfSignedCertificate" />
+@@ -770,7 +771,7 @@ all support for previous versions remove
+ <signjar jar="${jmol.applet.build.dir}/JmolApplet0_Minimize.jar"
+ signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_Minimize.jar"
+ keystore="selfSignedCertificate/selfSignedCertificate.store"
+- storepass="selfSignedCertificate" alias="selfSignedCertificate" />
++ storepass="selfSignedCertificate" alias="selfSignedCertificate" />-->
+
+ <jar destfile="${jmol.applet.build.dir}/JmolApplet_MultiTouch.jar.temp"
+ manifest="manifest/appletMonolithic.txt" index="true" >
+@@ -779,6 +780,7 @@ all support for previous versions remove
+ <include name="com/sparshui/**" />
+ </fileset>
+ </jar>
++ <!--
+ <signjar jar="${jmol.applet.build.dir}/JmolApplet_MultiTouch.jar.temp"
+ signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_MultiTouch.jar"
+ keystore="selfSignedCertificate/selfSignedCertificate.store"
+@@ -860,16 +862,17 @@ all support for previous versions remove
+ storepass="selfSignedCertificate" alias="selfSignedCertificate" />
+ </sequential>
+ </for>
++ -->
+
+ <!-- vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv -->
+ <!-- this one must be treated specially because of jar indexing
+ we cannot simply rename the jar file, because the index has
+ the old name (JmolApplet?.jar) inside it -->
+- <jar destfile="${jmol.applet.build.dir}/JmolAppletSigned0.jar"
++ <!--<jar destfile="${jmol.applet.build.dir}/JmolAppletSigned0.jar"
+ manifest="manifest/applet0.txt"
+- index="true">
++ index="true">-->
+ <!-- javax/vecmath -->
+- <fileset dir="${appletjars.dir}" includes="**/*"/>
++ <!--<fileset dir="${appletjars.dir}" includes="**/*"/>
+ <fileset dir="${applet.classes.dir}">
+ <include name="org/jmol/appletwrapper/*" />
+ <include name="JmolApplet*.class" />
+@@ -908,10 +911,11 @@ all support for previous versions remove
+ <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_Symmetry.jar" />
+ <fileset dir="${jmol.applet.build.dir}" includes="JmolAppletSigned0_i18n_*.jar" />
+ </indexjars>
+- </jar>
+- <signjar jar="${jmol.applet.build.dir}/JmolAppletSigned0.jar"
++ </jar>-->
++
++ <!--<signjar jar="${jmol.applet.build.dir}/JmolAppletSigned0.jar"
+ keystore="selfSignedCertificate/selfSignedCertificate.store"
+- storepass="selfSignedCertificate" alias="selfSignedCertificate" />
++ storepass="selfSignedCertificate" alias="selfSignedCertificate" />-->
+ <!-- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -->
+ </target>
+
+@@ -1306,7 +1310,7 @@ all support for previous versions remove
+ workaround for a bugs in the fileset feature of the signjar task. See bugs
+ 5230 and 6988.
+ -->
+- <target name="internal-dist-jws-sign" id="internal-dist-jws-sign">
++ <!--<target name="internal-dist-jws-sign" id="internal-dist-jws-sign">
+ <signjar alias="${keystore.alias}"
+ storepass="${keystore.password}"
+ keystore="${keystore.name}" >
+@@ -1315,7 +1319,7 @@ all support for previous versions remove
+ <exclude name="**/.AppleDouble/**" />
+ </fileset>
+ </signjar>
+- </target>
++ </target>-->
+
+ <target name="clean" id="clean">
+ <delete dir="${classes.dir}"/>
diff --git a/jmol-11.8.14-fedorabuild.patch b/jmol-12.0.41-fedorabuild.patch
similarity index 76%
rename from jmol-11.8.14-fedorabuild.patch
rename to jmol-12.0.41-fedorabuild.patch
index 71a5bb8..ef7096b 100644
--- a/jmol-11.8.14-fedorabuild.patch
+++ b/jmol-12.0.41-fedorabuild.patch
@@ -1,7 +1,7 @@
-diff -up jmol-11.8.14/build.xml.orig jmol-11.8.14/build.xml
---- jmol-11.8.14/build.xml.orig 2009-12-22 08:47:38.000000000 +0200
-+++ jmol-11.8.14/build.xml 2009-12-23 20:19:02.940613996 +0200
-@@ -20,7 +20,7 @@
+diff -up jmol-12.0.41/build.xml.orig jmol-12.0.41/build.xml
+--- jmol-12.0.41/build.xml.orig 2011-04-25 05:33:00.000000000 +0300
++++ jmol-12.0.41/build.xml 2011-04-28 15:23:36.097932849 +0300
+@@ -28,7 +28,7 @@
<property name="jvxl_version" value="0.1" />
<property name="tests.source.dir" value="source-tests" />
@@ -10,9 +10,9 @@ diff -up jmol-11.8.14/build.xml.orig jmol-11.8.14/build.xml
<property name="plugin.dir" value="plugin-jars" />
<property name="appjars.dir" value="build/appjars" />
<property name="classes.dir" value="build/classes" />
-@@ -34,9 +34,9 @@
+@@ -42,9 +42,9 @@
<property name="jmol.build.dir" value="build" />
- <property name="docbook-xsl" value="docbook-xsl-1.74.0" />
+ <property name="docbook-xsl" value="docbook-xsl-1.75.2" />
<property name="docbook-xml" value="docbook-xml-4.4" />
- <property name="vecmath.jar" value="vecmath1.2-1.14.jar" />
- <property name="itext.jar" value="itext-1.4.5.jar" />
diff --git a/jmol-11.8-jarlocation.patch b/jmol-12.0.41-jarlocation.patch
similarity index 53%
rename from jmol-11.8-jarlocation.patch
rename to jmol-12.0.41-jarlocation.patch
index 6691fd1..40b6dae 100644
--- a/jmol-11.8-jarlocation.patch
+++ b/jmol-12.0.41-jarlocation.patch
@@ -1,12 +1,14 @@
-diff -up Jmol/jmol.orig Jmol/jmol
---- Jmol/jmol.orig 2006-08-28 15:58:20.000000000 +0300
-+++ Jmol/jmol 2009-09-27 11:55:14.126801748 +0300
-@@ -7,14 +7,5 @@ while [ `echo $1 | egrep '^-D|^-m' | wc
+diff -up jmol-12.0.41/jmol.orig jmol-12.0.41/jmol
+--- jmol-12.0.41/jmol.orig 2011-04-25 05:32:53.000000000 +0300
++++ jmol-12.0.41/jmol 2011-04-28 15:25:20.831179829 +0300
+@@ -7,16 +7,5 @@ while [ `echo $1 | egrep '^-D|^-m' | wc
shift
done
-if [ -f ./Jmol.jar ] ; then
- jarpath=./Jmol.jar
+-elif [ -f ./build/Jmol.jar ] ; then
+- jarpath=./build/Jmol.jar
-elif [ -f $JMOL_HOME/Jmol.jar ] ; then
- jarpath=$JMOL_HOME/Jmol.jar
-elif [ -f /usr/share/jmol/Jmol.jar ] ; then
diff --git a/jmol.spec b/jmol.spec
index f700cab..ad20143 100644
--- a/jmol.spec
+++ b/jmol.spec
@@ -1,20 +1,20 @@
Name: jmol
-Version: 11.8.26
+Version: 12.0.41
Release: 1%{?dist}
Summary: An open-source Java viewer for chemical structures in 3D
Group: Applications/Engineering
License: LGPLv2+
URL: http://jmol.sourceforge.net
BuildArch: noarch
-Source0: http://downloads.sourceforge.net/project/jmol/Jmol/Version%2011.8/Version%20%{version}/jmol-%{version}-full.tar.gz
+Source0: http://downloads.sourceforge.net/%{name}/Jmol-%{version}-full.tar.gz
# Image available at "http://wiki.jmol.org:81/index.php/Image:Jmol_icon_128.png"
Source1: Jmol_icon_128.png
-# Patch to get Jmol to build in Fedora
-Patch0: jmol-11.8.14-fedorabuild.patch
+# Patch to get Jmol to build in Fedora (location of JAR files)
+Patch0: jmol-12.0.41-fedorabuild.patch
# Patch to change jar file location to %{_javadir}
-Patch1: jmol-11.8-jarlocation.patch
+Patch1: jmol-12.0.41-jarlocation.patch
# Don't try to sign jars
-Patch2: jmol-11.8.14-dontsign.patch
+Patch2: jmol-12.0.41-dontsign.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -127,6 +127,12 @@ rm -rf %{buildroot}
%doc build/doc/*
%changelog
+* Thu Apr 28 2011 Jussi Lehtola <jussilehtola at fedoraproject.org> - 12.0.41-1
+- Update to 12.0.41.
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 11.8.26-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
* Fri Aug 6 2010 Jussi Lehtola <jussilehtola at fedoraproject.org> - 11.8.26-1
- Update to 11.8.26.
diff --git a/sources b/sources
index 08cc210..d112410 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
75268c66c9afac86a59d6348745dd1e4 Jmol_icon_128.png
-8bbe60972f86142f4b3da5096f36b32b jmol-11.8.26-full.tar.gz
+4301273881210a0e4bbf47353afc24de Jmol-12.0.41-full.tar.gz
More information about the scm-commits
mailing list