From b0c98078a6e77be13b94c5dc5f317a34d899aeaf114e55e3add5b90ba0791a7a Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Tue, 21 Sep 2010 09:56:16 +0000
Subject: [PATCH] Accepting request 48616 from Java:packages

checked in (request 48616)

OBS-URL: https://build.opensuse.org/request/show/48616
OBS-URL: https://build.opensuse.org/package/show/Java:packages/xerces-j2?expand=0&rev=9
---
 xerces-j2-bootstrap.changes |  5 ----
 xerces-j2-bootstrap.spec    |  2 +-
 xerces-j2-build.patch       | 58 +++++++++++++++++++++++++++++++++++++
 xerces-j2.changes           | 15 ----------
 xerces-j2.spec              |  7 +----
 5 files changed, 60 insertions(+), 27 deletions(-)
 create mode 100644 xerces-j2-build.patch

diff --git a/xerces-j2-bootstrap.changes b/xerces-j2-bootstrap.changes
index d9190a1..042cd29 100644
--- a/xerces-j2-bootstrap.changes
+++ b/xerces-j2-bootstrap.changes
@@ -1,8 +1,3 @@
--------------------------------------------------------------------
-Thu Sep  2 12:36:17 UTC 2010 - mvyskocil@suse.cz
-
-- ignore antlr(-java) to reduce build cycles
-
 -------------------------------------------------------------------
 Mon Aug 17 11:46:39 UTC 2009 - mvyskocil@suse.cz
 
diff --git a/xerces-j2-bootstrap.spec b/xerces-j2-bootstrap.spec
index e34357e..073d650 100644
--- a/xerces-j2-bootstrap.spec
+++ b/xerces-j2-bootstrap.spec
@@ -21,7 +21,7 @@
 Name:           xerces-j2-bootstrap
 Url:            http://xml.apache.org/xerces2-j/
 BuildRequires:  antlr-bootstrap fastjar java-1_4_2-gcj-compat-devel unzip xml-commons-apis-bootstrap xml-commons-resolver-bootstrap xml-commons-which-bootstrap zip
-#!BuildIgnore:  antlr antlr-java
+#!BuildIgnore:  antlr
 %if %{?!suse_version:1}0
 %if %{?!mandriva_release:1}0
 BuildRequires:  chkconfig
