From 135321e65bbd07172ab823e5a38209ba3cf67716173faba6665b40fe16fb33a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 10 Sep 2015 10:07:02 +0000 Subject: [PATCH 1/3] - Fix cycles on Leap which is 1315 same as SLE. OBS-URL: https://build.opensuse.org/package/show/Java:packages/ecj?expand=0&rev=25 --- ecj.changes | 5 +++++ ecj.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ecj.changes b/ecj.changes index ec17d6d..306a287 100644 --- a/ecj.changes +++ b/ecj.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Sep 10 10:06:40 UTC 2015 - tchvatal@suse.com + +- Fix cycles on Leap which is 1315 same as SLE. + ------------------------------------------------------------------- Fri Sep 19 07:36:41 UTC 2014 - dmacvicar@suse.de diff --git a/ecj.spec b/ecj.spec index 35680ed..7d59201 100644 --- a/ecj.spec +++ b/ecj.spec @@ -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 @@ -51,7 +51,7 @@ BuildRequires: unzip Provides: eclipse-ecj = %{version}-%{release} Obsoletes: eclipse-ecj < 3.4.2-4 Conflicts: ecj-bootstrap -%if 0%{?suse_version} < 1320 +%if 0%{?suse_version} < 1315 BuildRequires: java-devel >= 1.7.0 %else #!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel From 572e364b00bab7645788726acf985fea24e3a65b011fab8a828efad7043a6228 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 10 Sep 2015 10:08:54 +0000 Subject: [PATCH 2/3] - Sort deps with spec-cleaner OBS-URL: https://build.opensuse.org/package/show/Java:packages/ecj?expand=0&rev=26 --- ecj.changes | 1 + ecj.spec | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ecj.changes b/ecj.changes index 306a287..bed0df9 100644 --- a/ecj.changes +++ b/ecj.changes @@ -2,6 +2,7 @@ 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 diff --git a/ecj.spec b/ecj.spec index 7d59201..5fdaff3 100644 --- a/ecj.spec +++ b/ecj.spec @@ -44,13 +44,14 @@ 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 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %if 0%{?suse_version} < 1315 BuildRequires: java-devel >= 1.7.0 %else @@ -59,8 +60,6 @@ BuildRequires: java-devel >= 1.7.0 #!BuildIgnore: java-1_8_0-openjdk java-1_8_0-openjdk-devel BuildRequires: java-1_7_0-openjdk-bootstrap-devel %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch %description ECJ is the Java bytecode compiler of the Eclipse Platform. It is also known as From 2f9767d0410af649a617256ca964d25d6aae068662e9227e7be0d031f59d5fb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 10 Sep 2015 10:17:14 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/ecj?expand=0&rev=27 --- ecj.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ecj.spec b/ecj.spec index 5fdaff3..c972791 100644 --- a/ecj.spec +++ b/ecj.spec @@ -52,13 +52,13 @@ Provides: eclipse-ecj = %{version}-%{release} Obsoletes: eclipse-ecj < 3.4.2-4 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -%if 0%{?suse_version} < 1315 -BuildRequires: java-devel >= 1.7.0 -%else +%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 %description