From 419073eaa53f285cc640a28893a27324d76bbd461b3d6536c39224acd6404ee1 Mon Sep 17 00:00:00 2001
From: Michal Vyskocil <michal.vyskocil@gmail.com>
Date: Tue, 20 Nov 2012 13:49:13 +0000
Subject: [PATCH] Accepting request 141304 from Java:packages

build ignore openjdk7 - may fix the bnc#789163

OBS-URL: https://build.opensuse.org/request/show/141304
OBS-URL: https://build.opensuse.org/package/show/Java:packages/xerces-j2?expand=0&rev=17
---
 xerces-j2-bootstrap.changes |  5 +++++
 xerces-j2-bootstrap.spec    |  3 ++-
 xerces-j2.spec              | 20 ++++++++++----------
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/xerces-j2-bootstrap.changes b/xerces-j2-bootstrap.changes
index ea3522a..c9b5bfd 100644
--- a/xerces-j2-bootstrap.changes
+++ b/xerces-j2-bootstrap.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue May 15 09:07:20 UTC 2012 - mvyskocil@suse.cz
+
+- ignore openjdk7 as well 
+
 -------------------------------------------------------------------
 Mon Mar 14 13:05:09 UTC 2011 - mvyskocil@suse.cz
 
diff --git a/xerces-j2-bootstrap.spec b/xerces-j2-bootstrap.spec
index 3d76281..5aea5bc 100644
--- a/xerces-j2-bootstrap.spec
+++ b/xerces-j2-bootstrap.spec
@@ -24,6 +24,7 @@ BuildRequires:  antlr-bootstrap
 BuildRequires:  fastjar
 BuildRequires:  java-1_5_0-gcj-compat-devel
 #!BuildIgnore:  java-1_6_0-openjdk java-1_6_0-openjdk-devel
+#!BuildIgnore:  java-1_7_0-openjdk java-1_7_0-openjdk-devel
 BuildRequires:  unzip
 BuildRequires:  xml-commons-apis-bootstrap
 BuildRequires:  xml-commons-resolver-bootstrap
@@ -46,7 +47,7 @@ Release:        247
 Requires:       xml-commons-which-bootstrap
 Requires:       xml-commons-apis-bootstrap
 Requires:       xml-commons-resolver-bootstrap
-License:        Apache Software License ..
+License:        Apache-2.0
 Group:          Development/Libraries/Java
 AutoReqProv:    on
 Source0:        Xerces-J-src.%{version}.tar.bz2
diff --git a/xerces-j2.spec b/xerces-j2.spec
index 8dcfe64..11d4457 100644
--- a/xerces-j2.spec
+++ b/xerces-j2.spec
@@ -27,7 +27,7 @@ Name:           xerces-j2
 Version:        2.8.1
 Release:        250
 Summary:        Java XML parser
-License:        Apache Software License ..
+License:        Apache-2.0
 Url:            http://xml.apache.org/xerces2-j/
 Group:          Development/Libraries/Java
 Source0:        Xerces-J-src.%{version}.tar.bz2
@@ -76,7 +76,7 @@ Implementation page.
 
 
 %package        javadoc-impl
-License:        Apache Software License ..
+License:        Apache-2.0
 Summary:        Javadoc for xerces-j2 implementation
 Group:          Development/Libraries/Java
 PreReq:         coreutils
@@ -107,7 +107,7 @@ implementation.
 
 
 %package        javadoc-apis
-License:        Apache Software License ..
+License:        Apache-2.0
 Summary:        Javadoc for xerces-j2 apis
 Group:          Development/Libraries/Java
 PreReq:         coreutils
@@ -137,7 +137,7 @@ This package contains the javadoc documentation for the Xerces2 APIs.
 
 
 %package        javadoc-dom3
-License:        Apache Software License ..
+License:        Apache-2.0
 Summary:        Javadoc for xerces-j2 DOM3
 Group:          Development/Libraries/Java
 PreReq:         coreutils
@@ -167,7 +167,7 @@ This package contains the javadoc documentation for Xerces2 DOM3.
 
 
 %package        javadoc-xni
-License:        Apache Software License ..
+License:        Apache-2.0
 Summary:        Javadoc for xerces-j2 XNI
 Group:          Development/Libraries/Java
 PreReq:         coreutils
@@ -197,7 +197,7 @@ This package contains the javadoc documentation for Xerces2 XNI.
 
 
 %package        javadoc-other
-License:        Apache Software License ..
+License:        Apache-2.0
 Summary:        Javadoc for other xerces-j2 components
 Group:          Development/Libraries/Java
 PreReq:         coreutils
@@ -228,7 +228,7 @@ Xerces2.
 
 
 %package        demo
-License:        Apache Software License ..
+License:        Apache-2.0
 Summary:        Demonstration and sample files for xerces-j2
 Group:          Development/Libraries/Java
 Requires:       %{name} = %{version}
@@ -258,7 +258,7 @@ This package contains demonstration and sample files for Xerces2.
 
 
 %package        scripts
-License:        Apache Software License ..
+License:        Apache-2.0
 Summary:        Additional utility scripts for xerces-j2
 Group:          Development/Libraries/Java
 Requires:       %{name} = %{version}
@@ -289,7 +289,7 @@ This package contains additional utility scripts for Xerces2.
 
 
 %package        xml-resolver
-License:        Apache Software License ..
+License:        Apache-2.0
 Summary:        Resolver subproject of xml-commons
 Group:          Development/Libraries/Java
 Requires:       jpackage-utils >= 1.5
@@ -307,7 +307,7 @@ This package contains the resolver subproject of xml-commons.
 
 
 %package        xml-apis
-License:        Apache Software License ..
+License:        Apache-2.0
 Summary:        APIs subproject of xml-commons
 Group:          Development/Libraries/Java
 Requires:       jpackage-utils >= 1.5