diff --git a/xerces-j2-build.patch b/xerces-j2-build.patch
new file mode 100644
index 0000000..f73e5ee
--- /dev/null
+++ b/xerces-j2-build.patch
@@ -0,0 +1,58 @@
+Index: xerces-2_7_1/build.xml
+===================================================================
+--- xerces-2_7_1.orig/build.xml
++++ xerces-2_7_1/build.xml
+@@ -19,7 +19,8 @@ Copyright:
+ <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"
++           classpath="./tools/bin/xjavac.jar"/>
+ 
+   <!-- Allow properties following these statements to be overridden -->
+   <!-- Note that all of these don't have to exist.  They've just been defined
+@@ -69,7 +70,7 @@ Copyright:
+     <property name="packages" value="org.*"/>
+ 
+     <property name="doc.generator" value="org.apache.stylebook.StyleBook"/>
+-    <property name="doc.generator.package" value="${tools.dir}/stylebook-1.0-b2.jar"/>
++    <property name="doc.generator.package" value="./tools/stylebook-1.0-b2.jar"/>
+ 
+     <property name="build.dir" value="./build"/>
+     <property name="build.src" value="${build.dir}/src"/>
+@@ -83,7 +84,7 @@ Copyright:
+     <property name="distsrc.dir" value="${build.dir}/${parser.shortname}-${parser_version}"/>
+     <property name="disttools.dir" value="${build.dir}/tools"/>
+     <property name="distbin.dir" value="${build.dir}/${parser.shortname}-${parser_version}"/>
+-    <property name='src.apis.zip' value="${tools.dir}/xml-commons-external-src.zip"/>
++    <property name='src.apis.zip' value="./tools/xml-commons-external-src.zip"/>
+ 
+     <filter token="year" value="${year}"/>
+     <filter token="version" value="${parser.Version}"/>
+@@ -311,7 +312,7 @@ Copyright:
+     </copy>
+     <xjavac srcdir="${build.tests}"
+            destdir="${build.dest}"
+-           classpath="${tools.dir}/${jar.apis}:${build.dir}/classes:./tools/junit.jar"
++           classpath="${tools.dir}/${jar.apis}:${build.dir}/classes:${tools.dir}/junit.jar"
+            debug="${debug}"
+            includeAntRuntime="false"
+            includeJavaRuntime="true"/>
+@@ -354,7 +355,7 @@ Copyright:
+   <target name="docs" depends="prepare, prepare-docs">
+     <echo message="Building docs for ${parser.Name} ${parser.Version} ..." />
+     <java fork="yes"
+-          classpath="${java.class.path}:${doc.generator.package}:./tools/xalan.jar"
++          classpath="${java.class.path}:${doc.generator.package}:${tools.dir}/xalan.jar"
+           classname="${doc.generator}"
+           failOnError="yes">
+       <arg value="targetDirectory=${build.docs}"/>
+@@ -426,6 +427,7 @@ Copyright:
+     
+     <mkdir dir='${build.dir}/docs/javadocs/xerces2'/>
+     <javadoc packagenames='org.apache.xerces.dom.*,
++                           org.apache.xerces.dom3.*,
+                            org.apache.xerces.impl.*,
+                            org.apache.xerces.jaxp.*,
+                            org.apache.xerces.parsers,
diff --git a/xerces-j2.changes b/xerces-j2.changes
index 6401e98..2b916fd 100644
--- a/xerces-j2.changes
+++ b/xerces-j2.changes
@@ -1,18 +1,3 @@
--------------------------------------------------------------------
-Tue Sep 21 09:15:04 UTC 2010 - mvyskocil@suse.cz
-
-- use antlr-bootstrap for javadoc build 
-
--------------------------------------------------------------------
-Mon Sep 13 13:40:54 UTC 2010 - mvyskocil@suse.cz
-
-- remove unecessary xerces-j2-build.patch 
-
--------------------------------------------------------------------
-Thu Sep  2 12:36:13 UTC 2010 - mvyskocil@suse.cz
-
-- ignore antlr(-java) to reduce build cycles
-
 -------------------------------------------------------------------
 Mon Aug 17 11:44:46 UTC 2009 - mvyskocil@suse.cz
 
diff --git a/xerces-j2.spec b/xerces-j2.spec
index b58e22c..815937b 100644
--- a/xerces-j2.spec
+++ b/xerces-j2.spec
@@ -19,6 +19,7 @@
 
 
 Name:           xerces-j2
+BuildRequires:  java-1_5_0-gcj-compat-devel jpackage-utils unzip
 %define name		xerces-j2
 %define version	2.8.1
 %define cvs_version	2_8_1
@@ -44,11 +45,6 @@ PreReq:         update-alternatives /bin/ln
 # some build requirements removed to enable jpackage bootstrap. this is
 # the first package built, and we use the libraries in the tools subdir
 # for it.
-BuildRequires:  java-1_5_0-gcj-compat-devel
-BuildRequires:  antlr-bootstrap
-#!BuildIgnore:  antlr antlr-java
-BuildRequires:  jpackage-utils
-BuildRequires:  unzip
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -340,7 +336,6 @@ This package contains the APIs subproject of xml-commons.
 # jpackage bootstrap has to start somewhere. It is not installed,
 # though.
 export GC_MAXIMUM_HEAP_SIZE="134217728"
-export CLASSPATH=$CLASSPATH:`build-classpath antlr-bootstrap`
 sh build.sh jars
 sh build.sh javadocs