From 627ce7a697bfb69522e5592146d776860d2fee9033ba7a63957e74ad55cba9f1 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 16 Jul 2018 09:50:17 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/geronimo-specs?expand=0&rev=28 --- geronimo-specs.changes | 6 ++++++ geronimo-specs.spec | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/geronimo-specs.changes b/geronimo-specs.changes index 0ac6d4f..5a5fb90 100644 --- a/geronimo-specs.changes +++ b/geronimo-specs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jul 16 09:49:33 UTC 2018 - fstrba@suse.com + +- BuildConflict with java-devel >= 11, since the build uses tools + and APIs removed in jdk11 + ------------------------------------------------------------------- Thu May 17 07:58:39 UTC 2018 - fstrba@suse.com diff --git a/geronimo-specs.spec b/geronimo-specs.spec index b2ba8b9..5eb2fb7 100644 --- a/geronimo-specs.spec +++ b/geronimo-specs.spec @@ -57,7 +57,7 @@ Release: 0 Summary: Geronimo J2EE server J2EE specifications License: Apache-2.0 Group: Development/Languages/Java -Url: http://geronimo.apache.org +URL: http://geronimo.apache.org Source0: %{name}-%{version}-src.tar.bz2 # STEPS TO CREATE THE SOURCE FILE # mkdir geronimo-specs-1.2 @@ -120,6 +120,7 @@ BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local BuildRequires: javapackages-tools BuildRequires: junit >= 3.8.1 +BuildConflicts: java-devel >= 11 # The main package has links to all specs, so it requires all subpackages # except j2ee-schema (not linked) and javadocs Requires: geronimo-annotation-1_0-api = %{version} @@ -158,7 +159,6 @@ Requires: geronimo-servlet-2_5-api = %{version} Requires: geronimo-stax-1_0-api = %{version} Requires: geronimo-ws-metadata-2_0-api = %{version} Obsoletes: geronimo-javadoc -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description