pool/ant
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 620740 from Java:packages

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/620740
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ant?expand=0&rev=68
This commit is contained in:
Dominique Leuenberger 2018-07-24 15:29:58 +00:00 committed by Git OBS Bridge
commit 6dd44b911b
7 changed files with 52 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ant-antlr.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Tue May 15 05:02:22 UTC 2018 - fstrba@suse.com
- Build with source and target 8 to prepare for a possible removal
of 1.6 compatibility
- Modified patch:
* apache-ant-1.9.9-sourcetarget.patch
- Build with source/target 8
-------------------------------------------------------------------
Fri Feb 23 10:24:31 UTC 2018 - ecsos@opensuse.org
- fix build error for Leap 42.3
-------------------------------------------------------------------
Thu Feb 22 11:43:31 UTC 2018 - tchvatal@suse.com

8
ant-antlr.spec
View File

@ -43,7 +43,7 @@ Patch5: apache-ant-bootstrap.patch
Patch6: reproducible-build-date.patch
Patch7: ant-python3.patch
BuildRequires: antlr-bootstrap
BuildRequires: java-devel >= 1.6
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-tools
BuildRequires: unzip
BuildRequires: xml-commons-apis-bootstrap
@ -67,7 +67,7 @@ BuildRequires: xml-commons-apis
BuildRequires: strip-nondeterminism
%endif
%if %{with bootstrap}
Requires: java-devel >= 1.6
Requires: java-devel >= 1.8
Requires: javapackages-tools
Requires: jaxp_parser_impl
Requires: xml-commons-apis
@ -381,7 +381,7 @@ rm -rf build/lib/ant-jai.jar build/lib/ant-netrexx.jar
%if %{with bootstrap}
export GC_MAXIMUM_HEAP_SIZE="134217728" #128M
export JAVA_HOME="%{java_home}"
export BOOTJAVAC_OPTS="-source 1.6 -target 1.6"
export BOOTJAVAC_OPTS="-source 8 -target 8"
sh -x ./build.sh --noconfig jars
%endif
@ -531,6 +531,8 @@ find %{buildroot}%{_datadir}/ant%{_sysconfdir} -type f -name "*.xsl" \
-a ! -name tagdiff.xsl \
-print -delete
%endif
# remove *.orig
rm -rf %{buildroot}/usr/bin/ant.orig
%if %{with bootstrap}
%files

14
ant-junit.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Tue May 15 05:02:22 UTC 2018 - fstrba@suse.com
- Build with source and target 8 to prepare for a possible removal
of 1.6 compatibility
- Modified patch:
* apache-ant-1.9.9-sourcetarget.patch
- Build with source/target 8
-------------------------------------------------------------------
Fri Feb 23 10:24:31 UTC 2018 - ecsos@opensuse.org
- fix build error for Leap 42.3
-------------------------------------------------------------------
Thu Feb 22 11:43:31 UTC 2018 - tchvatal@suse.com

8
ant-junit.spec
View File

@ -43,7 +43,7 @@ Patch5: apache-ant-bootstrap.patch
Patch6: reproducible-build-date.patch
Patch7: ant-python3.patch
BuildRequires: antlr-bootstrap
BuildRequires: java-devel >= 1.6
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-tools
BuildRequires: unzip
BuildRequires: xml-commons-apis-bootstrap
@ -67,7 +67,7 @@ BuildRequires: xml-commons-apis
BuildRequires: strip-nondeterminism
%endif
%if %{with bootstrap}
Requires: java-devel >= 1.6
Requires: java-devel >= 1.8
Requires: javapackages-tools
Requires: jaxp_parser_impl
Requires: xml-commons-apis
@ -381,7 +381,7 @@ rm -rf build/lib/ant-jai.jar build/lib/ant-netrexx.jar
%if %{with bootstrap}
export GC_MAXIMUM_HEAP_SIZE="134217728" #128M
export JAVA_HOME="%{java_home}"
export BOOTJAVAC_OPTS="-source 1.6 -target 1.6"
export BOOTJAVAC_OPTS="-source 8 -target 8"
sh -x ./build.sh --noconfig jars
%endif
@ -531,6 +531,8 @@ find %{buildroot}%{_datadir}/ant%{_sysconfdir} -type f -name "*.xsl" \
-a ! -name tagdiff.xsl \
-print -delete
%endif
# remove *.orig
rm -rf %{buildroot}/usr/bin/ant.orig
%if %{with bootstrap}
%files

9
ant.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Tue May 15 05:02:22 UTC 2018 - fstrba@suse.com
- Build with source and target 8 to prepare for a possible removal
of 1.6 compatibility
- Modified patch:
* apache-ant-1.9.9-sourcetarget.patch
- Build with source/target 8
-------------------------------------------------------------------
Fri Feb 23 10:24:31 UTC 2018 - ecsos@opensuse.org

6
ant.spec
View File

@ -42,7 +42,7 @@ Patch5: apache-ant-bootstrap.patch
Patch6: reproducible-build-date.patch
Patch7: ant-python3.patch
BuildRequires: antlr-bootstrap
BuildRequires: java-devel >= 1.6
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-tools
BuildRequires: unzip
BuildRequires: xml-commons-apis-bootstrap
@ -66,7 +66,7 @@ BuildRequires: xml-commons-apis
BuildRequires: strip-nondeterminism
%endif
%if %{with bootstrap}
Requires: java-devel >= 1.6
Requires: java-devel >= 1.8
Requires: javapackages-tools
Requires: jaxp_parser_impl
Requires: xml-commons-apis
@ -380,7 +380,7 @@ rm -rf build/lib/ant-jai.jar build/lib/ant-netrexx.jar
%if %{with bootstrap}
export GC_MAXIMUM_HEAP_SIZE="134217728" #128M
export JAVA_HOME="%{java_home}"
export BOOTJAVAC_OPTS="-source 1.6 -target 1.6"
export BOOTJAVAC_OPTS="-source 8 -target 8"
sh -x ./build.sh --noconfig jars
%endif

4
apache-ant-1.9.9-sourcetarget.patch
View File

@ -6,8 +6,8 @@
<property name="optimize" value="true"/>
- <property name="javac.target" value="1.5"/>
- <property name="javac.source" value="1.5"/>
+ <property name="javac.target" value="1.6"/>
+ <property name="javac.source" value="1.6"/>
+ <property name="javac.target" value="8"/>
+ <property name="javac.source" value="8"/>
<property name="junit.filtertrace" value="off"/>
<property name="junit.summary" value="no"/>
<property name="test.haltonfailure" value="false"/>