[jmol] Don't bundle external libraries.

[Susi Lehtola]

commit d7834e4125f78ed89a0f8c6bb2bc5f57f285099a
Author: Susi Lehtola <jussilehtola at fedoraproject.org>
Date:   Wed May 7 18:43:03 2014 +0300

    Don't bundle external libraries.

 ...rabuild.patch => jmol-14.0.13-fedorabuild.patch |   22 ++++++++++++-------
 jmol.spec                                          |   12 +++++-----
 2 files changed, 20 insertions(+), 14 deletions(-)
---
diff --git a/jmol-14.0.11-fedorabuild.patch b/jmol-14.0.13-fedorabuild.patch
similarity index 78%
rename from jmol-14.0.11-fedorabuild.patch
rename to jmol-14.0.13-fedorabuild.patch
index cfd12cc..dff69ae 100644
--- a/jmol-14.0.11-fedorabuild.patch
+++ b/jmol-14.0.13-fedorabuild.patch
@@ -1,6 +1,6 @@
-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
+diff -up jmol-14.0.13/build.xml.fedorabuild jmol-14.0.13/build.xml
+--- jmol-14.0.13/build.xml.fedorabuild	2014-04-02 07:47:48.000000000 +0300
++++ jmol-14.0.13/build.xml	2014-05-07 18:33:32.004228513 +0300
 @@ -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,7 +37,7 @@ diff -up jmol-14.0.11/build.xml.fedorabuild jmol-14.0.11/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" />
-@@ -435,7 +435,8 @@ all support for previous versions remove
+@@ -438,7 +438,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}"/>
@@ -47,17 +47,23 @@ diff -up jmol-14.0.11/build.xml.fedorabuild jmol-14.0.11/build.xml
          </uptodate>
          <uptodate targetfile="build/libjars.timestamp"
                    srcfile="${appjars.dir}"/>
-@@ -468,7 +469,8 @@ all support for previous versions remove
+@@ -467,11 +468,12 @@ all support for previous versions remove
+     <delete file="build/libjars.timestamp"/>
+     <mkdir dir="${appjars.dir}"/>
+     <!-- unjar dest="${appjars.dir}" src="${lib.dir}/${vecmath.jar}"/ -->
+-    <unjar dest="${appjars.dir}" src="${lib.dir}/${naga.jar}"/>
++    <!--<unjar dest="${appjars.dir}" src="${lib.dir}/${naga.jar}"/>-->
      <!-- 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}/${commons-cli.jar}"/>
 -    <unjar dest="${appjars.dir}" src="${lib.dir}/JSpecView.jar"/>
++    <!--<unjar dest="${appjars.dir}" src="${lib.dir}/${commons-cli.jar}"/>
 +    <unjar dest="${appjars.dir}" src="${lib.dir}/jspecview.app.jar"/>
-+    <unjar dest="${appjars.dir}" src="${lib.dir}/jspecview.applet.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" />
-@@ -1235,7 +1237,8 @@ all support for previous versions remove
+@@ -1228,7 +1230,8 @@ all support for previous versions remove
          <include name="JmolLib.jar" />
        </fileset>
        <fileset dir="jars">
diff --git a/jmol.spec b/jmol.spec
index 9407ab6..35e4edc 100644
--- a/jmol.spec
+++ b/jmol.spec
@@ -1,6 +1,6 @@
 Name:        jmol
 Version:     14.0.13
-Release:     1%{?dist}
+Release:     2%{?dist}
 Summary:     An open-source Java viewer for chemical structures in 3D
 Group:       Applications/Engineering
 # most is LGPLv2+, src/com/obrador is combination of IJG and BSD
@@ -11,7 +11,7 @@ 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.11-fedorabuild.patch
+Patch0:      jmol-14.0.13-fedorabuild.patch
 # Don't try to sign jars
 Patch1:      jmol-14.0.11-dontsign.patch
 
@@ -33,6 +33,7 @@ Requires:         java >= 1:1.6.0
 Requires:         jpackage-utils
 Requires:         apache-commons-cli
 Requires:         jspecview >= 2-6.1464svn
+Requires:         naga
 
 %description
 Jmol is a free, open source molecule viewer for students, educators,
@@ -99,10 +100,6 @@ PLUGIN_JAR=%{_datadir}/icedtea-web/plugin.jar
 jar tf $PLUGIN_JAR | grep javascript/JSObject.class
 ant --execdebug -lib $PLUGIN_JAR jar applet-jar doc
 
-#ant --execdebug -lib $PLUGIN_JAR jar
-#ant --execdebug -lib $PLUGIN_JAR applet-jar
-#ant --execdebug -lib $PLUGIN_JAR doc
-
 %install
 rm -rf %{buildroot}
 install -D -p -m 644 build/Jmol.jar %{buildroot}%{_javadir}/Jmol.jar
@@ -139,6 +136,9 @@ rm -rf %{buildroot}
 %doc build/doc/*
 
 %changelog
+* Wed May 07 2014 Susi Lehtola <jussilehtola at fedoraproject.org> - 14.0.13-2
+- Don't bundle external libraries (BZ #1095315).
+
 * Thu Apr 03 2014 Susi Lehtola <jussilehtola at fedoraproject.org> - 14.0.13-1
 - Need full java because this is a GUI application.
 - Update to 14.0.13.