From 8b33fc997b6300daef8c9fca7c76e09079536d36 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 16:28:51 +0000
Subject: [PATCH] auto-import changelog data from
 xerces-j2-2.6.2-2jpp_2rh.src.rpm 2.6.2-2jpp_2rh - Added new Source1 URL and
 added new %setup to expand it under the     expanded result of Source0. -
 Updated Patch0 to fix version discrepancies. - Added build requirement for
 xml-commons-apis 2.6.2-2jpp_1rh - Update to 2.6.2 - made patch names
 comformant

---
 .cvsignore            |   3 +-
 sources               |   3 +-
 xerces-j2-build.patch | 116 ------------------------------------------
 xerces-j2.spec        |  33 ++++++++----
 4 files changed, 28 insertions(+), 127 deletions(-)
 delete mode 100644 xerces-j2-build.patch

diff --git a/.cvsignore b/.cvsignore
index 932d041..780374e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
-Xerces-J-src.2.6.1.tar.gz
+Xerces-J-src.2.6.2.tar.gz
+Xerces-J-tools.2.6.2.tar.gz
diff --git a/sources b/sources
index e8adccd..f3689b2 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-060f303e7a58de5e76a4fb08f09c5f6d  Xerces-J-src.2.6.1.tar.gz
+cfd536b8d72f8ebe3465ae35f5e3775d  Xerces-J-src.2.6.2.tar.gz
+55ba4b71ae95acf7d50c4bc0d796ee76  Xerces-J-tools.2.6.2.tar.gz
diff --git a/xerces-j2-build.patch b/xerces-j2-build.patch
deleted file mode 100644
index 90b79f5..0000000
--- a/xerces-j2-build.patch
+++ /dev/null
@@ -1,116 +0,0 @@
---- build.xml~	2003-07-31 20:14:16.000000000 +0300
-+++ build.xml	2003-10-21 21:45:47.000000000 +0300
-@@ -19,7 +19,7 @@
- <project default="usage" basedir=".">
- 
-   <!-- enable compilation under IBM JDK 1.4 -->
--  <taskdef name="xjavac" classname="org.apache.xerces.util.XJavac"/>
-+  <!-- <taskdef name="xjavac" classname="org.apache.xerces.util.XJavac"/> -->
- 
-   <!-- Allow properties following these statements to be overridden -->
-   <!-- Note that all of these don't have to exist.  They've just been defined
-@@ -187,6 +187,7 @@
-     </copy>
- 
-     <!-- now deal with API's:  -->
-+    <!--
-     <unzip src="${src.apis.zip}" dest="${build.src}">
-         <patternset
-             includes="org/xml/sax/** 
-@@ -198,6 +199,7 @@
-                 org/w3c/dom/traversal/**"
-         />
-     </unzip>
-+    -->
-     
-     <!-- substitute tokens as needed -->
-     <replace file="${build.dir}/src/org/apache/xerces/impl/Version.java" 
-@@ -214,7 +216,7 @@
-       </fileset>
-     </copy>
- 
--    <xjavac srcdir="${build.src}"
-+    <javac srcdir="${build.src}"
-            destdir="${build.dest}"
-            classpath="${build.dir}/classes:${tools.dir}/${jar.apis}"
-            debug="${debug}"
-@@ -275,7 +277,7 @@
-            excludes="dom/DOMAddLines.java 
-                      dom/DOM3.java" />
-     </copy>
--    <xjavac srcdir="${build.samples}"
-+    <javac srcdir="${build.samples}"
-            destdir="${build.dest}"
-            classpath="${build.dir}/classes:${tools.dir}/${jar.apis}"
-            debug="${debug}"
-@@ -292,7 +294,7 @@
-         <fileset dir="${tests.dir}"
-          excludes="dom/rename/**, dom/registry/**" />
-     </copy>
--    <xjavac srcdir="${build.tests}"
-+    <javac srcdir="${build.tests}"
-            destdir="${build.dest}"
-            classpath="${tools.dir}/${jar.apis}:${build.dir}/classes:./tools/junit.jar"
-            debug="${debug}"
-@@ -813,7 +815,7 @@
-       </fileset>
-     </copy>
- 
--    <xjavac srcdir="${build.src}"
-+    <javac srcdir="${build.src}"
-            destdir="${build.dest}"
-            debug="${debug}"
-            deprecation="${deprecation}"
-@@ -903,6 +905,7 @@
-              token="return ((String)type).getNamespace();" value="return null;"/>
-  
-     <!-- now deal with API's:  -->
-+    <!--
-     <unzip src="${src.apis.zip}" dest="${build.src}">
-         <patternset
-             includes="org/xml/sax/** 
-@@ -914,7 +917,7 @@
-                 org/w3c/dom/traversal/**"
-         />
-     </unzip>
--
-+    -->
- 
-     <!-- substitute tokens as needed -->
-     <replace file="${build.dir}/src/org/apache/xerces/impl/Version.java" 
-@@ -950,7 +953,7 @@
-       </fileset>
-     </copy>
- 
--    <xjavac srcdir="${build.src}"
-+    <javac srcdir="${build.src}"
-            destdir="${build.dest}"
-            debug="${debug}"
-            deprecation="${deprecation}"
-@@ -1166,7 +1169,7 @@
-       </fileset>
-     </copy>
- 
--    <xjavac srcdir="${build.src}"
-+    <javac srcdir="${build.src}"
-            destdir="${build.dest}"
-            debug="${debug}"
-            deprecation="${deprecation}"
-@@ -1194,7 +1197,7 @@
-    <replace file="${build.samples}/dom/ASBuilder.java"  
-              token="org.apache.xerces.dom3.DOMConfiguration" value="org.w3c.dom.DOMConfiguration"/>
-  
--   <xjavac srcdir="${build.samples}"
-+   <javac srcdir="${build.samples}"
-            destdir="${build.dest}"
-            classpath="${build.dir}/classes:${build.dir}/dom3-${jar.parser}:${build.dir}/dom3-${jar.apis}:${tools.dir}/${jar.apis}"
-            debug="${debug}"
-@@ -1222,7 +1225,7 @@
-      <replace file="${build.tests}/thread/Test.java"  
-              token="org.apache.xerces.dom3" value="org.w3c.dom"/>
- 
--    <xjavac srcdir="${build.tests}"
-+    <javac srcdir="${build.tests}"
-            destdir="${build.dest}"
-            classpath="${build.dir}/dom3-${jar.apis}:${build.dir}/classes:./tools/junit.jar"
-            debug="${debug}"
diff --git a/xerces-j2.spec b/xerces-j2.spec
index f74bbaa..77cdb98 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_2rh
+%define version		2.6.2
+%define cvs_version	2_6_2
+%define release		2jpp_2rh
 %define section		free
 
 Name:		%{name}
@@ -14,11 +14,12 @@ URL:		http://xml.apache.org/xerces2-j/
 Group:		Text Processing/Markup/XML
 #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
+Source0:	http://www.apache.org/dist/xml/xerces-j/Xerces-J-src.2.6.2.tar.gz
+Source1:	http://www.apache.org/dist/xml/xerces-j/Xerces-J-tools.2.6.2.tar.gz
+Source2:        %{name}-version.sh
+Source3:        %{name}-constants.sh
+Patch0:         xerces-j2-2.6.2-build.patch
+Patch1:		xerces-j2-2.6.2-nonjikes-cast.patch
 Provides:	jaxp_parser_impl
 Requires:	xml-commons-apis
 Requires:	xml-commons-resolver
@@ -27,6 +28,8 @@ BuildRequires:	ant >= 0:1.5
 BuildRequires:	jpackage-utils >= 0:1.5
 BuildRequires:	jaxp_parser_impl
 BuildRequires:	xml-commons-resolver
+# adding build requirement for xml-commons-apis
+BuildRequires:	xml-commons-apis
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Obsoletes:	xerces-j
@@ -106,7 +109,9 @@ Additional utility scripts for %{name}.
 
 
 %prep
-%setup -q -n xerces-%{cvs_version}
+%setup -n xerces-%{cvs_version}
+# Inserting the tools directory in the result from the above command
+%setup -T -D -a 1 -n xerces-%{cvs_version}
 %patch0 -p0
 %patch1 -p0
 
@@ -249,6 +254,16 @@ update-alternatives --install %{_javadir}/jaxp_parser_impl.jar \
 
 
 %changelog
+* Mon Jun 21 2004 Vivek Lakshmanan <vivekl@redhat.com> 0:2.6.2-2jpp_2rh
+- Added new Source1 URL and added new %setup to expand it under the
+  expanded result of Source0.
+- Updated Patch0 to fix version discrepancies.
+- Added build requirement for xml-commons-apis
+ 
+* Mon Jun 14 2004 Matt Wringe <mwringe@redhat.com> 0:2.6.2-2jpp_1rh
+- Update to 2.6.2
+- made patch names comformant
+
 * Fri Mar 26 2004 Frank Ch. Eigler <fche@redhat.com> 0:2.6.1-1jpp_2rh
 - add RHUG upgrade cleanup