pool/geronimo-specs
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 623105 from Java:packages

Browse Source 
build-conflict with jdk11+

OBS-URL: https://build.opensuse.org/request/show/623105
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/geronimo-specs?expand=0&rev=27
This commit is contained in:
Dominique Leuenberger 2018-07-24 15:33:17 +00:00 committed by Git OBS Bridge
commit b886c2bc96
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
geronimo-specs.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
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
- Build with source and target 8 to prepare for a possible removal
of 1.6 compatibility
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Sep 8 07:54:40 UTC 2017 - fstrba@suse.com Fri Sep 8 07:54:40 UTC 2017 - fstrba@suse.com

10
geronimo-specs.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package geronimo-specs # spec file for package geronimo-specs
# #
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -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
@ -116,10 +116,11 @@ Patch4: geronimo-specs-j2ee-1.4-pom_xml.patch
Patch5: geronimo-specs-corba-2.3-pom_xml.patch Patch5: geronimo-specs-corba-2.3-pom_xml.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: java-devel >= 1.6.0 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
@ -807,7 +807,7 @@ ln -s %{_javadir} external_repo/JPP
cp %{SOURCE1000} build.xml cp %{SOURCE1000} build.xml
%build %build
ant -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \ ant -Dant.build.javac.source=8 -Dant.build.javac.target=8 \
-Didlj=%{java_home}/bin/idlj -Didlj=%{java_home}/bin/idlj
%install %install