From de846836cb92cc38d569ddd6c3b8fa25861db7a299d0fd78541bfce723fe16d7 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 14 Sep 2017 05:53:04 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=91 --- ant-antlr.changes | 3 ++- ant-antlr.spec | 3 ++- ant-junit.changes | 3 ++- ant-junit.spec | 3 ++- ant.changes | 3 ++- ant.spec | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ant-antlr.changes b/ant-antlr.changes index 79ab6c2..b547f57 100644 --- a/ant-antlr.changes +++ b/ant-antlr.changes @@ -2,7 +2,8 @@ Thu Sep 14 05:39:48 UTC 2017 - fstrba@suse.com - Allow bootstrapping with something else then - java-1_5_0-gcj-compat + java-1_5_0-gcj-compat, but still require + java-1_5_0-gcj-compat-devel ------------------------------------------------------------------- Wed Sep 6 17:49:21 UTC 2017 - fstrba@suse.com diff --git a/ant-antlr.spec b/ant-antlr.spec index 22054d2..422b8fc 100644 --- a/ant-antlr.spec +++ b/ant-antlr.spec @@ -45,7 +45,8 @@ Patch1: apache-ant-class-path-in-manifest.patch Patch3: reproducible.patch Patch4: apache-ant-1.9.9-sourcetarget.patch %if %{with bootstrap} -BuildRequires: java-devel >= 1.5 +BuildRequires: java-1_5_0-gcj-compat-devel +#BuildRequires: java-devel >= 1.5 BuildConflicts: java-devel >= 1.9 #!BuildIgnore: java-9-openjdk java-9-openjdk-devel java-9-openjdk-headless %else diff --git a/ant-junit.changes b/ant-junit.changes index 79ab6c2..b547f57 100644 --- a/ant-junit.changes +++ b/ant-junit.changes @@ -2,7 +2,8 @@ Thu Sep 14 05:39:48 UTC 2017 - fstrba@suse.com - Allow bootstrapping with something else then - java-1_5_0-gcj-compat + java-1_5_0-gcj-compat, but still require + java-1_5_0-gcj-compat-devel ------------------------------------------------------------------- Wed Sep 6 17:49:21 UTC 2017 - fstrba@suse.com diff --git a/ant-junit.spec b/ant-junit.spec index c2ce70f..c4d92a8 100644 --- a/ant-junit.spec +++ b/ant-junit.spec @@ -45,7 +45,8 @@ Patch1: apache-ant-class-path-in-manifest.patch Patch3: reproducible.patch Patch4: apache-ant-1.9.9-sourcetarget.patch %if %{with bootstrap} -BuildRequires: java-devel >= 1.5 +BuildRequires: java-1_5_0-gcj-compat-devel +#BuildRequires: java-devel >= 1.5 BuildConflicts: java-devel >= 1.9 #!BuildIgnore: java-9-openjdk java-9-openjdk-devel java-9-openjdk-headless %else diff --git a/ant.changes b/ant.changes index 79ab6c2..b547f57 100644 --- a/ant.changes +++ b/ant.changes @@ -2,7 +2,8 @@ Thu Sep 14 05:39:48 UTC 2017 - fstrba@suse.com - Allow bootstrapping with something else then - java-1_5_0-gcj-compat + java-1_5_0-gcj-compat, but still require + java-1_5_0-gcj-compat-devel ------------------------------------------------------------------- Wed Sep 6 17:49:21 UTC 2017 - fstrba@suse.com diff --git a/ant.spec b/ant.spec index 5abe842..4bcb3c6 100644 --- a/ant.spec +++ b/ant.spec @@ -44,7 +44,8 @@ Patch1: apache-ant-class-path-in-manifest.patch Patch3: reproducible.patch Patch4: apache-ant-1.9.9-sourcetarget.patch %if %{with bootstrap} -BuildRequires: java-devel >= 1.5 +BuildRequires: java-1_5_0-gcj-compat-devel +#BuildRequires: java-devel >= 1.5 BuildConflicts: java-devel >= 1.9 #!BuildIgnore: java-9-openjdk java-9-openjdk-devel java-9-openjdk-headless %else