[jmol] Really fix build this time.

[Jussi Lehtola]

commit da51a253953d11d01678e9d4ded6818015c39f84
Author: Jussi Lehtola <jussilehtola at fedoraproject.org>
Date:   Wed Aug 24 22:02:43 2011 +0300

    Really fix build this time.

 jmol-12.0.48-classpath.patch |   11 +++++++++++
 jmol.spec                    |   19 +++++++++++++++----
 2 files changed, 26 insertions(+), 4 deletions(-)
---
diff --git a/jmol-12.0.48-classpath.patch b/jmol-12.0.48-classpath.patch
new file mode 100644
index 0000000..d00cc1c
--- /dev/null
+++ b/jmol-12.0.48-classpath.patch
@@ -0,0 +1,11 @@
+diff -up jmol-12.0.48/build.xml.orig jmol-12.0.48/build.xml
+--- jmol-12.0.48/build.xml.orig	2011-08-24 21:40:02.408352753 +0300
++++ jmol-12.0.48/build.xml	2011-08-24 21:44:14.895787429 +0300
+@@ -14,7 +14,6 @@
+   <!-- 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.compiler" value="javac1.5" />
+   <!-- for some reason, I can't get ant to use this ${java.version}
+        property as the value of the source parameter -->
diff --git a/jmol.spec b/jmol.spec
index d651f23..fe56870 100644
--- a/jmol.spec
+++ b/jmol.spec
@@ -15,6 +15,8 @@ Patch0:		jmol-12.0.41-fedorabuild.patch
 Patch1:		jmol-12.0.41-jarlocation.patch 
 # Don't try to sign jars
 Patch2:		jmol-12.0.41-dontsign.patch
+# Don't ignore the system classpath
+Patch3:		jmol-12.0.48-classpath.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -67,6 +69,7 @@ The documentation for %{name}.
 %patch0 -p1 -b .fedorabuild
 %patch1 -p1 -b .jarlocation
 %patch2 -p1 -b .nosign
+%patch3 -p1 -b .classpath
 
 # Remove binaries
 find -name '*.class' -exec rm -f '{}' \;
@@ -97,9 +100,14 @@ Categories=Education;Science;Chemistry;Physics;DataVisualization;
 EOF
 
 %build
-# Need to be able to find netscape.javascript.JSObject
-export CLASSPATH=%{_datadir}/icedtea-web
-ant doc main
+%if 0%{?fedora} > 15
+# Need to be able to find netscape.javascript.*classes
+PLUGIN_JAR=%{_datadir}/icedtea-web/plugin.jar
+jar tf $PLUGIN_JAR | grep JSObject
+ant --execdebug -lib $PLUGIN_JAR doc main
+%else
+ant --execdebug doc main
+%endif
 
 %install
 rm -rf %{buildroot}
@@ -136,8 +144,11 @@ rm -rf %{buildroot}
 %doc build/doc/*
 
 %changelog
+* Wed Aug 24 2011 Jussi Lehtola <jussilehtola at fedoraproject.org> - 12.0.48-3
+- Really fix build by not ignoring system classpath (thanks to omajid).
+
 * Wed Aug 17 2011 Jussi Lehtola <jussilehtola at fedoraproject.org> - 12.0.48-2
-- Fix build on rawhide and F16 by adding CLASSPATH definition.
+- Try to fix build on rawhide and F16 by adding CLASSPATH definition.
 
 * Wed Aug 17 2011 Jussi Lehtola <jussilehtola at fedoraproject.org> - 12.0.48-1
 - Update to 12.0.48.