From 0694873e235b2cbe0de0efd6838c06e4416102b2 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 16:28:47 +0000
Subject: [PATCH] auto-import changelog data from
 xerces-j2-2.6.1-1jpp_1rh.src.rpm 2.6.1-1jpp_1rh - RH vacuuming - remove jikes
 dependency - add nonjikes-cast.patch

---
 xerces-j2-constants.sh |  2 +-
 xerces-j2-version.sh   |  2 +-
 xerces-j2.spec         | 16 ++++++++++------
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/xerces-j2-constants.sh b/xerces-j2-constants.sh
index bbfe00b..bbb2c8c 100644
--- a/xerces-j2-constants.sh
+++ b/xerces-j2-constants.sh
@@ -2,7 +2,7 @@
 # 
 # Xerces-J2 constants script
 # JPackage Project (http://www.jpackage.org/)
-# $Id: xerces-j2-constants.sh,v 1.1 2004/09/09 16:28:45 cvsdist Exp $
+# $Id: xerces-j2-constants.sh,v 1.2 2004/09/09 16:28:47 cvsdist Exp $
 
 # Source functions library
 . /usr/share/java-utils/java-functions
diff --git a/xerces-j2-version.sh b/xerces-j2-version.sh
index 4efde3b..2735b63 100644
--- a/xerces-j2-version.sh
+++ b/xerces-j2-version.sh
@@ -2,7 +2,7 @@
 # 
 # Xerces-J2 version script
 # JPackage Project (http://www.jpackage.org/)
-# $Id: xerces-j2-version.sh,v 1.1 2004/09/09 16:28:45 cvsdist Exp $
+# $Id: xerces-j2-version.sh,v 1.2 2004/09/09 16:28:47 cvsdist Exp $
 
 # Source functions library
 . /usr/share/java-utils/java-functions
diff --git a/xerces-j2.spec b/xerces-j2.spec
index 6001bac..3e6b99b 100644
--- a/xerces-j2.spec
+++ b/xerces-j2.spec
@@ -1,7 +1,7 @@
 %define name		xerces-j2
 %define version		2.6.1
 %define cvs_version	2_6_1
-%define release		1jpp
+%define release		1jpp_1rh
 %define section		free
 
 Name:		%{name}
@@ -12,19 +12,19 @@ Summary:	Java XML parser
 License:	Apache Software License
 URL:		http://xml.apache.org/xerces2-j/
 Group:		Text Processing/Markup/XML
-Vendor:		JPackage Project
-Distribution:	JPackage
+#Vendor:		JPackage Project
+#Distribution:	JPackage
 Source0:	http://www.apache.org/dist/xml/xerces-j/Xerces-J-src.2.6.1.tar.gz
 Source1:        %{name}-version.sh
 Source2:        %{name}-constants.sh
 Patch0:         %{name}-build.patch
+Patch1:		nonjikes-cast.patch
 Provides:	jaxp_parser_impl
 Requires:	xml-commons-apis
 Requires:	xml-commons-resolver
 Requires:	/usr/sbin/update-alternatives
 BuildRequires:	ant >= 0:1.5
 BuildRequires:	jpackage-utils >= 0:1.5
-BuildRequires:	jikes
 BuildRequires:	jaxp_parser_impl
 BuildRequires:	xml-commons-resolver
 BuildArch:	noarch
@@ -106,12 +106,11 @@ Additional utility scripts for %{name}.
 %prep
 %setup -q -n xerces-%{cvs_version}
 %patch0 -p0
-
+%patch1 -p0
 
 %build
 unset CLASSPATH
 ant \
-	-Dbuild.compiler=jikes \
 	-Dtools.dir=%{_javadir} \
 	-Djar.apis=xml-commons-apis.jar \
 	-Djar.resolver=xml-commons-resolver.jar \
@@ -246,6 +245,11 @@ update-alternatives --install %{_javadir}/jaxp_parser_impl.jar \
 
 
 %changelog
+* Thu Mar 11 2004 Frank Ch. Eigler <fche@redhat.com> 0:2.6.1-1jpp_1rh
+- RH vacuuming
+- remove jikes dependency
+- add nonjikes-cast.patch
+
 * Sun Feb 08 2004 David Walluck <david@anti-microsoft.org> 0:2.6.1-1jpp
 - 2.6.1
 - update Source0 URL