From b23bf7c8d453b9df9136802fe0833828eda12922 Mon Sep 17 00:00:00 2001
From: gbenson <gbenson@fedoraproject.org>
Date: Fri, 10 Jun 2005 10:37:21 +0000
Subject: [PATCH] Another go at fixing #152255

---
 xerces-j2.spec | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/xerces-j2.spec b/xerces-j2.spec
index 0d6a21a..d6ff9c4 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_7fc
+%define release		4jpp_8fc
 %define section		free
 
 Name:		%{name}
@@ -115,12 +115,14 @@ Additional utility scripts for %{name}.
 %prep
 %setup -q -n xerces-%{cvs_version}
 %patch0 -p1 -b .build
-%patch1 -p1 -b .bz152255
 
 mkdir -p tools/org/apache/xerces/util
 cp -a %{SOURCE3} tools/org/apache/xerces/util
+%patch1 -p0 -b .bz152255
+
 cp -a %{SOURCE4} tools
 
+
 %build
 pushd tools
 find -name '*.java' | xargs javac -cp $(build-classpath ant)
@@ -290,8 +292,10 @@ update-alternatives --install %{_javadir}/jaxp_parser_impl.jar \
 
 
 %changelog
-* Fri Jun 10 2005 Gary Benson <gbenson@redhat.com>
+* Fri Jun 10 2005 Gary Benson <gbenson@redhat.com> 0:2.6.2-4jpp_8fc
 - Remove the tools tarball, and build xjavac from source.
+- Replace classpath workaround to xjavac task and use
+  xml-commons classes again (#152255).
 
 * Thu May 26 2005 Gary Benson <gbenson@redhat.com> 0:2.6.2-4jpp_7fc
 - Rearrange how BC-compiled stuff is built and installed.