- Do not use gcj but java 1.8.0+ for building as gcj is gone from gcc7
- Do not use gcj but java 1.8.0+ for building as gcj is gone from gcc7 OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=72
This commit is contained in:
parent
1e0d7eb309
commit
e5ab749979
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Jan 4 10:44:04 UTC 2017 - tchvatal@suse.com
|
||||||
|
|
||||||
|
- Do not use gcj but java 1.8.0+ for building as gcj is gone from gcc7
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Jan 15 22:01:37 UTC 2016 - opensuse@dstoecker.de
|
Fri Jan 15 22:01:37 UTC 2016 - opensuse@dstoecker.de
|
||||||
|
|
||||||
|
@ -53,7 +53,6 @@ Patch1: apache-ant-class-path-in-manifest.patch
|
|||||||
Patch2: apache-ant-old-gcj-build.patch
|
Patch2: apache-ant-old-gcj-build.patch
|
||||||
#!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel
|
#!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_7_0-openjdk java-1_7_0-openjdk-devel
|
||||||
BuildRequires: antlr-bootstrap
|
|
||||||
BuildRequires: java-devel >= 1.5.0
|
BuildRequires: java-devel >= 1.5.0
|
||||||
BuildRequires: javapackages-tools
|
BuildRequires: javapackages-tools
|
||||||
BuildRequires: unzip
|
BuildRequires: unzip
|
||||||
@ -79,6 +78,8 @@ Obsoletes: ant-nodeps < %{version}
|
|||||||
Provides: ant-nodeps = %{version}
|
Provides: ant-nodeps = %{version}
|
||||||
Obsoletes: ant-trax < %{version}
|
Obsoletes: ant-trax < %{version}
|
||||||
Provides: ant-trax = %{version}
|
Provides: ant-trax = %{version}
|
||||||
|
%else
|
||||||
|
BuildRequires: antlr-bootstrap
|
||||||
%endif
|
%endif
|
||||||
%if %{with antlr}
|
%if %{with antlr}
|
||||||
Requires: antlr
|
Requires: antlr
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Jan 4 10:44:04 UTC 2017 - tchvatal@suse.com
|
||||||
|
|
||||||
|
- Do not use gcj but java 1.8.0+ for building as gcj is gone from gcc7
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Jan 15 22:01:37 UTC 2016 - opensuse@dstoecker.de
|
Fri Jan 15 22:01:37 UTC 2016 - opensuse@dstoecker.de
|
||||||
|
|
||||||
|
@ -53,7 +53,6 @@ Patch1: apache-ant-class-path-in-manifest.patch
|
|||||||
Patch2: apache-ant-old-gcj-build.patch
|
Patch2: apache-ant-old-gcj-build.patch
|
||||||
#!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel
|
#!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_7_0-openjdk java-1_7_0-openjdk-devel
|
||||||
BuildRequires: antlr-bootstrap
|
|
||||||
BuildRequires: java-devel >= 1.5.0
|
BuildRequires: java-devel >= 1.5.0
|
||||||
BuildRequires: javapackages-tools
|
BuildRequires: javapackages-tools
|
||||||
BuildRequires: unzip
|
BuildRequires: unzip
|
||||||
@ -79,6 +78,8 @@ Obsoletes: ant-nodeps < %{version}
|
|||||||
Provides: ant-nodeps = %{version}
|
Provides: ant-nodeps = %{version}
|
||||||
Obsoletes: ant-trax < %{version}
|
Obsoletes: ant-trax < %{version}
|
||||||
Provides: ant-trax = %{version}
|
Provides: ant-trax = %{version}
|
||||||
|
%else
|
||||||
|
BuildRequires: antlr-bootstrap
|
||||||
%endif
|
%endif
|
||||||
%if %{with antlr}
|
%if %{with antlr}
|
||||||
Requires: antlr
|
Requires: antlr
|
||||||
|
3
ant.spec
3
ant.spec
@ -52,7 +52,6 @@ Patch1: apache-ant-class-path-in-manifest.patch
|
|||||||
Patch2: apache-ant-old-gcj-build.patch
|
Patch2: apache-ant-old-gcj-build.patch
|
||||||
#!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel
|
#!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_7_0-openjdk java-1_7_0-openjdk-devel
|
||||||
BuildRequires: antlr-bootstrap
|
|
||||||
BuildRequires: java-devel >= 1.5.0
|
BuildRequires: java-devel >= 1.5.0
|
||||||
BuildRequires: javapackages-tools
|
BuildRequires: javapackages-tools
|
||||||
BuildRequires: unzip
|
BuildRequires: unzip
|
||||||
@ -78,6 +77,8 @@ Obsoletes: ant-nodeps < %{version}
|
|||||||
Provides: ant-nodeps = %{version}
|
Provides: ant-nodeps = %{version}
|
||||||
Obsoletes: ant-trax < %{version}
|
Obsoletes: ant-trax < %{version}
|
||||||
Provides: ant-trax = %{version}
|
Provides: ant-trax = %{version}
|
||||||
|
%else
|
||||||
|
BuildRequires: antlr-bootstrap
|
||||||
%endif
|
%endif
|
||||||
%if %{with antlr}
|
%if %{with antlr}
|
||||||
Requires: antlr
|
Requires: antlr
|
||||||
|
Loading…
x
Reference in New Issue
Block a user