From 34f3e041ce2c6f0ea5eb5a6a27eb0f2d9c74486a0fcb0a0b1fc7e5d889c7e147 Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Mon, 14 Mar 2011 13:06:09 +0000 Subject: [PATCH] - build ignore openjdk OBS-URL: https://build.opensuse.org/package/show/Java:packages/xerces-j2?expand=0&rev=13 --- xerces-j2-bootstrap.changes | 5 +++++ xerces-j2-bootstrap.spec | 10 +++++++++- xerces-j2.changes | 5 +++++ xerces-j2.spec | 1 + 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/xerces-j2-bootstrap.changes b/xerces-j2-bootstrap.changes index d9190a1..ea3522a 100644 --- a/xerces-j2-bootstrap.changes +++ b/xerces-j2-bootstrap.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 14 13:05:09 UTC 2011 - mvyskocil@suse.cz + +- build ignore openjdk + ------------------------------------------------------------------- Thu Sep 2 12:36:17 UTC 2010 - mvyskocil@suse.cz diff --git a/xerces-j2-bootstrap.spec b/xerces-j2-bootstrap.spec index e34357e..12fedd4 100644 --- a/xerces-j2-bootstrap.spec +++ b/xerces-j2-bootstrap.spec @@ -20,7 +20,15 @@ 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 +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 +BuildRequires: unzip +BuildRequires: xml-commons-apis-bootstrap +BuildRequires: xml-commons-resolver-bootstrap +BuildRequires: xml-commons-which-bootstrap +BuildRequires: zip #!BuildIgnore: antlr antlr-java %if %{?!suse_version:1}0 %if %{?!mandriva_release:1}0 diff --git a/xerces-j2.changes b/xerces-j2.changes index 6401e98..214186d 100644 --- a/xerces-j2.changes +++ b/xerces-j2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 14 13:05:09 UTC 2011 - mvyskocil@suse.cz + +- build ignore openjdk + ------------------------------------------------------------------- Tue Sep 21 09:15:04 UTC 2010 - mvyskocil@suse.cz diff --git a/xerces-j2.spec b/xerces-j2.spec index b58e22c..88d7319 100644 --- a/xerces-j2.spec +++ b/xerces-j2.spec @@ -45,6 +45,7 @@ PreReq: update-alternatives /bin/ln # the first package built, and we use the libraries in the tools subdir # for it. BuildRequires: java-1_5_0-gcj-compat-devel +#!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel BuildRequires: antlr-bootstrap #!BuildIgnore: antlr antlr-java BuildRequires: jpackage-utils