From fadafdb681651151079b297a2fdc7690e5455c628bc10ddf8bdce7c1e0fbd309 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 26 Jan 2020 19:40:04 +0000 Subject: [PATCH 1/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/geronimo-specs?expand=0&rev=47 --- geronimo-specs.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/geronimo-specs.spec b/geronimo-specs.spec index 138e048..4c637bb 100644 --- a/geronimo-specs.spec +++ b/geronimo-specs.spec @@ -1,7 +1,7 @@ # # spec file for package geronimo-specs # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -79,6 +79,7 @@ BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local BuildRequires: junit >= 3.8.1 BuildConflicts: java-devel >= 11 +BuildConflicts: java-devel-openj9 java-headless-openj9 BuildArch: noarch %description From 45e19163401a2862401ec67522f4cc3b5c9b523cfb51677d49009068ad33553e Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 26 Jan 2020 20:04:34 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/geronimo-specs?expand=0&rev=48 --- geronimo-specs.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/geronimo-specs.spec b/geronimo-specs.spec index 4c637bb..cff9a25 100644 --- a/geronimo-specs.spec +++ b/geronimo-specs.spec @@ -79,7 +79,7 @@ BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local BuildRequires: junit >= 3.8.1 BuildConflicts: java-devel >= 11 -BuildConflicts: java-devel-openj9 java-headless-openj9 +BuildConflicts: java-devel-openj9 BuildArch: noarch %description From b79efc8e71f8a36e8e02693d22c8ffca36ee89e250ba7cb74631574d39a28563 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 27 Jan 2020 06:33:18 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/geronimo-specs?expand=0&rev=49 --- geronimo-specs.changes | 6 ++++++ geronimo-specs.spec | 2 ++ 2 files changed, 8 insertions(+) diff --git a/geronimo-specs.changes b/geronimo-specs.changes index d991e66..fadf83f 100644 --- a/geronimo-specs.changes +++ b/geronimo-specs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jan 27 06:32:39 UTC 2020 - Fridrich Strba + +- On supported platforms, avoid building with OpenJ9, in order to + prevent build cycles. + ------------------------------------------------------------------- Tue Dec 10 23:10:17 UTC 2019 - Fridrich Strba diff --git a/geronimo-specs.spec b/geronimo-specs.spec index cff9a25..5628b1c 100644 --- a/geronimo-specs.spec +++ b/geronimo-specs.spec @@ -79,7 +79,9 @@ BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local BuildRequires: junit >= 3.8.1 BuildConflicts: java-devel >= 11 +BuildConflicts: java-headless >= 11 BuildConflicts: java-devel-openj9 +BuildConflicts: java-headless-openj9 BuildArch: noarch %description