Accepting request 48616 from Java:packages

Copy from Java:packages/xerces-j2 based on submit request 48616 from user mvyskocil

OBS-URL: https://build.opensuse.org/request/show/48616
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xerces-j2?expand=0&rev=18

xerces-j2-bootstrap.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+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
 

xerces-j2-bootstrap.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package xerces-j2-bootstrap (Version 2.8.1)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -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
+#!BuildIgnore:  antlr antlr-java
 %if %{?!suse_version:1}0
 %if %{?!mandriva_release:1}0
 BuildRequires:  chkconfig
@@ -34,7 +34,7 @@ BuildRequires:  update-alternatives
 Summary:        Java XML parser
 Group:          Development/Libraries/Java
 Version:        2.8.1
-Release:        239
+Release:        246
 Requires:       xml-commons-which-bootstrap
 Requires:       xml-commons-apis-bootstrap
 Requires:       xml-commons-resolver-bootstrap

xerces-j2-build.patch

@@ -1,58 +0,0 @@
-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,

xerces-j2.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+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
 

xerces-j2.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package xerces-j2 (Version 2.8.1)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,14 +19,13 @@
 
 
 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
 %define release		3jpp
 %define section		free
 Version:        2.8.1
-Release:        199
+Release:        246
 Summary:        Java XML parser
 License:        Apache Software License ..
 Url:            http://xml.apache.org/xerces2-j/
@@ -45,6 +44,11 @@ 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
 
@@ -336,6 +340,7 @@ 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