From 0df0c8bdde565a766598b1a2e77c7d929cc65d5f Mon Sep 17 00:00:00 2001
From: gbenson <gbenson@fedoraproject.org>
Date: Thu, 21 Apr 2005 10:41:10 +0000
Subject: [PATCH] Add classpath workaround to xjavac task (#152255)

---
 .cvsignore     |  1 +
 sources        |  1 +
 xerces-j2.spec | 15 ++++++++++++++-
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/.cvsignore b/.cvsignore
index f4c8391..0a45dd3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,5 +1,6 @@
 Xerces-J-src.2.6.2.tar.gz
 Xerces-J-tools.2.6.2.tar.gz
+XJavac.java
 xerces-2_6_2
 noarch
 *.src.rpm
diff --git a/sources b/sources
index f3689b2..ad60c90 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 cfd536b8d72f8ebe3465ae35f5e3775d  Xerces-J-src.2.6.2.tar.gz
 55ba4b71ae95acf7d50c4bc0d796ee76  Xerces-J-tools.2.6.2.tar.gz
+166f59c462cda808ca20f16e1690699f  XJavac.java
diff --git a/xerces-j2.spec b/xerces-j2.spec
index 075a5af..268a755 100644
--- a/xerces-j2.spec
+++ b/xerces-j2.spec
@@ -1,7 +1,7 @@
 %define name		xerces-j2
 %define version		2.6.2
 %define cvs_version	2_6_2
-%define release		4jpp_1fc
+%define release		4jpp_2fc
 %define section		free
 
 Name:		%{name}
@@ -18,6 +18,7 @@ Source0:	http://www.apache.org/dist/xml/xerces-j/Xerces-J-src.%{version}.tar.gz
 Source1:        %{name}-version.sh
 Source2:        %{name}-constants.sh
 Source3:       http://archive.apache.org/dist/xml/xerces-j/Xerces-J-tools.%{version}.tar.gz
+Source4:	XJavac.java
 Patch0:         %{name}-build.patch
 Provides:	jaxp_parser_impl
 Requires:	xml-commons-apis
@@ -112,11 +113,20 @@ Additional utility scripts for %{name}.
 %setup -q -n xerces-%{cvs_version}
 %setup -q -T -a 3 -D -n xerces-%{cvs_version}
 %setup -T -D -n xerces-%{cvs_version}
+rm -f tools/bin/xjavac.jar
 
 %patch0 -p1 -b .build
 
 
 %build
+mkdir -p org/apache/xerces/util
+cp $RPM_SOURCE_DIR/XJavac.java org/apache/xerces/util
+javac \
+        -classpath $(%{_bindir}/build-classpath ant) \
+        org/apache/xerces/util/XJavac.java
+jar cf tools/bin/xjavac.jar org/apache/xerces/util/*.class
+rm -rf org
+
 unset CLASSPATH
 ant \
 	-Dbuild.compiler=modern \
@@ -256,6 +266,9 @@ update-alternatives --install %{_javadir}/jaxp_parser_impl.jar \
 
 
 %changelog
+* Thu Apr 21 2005 Gary Benson <gbenson at redhat.com> 0:2.6.2-4jpp_2fc
+- Add classpath workaround to xjavac task (#152255).
+
 * Wed Jan 12 2005 Gary Benson <gbenson@redhat.com> 0:2.6.2-4jpp_1fc
 - Reenable building of classes that require javax.swing (#130006).
 - Sync with RHAPS.