- Fix build with javapacakges-tools

OBS-URL: https://build.opensuse.org/package/show/Java:packages/ecj?expand=0&rev=29
This commit is contained in:
Tomáš Chvátal 2017-05-19 12:05:16 +00:00 committed by Git OBS Bridge
parent 2f9767d041
commit 81d5a18397
2 changed files with 9 additions and 2 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri May 19 12:04:39 UTC 2017 - tchvatal@suse.com
- Fix build with javapacakges-tools
-------------------------------------------------------------------
Thu Sep 10 10:06:40 UTC 2015 - tchvatal@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package ecj
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -46,16 +46,18 @@ Patch2: eclipse-gcj-compat4.2.1.patch
Patch3: eclipse-gcj-nodummysymbol.patch
BuildRequires: ant
BuildRequires: gzip
BuildRequires: javapackages-local
BuildRequires: javapackages-tools
BuildRequires: unzip
Conflicts: ecj-bootstrap
Provides: eclipse-ecj = %{version}-%{release}
Obsoletes: eclipse-ecj < 3.4.2-4
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%if 0%{?suse_version} > 1315 || 0%{?is_opensuse} == 1
#!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel
#!BuildIgnore: java-1_7_0-openjdk java-1_7_0-openjdk-devel
#!BuildIgnore: java-1_8_0-openjdk java-1_8_0-openjdk-devel
#!buildIgnore: java-9-openjdk java-9-openjdk-devel
BuildRequires: java-1_7_0-openjdk-bootstrap-devel
%else
BuildRequires: java-devel >= 1.7.0