Hello community, here is the log from the commit of package ant for openSUSE:Factory checked in at 2017-09-17 22:36:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ant (Old) and /work/SRC/openSUSE:Factory/.ant.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ant" Sun Sep 17 22:36:02 2017 rev:63 rq:526034 version:1.9.9 Changes: -------- --- /work/SRC/openSUSE:Factory/ant/ant-antlr.changes 2017-09-13 22:18:56.543841114 +0200 +++ /work/SRC/openSUSE:Factory/.ant.new/ant-antlr.changes 2017-09-17 22:36:06.239422420 +0200 @@ -1,0 +2,11 @@ +Thu Sep 14 05:39:48 UTC 2017 - [email protected] + +- Allow bootstrapping with something else then + java-1_5_0-gcj-compat, but still require + java-1_5_0-gcj-compat-devel +- Added patch: + * apache-ant-bootstrap.patch + - Add -sourcepath option to fix build breakages with Eclipse + Compiler for Java(tm) + +------------------------------------------------------------------- ant-junit.changes: same change ant.changes: same change New: ---- apache-ant-bootstrap.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ant-antlr.spec ++++++ --- /var/tmp/diff_new_pack.SinK2O/_old 2017-09-17 22:36:08.395119339 +0200 +++ /var/tmp/diff_new_pack.SinK2O/_new 2017-09-17 22:36:08.399118777 +0200 @@ -44,11 +44,11 @@ #PATCH-FIX-UPSTREAM -- https://bz.apache.org/bugzilla/show_bug.cgi?id=61079 Patch3: reproducible.patch Patch4: apache-ant-1.9.9-sourcetarget.patch +Patch5: apache-ant-bootstrap.patch %if %{with bootstrap} BuildRequires: java-1_5_0-gcj-compat-devel -#!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel java-1_6_0-openjdk-headless -#!BuildIgnore: java-1_7_0-openjdk java-1_7_0-openjdk-devel java-1_7_0-openjdk-headless -#!BuildIgnore: java-1_8_0-openjdk java-1_8_0-openjdk-devel java-1_8_0-openjdk-headless +#BuildRequires: java-devel >= 1.5 +BuildConflicts: java-devel >= 1.9 #!BuildIgnore: java-9-openjdk java-9-openjdk-devel java-9-openjdk-headless %else BuildRequires: java-devel >= 1.6.0 @@ -354,6 +354,7 @@ %if ! %{with bootstrap} %patch4 -p1 %endif +%patch5 -p1 # clean jar files %{_bindir}/find . -name "*.jar" | %{_bindir}/xargs -t rm @@ -394,8 +395,7 @@ %if %{with bootstrap} 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" +export BOOTJAVAC_OPTS="-source 1.5 -target 1.5" sh -x ./build.sh --noconfig jars %endif ant-junit.spec: same change ++++++ ant.spec ++++++ --- /var/tmp/diff_new_pack.SinK2O/_old 2017-09-17 22:36:08.463109780 +0200 +++ /var/tmp/diff_new_pack.SinK2O/_new 2017-09-17 22:36:08.467109218 +0200 @@ -43,11 +43,11 @@ #PATCH-FIX-UPSTREAM -- https://bz.apache.org/bugzilla/show_bug.cgi?id=61079 Patch3: reproducible.patch Patch4: apache-ant-1.9.9-sourcetarget.patch +Patch5: apache-ant-bootstrap.patch %if %{with bootstrap} BuildRequires: java-1_5_0-gcj-compat-devel -#!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel java-1_6_0-openjdk-headless -#!BuildIgnore: java-1_7_0-openjdk java-1_7_0-openjdk-devel java-1_7_0-openjdk-headless -#!BuildIgnore: java-1_8_0-openjdk java-1_8_0-openjdk-devel java-1_8_0-openjdk-headless +#BuildRequires: java-devel >= 1.5 +BuildConflicts: java-devel >= 1.9 #!BuildIgnore: java-9-openjdk java-9-openjdk-devel java-9-openjdk-headless %else BuildRequires: java-devel >= 1.6.0 @@ -353,6 +353,7 @@ %if ! %{with bootstrap} %patch4 -p1 %endif +%patch5 -p1 # clean jar files %{_bindir}/find . -name "*.jar" | %{_bindir}/xargs -t rm @@ -393,8 +394,7 @@ %if %{with bootstrap} 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" +export BOOTJAVAC_OPTS="-source 1.5 -target 1.5" sh -x ./build.sh --noconfig jars %endif ++++++ apache-ant-bootstrap.patch ++++++ --- apache-ant-1.9.9/bootstrap.sh 2017-02-02 18:55:08.000000000 +0100 +++ apache-ant-1.9.9/bootstrap.sh 2017-09-14 09:10:47.071433171 +0200 @@ -124,8 +124,7 @@ mkdir -p bin echo ... Compiling Ant Classes - -"${JAVAC}" $BOOTJAVAC_OPTS -d ${CLASSDIR} ${TOOLS}/bzip2/*.java ${TOOLS}/tar/*.java ${TOOLS}/zip/*.java \ +"${JAVAC}" $BOOTJAVAC_OPTS -d ${CLASSDIR} -sourcepath src/main ${TOOLS}/bzip2/*.java ${TOOLS}/tar/*.java ${TOOLS}/zip/*.java \ ${TOOLS}/ant/util/regexp/RegexpMatcher.java \ ${TOOLS}/ant/util/regexp/RegexpMatcherFactory.java \ ${TOOLS}/ant/property/*.java \
