From 17d1c2f8cc3ebed2bd7efe3439fab4bf60605d37dae6cc9231ff97d2e3f8fe81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 3 Sep 2014 14:30:15 +0000 Subject: [PATCH] Accepting request 247351 from home:coolo:branches:openSUSE:Factory - on 13.2 and Factory build against bootstrap java OBS-URL: https://build.opensuse.org/request/show/247351 OBS-URL: https://build.opensuse.org/package/show/Java:packages/ecj?expand=0&rev=16 --- ecj.changes | 5 +++++ ecj.spec | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ecj.changes b/ecj.changes index 45e760f..7923287 100644 --- a/ecj.changes +++ b/ecj.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 3 05:42:52 UTC 2014 - coolo@suse.com + +- on 13.2 and Factory build against bootstrap java + ------------------------------------------------------------------- Mon Sep 9 11:05:39 UTC 2013 - tchvatal@suse.com diff --git a/ecj.spec b/ecj.spec index 9d41808..ffc977d 100644 --- a/ecj.spec +++ b/ecj.spec @@ -1,7 +1,7 @@ # # spec file for package ecj # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -49,7 +49,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch BuildRequires: ant +%if %suse_version < 1320 BuildRequires: java-devel >= 1.6.0 +%else +BuildRequires: java-1_7_0-openjdk-bootstrap-devel +%endif BuildRequires: javapackages-tools BuildRequires: sed BuildRequires: unzip