[jing-trang] Tweak java-devel build dep for buildability without Java 1.6. Fix build classpath with recent TestNG

[Ville Skyttä]

commit a8d8258d82716c3cdd39c857cf9592f84cc5284d
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Thu Jan 12 00:03:21 2012 +0200

    Tweak java-devel build dep for buildability without Java 1.6.
    Fix build classpath with recent TestNG.

 jing-trang.spec |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/jing-trang.spec b/jing-trang.spec
index 035422b..08ea61d 100644
--- a/jing-trang.spec
+++ b/jing-trang.spec
@@ -5,7 +5,7 @@
 
 Name:           jing-trang
 Version:        20091111
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Schema validation and conversion based on RELAX NG
 
 Group:          Applications/Text
@@ -30,7 +30,7 @@ BuildArch:      noarch
 BuildRequires:  ant-trax
 BuildRequires:  bsh
 BuildRequires:  isorelax
-BuildRequires:  java-1.6.0-openjdk-devel
+BuildRequires:  java-devel-openjdk >= 1:1.6.0
 BuildRequires:  java-javadoc
 BuildRequires:  javacc
 BuildRequires:  jpackage-utils
@@ -111,7 +111,7 @@ find . -name "OldSaxon*.java" -delete # No "old" saxon available in Fedora
 
 
 %build
-export CLASSPATH=$(build-classpath xalan-j2 xalan-j2-serializer)
+CLASSPATH=$(build-classpath beust-jcommander xalan-j2 xalan-j2-serializer) \
 %ant -Dlib.dir=%{_javadir} -Dbuild.sysclasspath=last dist
 
 
@@ -165,6 +165,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jan 11 2012 Ville Skyttä <ville.skytta at iki.fi> - 20091111-10
+- Tweak java-devel build dep for buildability without Java 1.6.
+- Fix build classpath with recent TestNG.
+
 * Fri Jun 24 2011 Ville Skyttä <ville.skytta at iki.fi> - 20091111-9
 - Apply upstream Saxon >= 9.3 patch (#716177).