pool/ant
SHA256
14
0
Fork 2
Code Issues Pull Requests Activity

Accepting request 456868 from Java:packages

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/456868
OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=74
This commit is contained in:
Tomáš Chvátal
2017-02-13 15:20:50 +00:00
committed by Git OBS Bridge
parent 3e0d06c0be
commit 5a1953a058
6 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ant-antlr.changes
View File

@@ -1,8 +1,3 @@
-------------------------------------------------------------------
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

19
ant-antlr.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package ant-antlr
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2000-2009, JPackage Project
# All rights reserved.
#
@@ -23,10 +23,6 @@
%bcond_with junit
%bcond_without antlr
%global ant_home %{_datadir}/ant
%global major_version 1.9
# disable javadoc build on arm platform - it delays a build a lot
# mvyskocil: ifarch does not work for noarch packages ...
%if %{_arch} != arm
@@ -35,6 +31,10 @@
%global build_javadoc 0
%endif
%global ant_home %{_datadir}/ant
%global major_version 1.9
Name: ant-antlr
Version: 1.9.6
Release: 0
@@ -51,11 +51,17 @@ Patch0: apache-ant-no-test-jar.patch
Patch1: apache-ant-class-path-in-manifest.patch
#PATCH-FIX-SLE: fix building with old gcj by working around bugs
Patch2: apache-ant-old-gcj-build.patch
%if %{with bootstrap}
BuildRequires: java-1_5_0-gcj-compat-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
%else
BuildRequires: java-devel >= 1.5.0
%endif
BuildRequires: antlr-bootstrap
BuildRequires: javapackages-tools
BuildRequires: unzip
#BuildRequires: xerces-j2-bootstrap
#!BuildIgnore: xerces-j2-bootstrap
BuildRequires: xml-commons-apis-bootstrap
%if %{with junit} || %{with antlr}
@@ -79,8 +85,6 @@ Obsoletes: ant-nodeps < %{version}
Provides: ant-nodeps = %{version}
Obsoletes: ant-trax < %{version}
Provides: ant-trax = %{version}
%else
BuildRequires: antlr-bootstrap
%endif
%if %{with antlr}
Requires: antlr
@@ -455,6 +459,7 @@ ant javadocs
export GC_MAXIMUM_HEAP_SIZE="134217728" #128M
export JAVA_HOME="%{java_home}"
export CLASSPATH="$JAVA_HOME/lib/tools.jar"
export BOOTJAVAC_OPTS="-C -Wno-deprecated"
sh -x ./build.sh --noconfig jars
%endif

5
ant-junit.changes
View File

@@ -1,8 +1,3 @@
-------------------------------------------------------------------
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

19
ant-junit.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package ant-junit
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2000-2009, JPackage Project
# All rights reserved.
#
@@ -23,10 +23,6 @@
%bcond_without junit
%bcond_with antlr
%global ant_home %{_datadir}/ant
%global major_version 1.9
# disable javadoc build on arm platform - it delays a build a lot
# mvyskocil: ifarch does not work for noarch packages ...
%if %{_arch} != arm
@@ -35,6 +31,10 @@
%global build_javadoc 0
%endif
%global ant_home %{_datadir}/ant
%global major_version 1.9
Name: ant-junit
Version: 1.9.6
Release: 0
@@ -51,11 +51,17 @@ Patch0: apache-ant-no-test-jar.patch
Patch1: apache-ant-class-path-in-manifest.patch
#PATCH-FIX-SLE: fix building with old gcj by working around bugs
Patch2: apache-ant-old-gcj-build.patch
%if %{with bootstrap}
BuildRequires: java-1_5_0-gcj-compat-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
%else
BuildRequires: java-devel >= 1.5.0
%endif
BuildRequires: antlr-bootstrap
BuildRequires: javapackages-tools
BuildRequires: unzip
#BuildRequires: xerces-j2-bootstrap
#!BuildIgnore: xerces-j2-bootstrap
BuildRequires: xml-commons-apis-bootstrap
%if %{with junit} || %{with antlr}
@@ -79,8 +85,6 @@ Obsoletes: ant-nodeps < %{version}
Provides: ant-nodeps = %{version}
Obsoletes: ant-trax < %{version}
Provides: ant-trax = %{version}
%else
BuildRequires: antlr-bootstrap
%endif
%if %{with antlr}
Requires: antlr
@@ -455,6 +459,7 @@ ant javadocs
export GC_MAXIMUM_HEAP_SIZE="134217728" #128M
export JAVA_HOME="%{java_home}"
export CLASSPATH="$JAVA_HOME/lib/tools.jar"
export BOOTJAVAC_OPTS="-C -Wno-deprecated"
sh -x ./build.sh --noconfig jars
%endif

5
ant.changes
View File

@@ -1,8 +1,3 @@
-------------------------------------------------------------------
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

19
ant.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package ant
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2000-2009, JPackage Project
# All rights reserved.
#
@@ -22,10 +22,6 @@
%bcond_with junit
%bcond_with antlr
%global ant_home %{_datadir}/ant
%global major_version 1.9
# disable javadoc build on arm platform - it delays a build a lot
# mvyskocil: ifarch does not work for noarch packages ...
%if %{_arch} != arm
@@ -34,6 +30,10 @@
%global build_javadoc 0
%endif
%global ant_home %{_datadir}/ant
%global major_version 1.9
Name: ant
Version: 1.9.6
Release: 0
@@ -50,11 +50,17 @@ Patch0: apache-ant-no-test-jar.patch
Patch1: apache-ant-class-path-in-manifest.patch
#PATCH-FIX-SLE: fix building with old gcj by working around bugs
Patch2: apache-ant-old-gcj-build.patch
%if %{with bootstrap}
BuildRequires: java-1_5_0-gcj-compat-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
%else
BuildRequires: java-devel >= 1.5.0
%endif
BuildRequires: antlr-bootstrap
BuildRequires: javapackages-tools
BuildRequires: unzip
#BuildRequires: xerces-j2-bootstrap
#!BuildIgnore: xerces-j2-bootstrap
BuildRequires: xml-commons-apis-bootstrap
%if %{with junit} || %{with antlr}
@@ -78,8 +84,6 @@ Obsoletes: ant-nodeps < %{version}
Provides: ant-nodeps = %{version}
Obsoletes: ant-trax < %{version}
Provides: ant-trax = %{version}
%else
BuildRequires: antlr-bootstrap
%endif
%if %{with antlr}
Requires: antlr
@@ -454,6 +458,7 @@ ant javadocs
export GC_MAXIMUM_HEAP_SIZE="134217728" #128M
export JAVA_HOME="%{java_home}"
export CLASSPATH="$JAVA_HOME/lib/tools.jar"
export BOOTJAVAC_OPTS="-C -Wno-deprecated"
sh -x ./build.sh --noconfig jars
%endif