Accepting request 330306 from Java:packages

- Fix cycles on Leap which is 1315 same as SLE.
- Sort deps with spec-cleaner

OBS-URL: https://build.opensuse.org/request/show/330306
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ecj?expand=0&rev=21
This commit is contained in:
Dominique Leuenberger 2015-09-17 07:17:13 +00:00 committed by Git OBS Bridge
commit ef168d9c03
2 changed files with 13 additions and 8 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Sep 10 10:06:40 UTC 2015 - tchvatal@suse.com
- Fix cycles on Leap which is 1315 same as SLE.
- Sort deps with spec-cleaner
-------------------------------------------------------------------
Fri Sep 19 07:36:41 UTC 2014 - dmacvicar@suse.de

View File

@ -1,7 +1,7 @@
#
# spec file for package ecj
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 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
@ -44,23 +44,22 @@ Patch1: %{name}-include-props.patch
# Patches Source2 for compatibility with newer ecj
Patch2: eclipse-gcj-compat4.2.1.patch
Patch3: eclipse-gcj-nodummysymbol.patch
BuildRequires: ant
BuildRequires: gzip
BuildRequires: unzip
Conflicts: ecj-bootstrap
Provides: eclipse-ecj = %{version}-%{release}
Obsoletes: eclipse-ecj < 3.4.2-4
Conflicts: ecj-bootstrap
%if 0%{?suse_version} < 1320
BuildRequires: java-devel >= 1.7.0
%else
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
BuildRequires: java-1_7_0-openjdk-bootstrap-devel
%else
BuildRequires: java-devel >= 1.7.0
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description
ECJ is the Java bytecode compiler of the Eclipse Platform. It is also known as