This commit is contained in:
parent
1b6efe2f15
commit
627ce7a697
@ -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
|
Thu May 17 07:58:39 UTC 2018 - fstrba@suse.com
|
||||||
|
|
||||||
|
@ -57,7 +57,7 @@ Release: 0
|
|||||||
Summary: Geronimo J2EE server J2EE specifications
|
Summary: Geronimo J2EE server J2EE specifications
|
||||||
License: Apache-2.0
|
License: Apache-2.0
|
||||||
Group: Development/Languages/Java
|
Group: Development/Languages/Java
|
||||||
Url: http://geronimo.apache.org
|
URL: http://geronimo.apache.org
|
||||||
Source0: %{name}-%{version}-src.tar.bz2
|
Source0: %{name}-%{version}-src.tar.bz2
|
||||||
# STEPS TO CREATE THE SOURCE FILE
|
# STEPS TO CREATE THE SOURCE FILE
|
||||||
# mkdir geronimo-specs-1.2
|
# mkdir geronimo-specs-1.2
|
||||||
@ -120,6 +120,7 @@ BuildRequires: java-devel >= 1.8
|
|||||||
BuildRequires: javapackages-local
|
BuildRequires: javapackages-local
|
||||||
BuildRequires: javapackages-tools
|
BuildRequires: javapackages-tools
|
||||||
BuildRequires: junit >= 3.8.1
|
BuildRequires: junit >= 3.8.1
|
||||||
|
BuildConflicts: java-devel >= 11
|
||||||
# The main package has links to all specs, so it requires all subpackages
|
# The main package has links to all specs, so it requires all subpackages
|
||||||
# except j2ee-schema (not linked) and javadocs
|
# except j2ee-schema (not linked) and javadocs
|
||||||
Requires: geronimo-annotation-1_0-api = %{version}
|
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-stax-1_0-api = %{version}
|
||||||
Requires: geronimo-ws-metadata-2_0-api = %{version}
|
Requires: geronimo-ws-metadata-2_0-api = %{version}
|
||||||
Obsoletes: geronimo-javadoc
|
Obsoletes: geronimo-javadoc
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
|
Loading…
Reference in New Issue
Block a user