[jmol] Rebase patches.
Susi Lehtola
jussilehtola at fedoraproject.org
Thu Mar 13 13:40:07 UTC 2014
commit 5b13ad360772f8e4e1ab1b37de5bda74e35fd878
Author: Susi Lehtola <jussilehtola at fedoraproject.org>
Date: Thu Mar 13 15:39:57 2014 +0200
Rebase patches.
...3-dontsign.patch => jmol-14.0.11-dontsign.patch | 18 +++++++++---------
...rabuild.patch => jmol-14.0.11-fedorabuild.patch | 16 ++++++++--------
jmol.spec | 4 ++--
3 files changed, 19 insertions(+), 19 deletions(-)
---
diff --git a/jmol-14.0.3-dontsign.patch b/jmol-14.0.11-dontsign.patch
similarity index 73%
rename from jmol-14.0.3-dontsign.patch
rename to jmol-14.0.11-dontsign.patch
index cd1a88b..7ffc38c 100644
--- a/jmol-14.0.3-dontsign.patch
+++ b/jmol-14.0.11-dontsign.patch
@@ -1,6 +1,6 @@
-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
+diff -up jmol-14.0.11/build.xml.nosign jmol-14.0.11/build.xml
+--- jmol-14.0.11/build.xml.nosign 2014-03-13 15:38:16.844657823 +0200
++++ jmol-14.0.11/build.xml 2014-03-13 15:39:05.449390862 +0200
@@ -153,7 +153,7 @@ Bob Hanson hansonr at stolaf.edu 11/26/2013
</fileset>
</path>
@@ -10,9 +10,9 @@ diff -up jmol-14.0.3/build.xml.nosign jmol-14.0.3/build.xml
<target name="all" id="all" depends="doc,main"/>
-@@ -517,10 +517,10 @@ all support for previous versions remove
- <fileset dir="${appjars.dir}" includes="**/*"/>
+@@ -515,10 +515,10 @@ all support for previous versions remove
<fileset dir="src/org/jmol/translation/Jmol" includes="Messages*.class"/>
+ <fileset dir="src/org/jmol/translation/JmolApplet" includes="Messages*.class"/>
</jar>
- <antcall target="sign-jar-file">
+ <!--<antcall target="sign-jar-file">
@@ -23,9 +23,9 @@ diff -up jmol-14.0.3/build.xml.nosign jmol-14.0.3/build.xml
<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/**" />
+@@ -549,10 +549,10 @@ all support for previous versions remove
<fileset dir="src/org/jmol/translation/Jmol" includes="Messages*.class"/>
+ <fileset dir="src/org/jmol/translation/JmolApplet" includes="Messages*.class"/>
</jar>
- <antcall target="sign-jar-file">
+ <!--<antcall target="sign-jar-file">
@@ -36,7 +36,7 @@ diff -up jmol-14.0.3/build.xml.nosign jmol-14.0.3/build.xml
<copy todir="build">
<fileset dir=".">
-@@ -583,10 +583,10 @@ all support for previous versions remove
+@@ -581,10 +581,10 @@ all support for previous versions remove
</fileset>
<fileset dir="${appjars.dir}" includes="**/*"/>
</jar>
@@ -49,7 +49,7 @@ diff -up jmol-14.0.3/build.xml.nosign jmol-14.0.3/build.xml
<!--
<jar destfile="ChimeToJmol.jar"
manifest="manifest/chimetojmol.txt">
-@@ -1151,10 +1151,10 @@ all support for previous versions remove
+@@ -1163,10 +1163,10 @@ all support for previous versions remove
</indexjars>
</jar>
<echo> signing JmolApplet*.jar</echo>
diff --git a/jmol-14.0.3-fedorabuild.patch b/jmol-14.0.11-fedorabuild.patch
similarity index 85%
rename from jmol-14.0.3-fedorabuild.patch
rename to jmol-14.0.11-fedorabuild.patch
index 23dff3f..cfd12cc 100644
--- a/jmol-14.0.3-fedorabuild.patch
+++ b/jmol-14.0.11-fedorabuild.patch
@@ -1,6 +1,6 @@
-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
+diff -up jmol-14.0.11/build.xml.fedorabuild jmol-14.0.11/build.xml
+--- jmol-14.0.11/build.xml.fedorabuild 2014-03-09 02:56:20.000000000 +0200
++++ jmol-14.0.11/build.xml 2014-03-13 15:37:36.987695831 +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" />
@@ -37,9 +37,9 @@ diff -up jmol-14.0.3/build.xml.fedorabuild jmol-14.0.3/build.xml
<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}"/ -->
+@@ -435,7 +435,8 @@ all support for previous versions remove
+ <uptodate targetfile="${appjars.dir}">
+ <srcfiles dir="${lib.dir}" includes="${naga.jar}"/>
<srcfiles dir="${lib.dir}" includes="${commons-cli.jar}"/>
- <srcfiles dir="${lib.dir}" includes="JSpecView.jar"/>
+ <srcfiles dir="${lib.dir}" includes="jspecview.app.jar"/>
@@ -47,7 +47,7 @@ diff -up jmol-14.0.3/build.xml.fedorabuild jmol-14.0.3/build.xml
</uptodate>
<uptodate targetfile="build/libjars.timestamp"
srcfile="${appjars.dir}"/>
-@@ -471,7 +472,8 @@ all support for previous versions remove
+@@ -468,7 +469,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}"/>
@@ -57,7 +57,7 @@ diff -up jmol-14.0.3/build.xml.fedorabuild jmol-14.0.3/build.xml
<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
+@@ -1235,7 +1237,8 @@ all support for previous versions remove
<include name="JmolLib.jar" />
</fileset>
<fileset dir="jars">
diff --git a/jmol.spec b/jmol.spec
index b3be6f0..ff47b2a 100644
--- a/jmol.spec
+++ b/jmol.spec
@@ -11,9 +11,9 @@ BuildArch: noarch
Source0: http://downloads.sourceforge.net/%{name}/Jmol-%{version}-full.tar.gz
Source1: http://wiki.jmol.org/images/1/1c/Jmol_icon13.png
# Patch to get Jmol to build in Fedora (location of JAR files)
-Patch0: jmol-14.0.3-fedorabuild.patch
+Patch0: jmol-14.0.11-fedorabuild.patch
# Don't try to sign jars
-Patch1: jmol-14.0.3-dontsign.patch
+Patch1: jmol-14.0.11-dontsign.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
More information about the scm-commits
mailing list