OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=111

ant-antlr.spec

@@ -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