rpms/xerces-j2/devel .cvsignore, 1.4, 1.5 sources, 1.3, 1.4 xerces-j2.spec, 1.11, 1.12

[fedora-cvs-commits at redhat.com]

Update of /cvs/dist/rpms/xerces-j2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11127

Modified Files:
	.cvsignore sources xerces-j2.spec 
Log Message:
Add classpath workaround to xjavac task (#152255)


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xerces-j2/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Oct 2004 13:55:31 -0000	1.4
+++ .cvsignore	21 Apr 2005 10:41:10 -0000	1.5
@@ -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


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xerces-j2/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Sep 2004 16:28:51 -0000	1.3
+++ sources	21 Apr 2005 10:41:10 -0000	1.4
@@ -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


Index: xerces-j2.spec
===================================================================
RCS file: /cvs/dist/rpms/xerces-j2/devel/xerces-j2.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xerces-j2.spec	12 Jan 2005 10:21:36 -0000	1.11
+++ xerces-j2.spec	21 Apr 2005 10:41:10 -0000	1.12
@@ -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 @@
 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 @@
 %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 @@
 
 
 %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 at redhat.com> 0:2.6.2-4jpp_1fc
 - Reenable building of classes that require javax.swing (#130006).
 - Sync with RHAPS.