Hello community, here is the log from the commit of package ant for openSUSE:Factory checked in at 2018-02-25 11:35:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ant (Old) and /work/SRC/openSUSE:Factory/.ant.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ant" Sun Feb 25 11:35:02 2018 rev:67 rq:579467 version:1.9.10 Changes: -------- --- /work/SRC/openSUSE:Factory/ant/ant-antlr.changes 2017-10-30 21:17:39.656994471 +0100 +++ /work/SRC/openSUSE:Factory/.ant.new/ant-antlr.changes 2018-02-25 11:35:03.738521684 +0100 @@ -1,0 +2,14 @@ +Thu Feb 22 11:43:31 UTC 2018 - [email protected] + +- Add patch to run scripts with python3 if applicable bsc#1082202: + * ant-python3.patch + +------------------------------------------------------------------- +Thu Feb 22 11:26:23 UTC 2018 - [email protected] + +- Update to 1.9.10: + * Various fixes for java10 + * Small fixes all around +- Remove merged patch reproducible.patch + +------------------------------------------------------------------- ant-junit.changes: same change --- /work/SRC/openSUSE:Factory/ant/ant.changes 2017-10-30 21:17:41.440929610 +0100 +++ /work/SRC/openSUSE:Factory/.ant.new/ant.changes 2018-02-25 11:35:03.938514422 +0100 @@ -1,0 +2,19 @@ +Fri Feb 23 10:24:31 UTC 2018 - [email protected] + +- fix build error for Leap 42.3 + +------------------------------------------------------------------- +Thu Feb 22 11:43:31 UTC 2018 - [email protected] + +- Add patch to run scripts with python3 if applicable bsc#1082202: + * ant-python3.patch + +------------------------------------------------------------------- +Thu Feb 22 11:26:23 UTC 2018 - [email protected] + +- Update to 1.9.10: + * Various fixes for java10 + * Small fixes all around +- Remove merged patch reproducible.patch + +------------------------------------------------------------------- Old: ---- apache-ant-1.9.9-src.tar.bz2 apache-ant-1.9.9-src.tar.bz2.asc reproducible.patch New: ---- ant-python3.patch apache-ant-1.9.10-src.tar.bz2 apache-ant-1.9.10-src.tar.bz2.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ant-antlr.spec ++++++ --- /var/tmp/diff_new_pack.avfNGt/_old 2018-02-25 11:35:06.726413198 +0100 +++ /var/tmp/diff_new_pack.avfNGt/_new 2018-02-25 11:35:06.730413052 +0100 @@ -1,7 +1,7 @@ # # spec file for package ant-antlr # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2000-2009, JPackage Project # # All modifications and additions to the file contributed by third parties @@ -24,7 +24,7 @@ %bcond_with junit %bcond_without antlr Name: ant-antlr -Version: 1.9.9 +Version: 1.9.10 Release: 0 Summary: Antlr Task for ant License: Apache-2.0 @@ -37,12 +37,11 @@ Source1002: ant.keyring Patch0: apache-ant-no-test-jar.patch Patch1: apache-ant-class-path-in-manifest.patch -#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 #PATCH-FEATURE-OPENSUSE bmwiedemann -- have fixed build dates Patch6: reproducible-build-date.patch +Patch7: ant-python3.patch BuildRequires: antlr-bootstrap BuildRequires: java-devel >= 1.6 BuildRequires: javapackages-tools @@ -130,9 +129,9 @@ Summary: Additional scripts for ant License: Apache-2.0 Group: Development/Tools/Building -Requires: %{_bindir}/perl -Requires: %{_bindir}/python Requires: ant = %{version} +Requires: perl +Requires: python3-base %description -n ant-scripts Apache Ant is a Java-based build tool. @@ -338,10 +337,10 @@ %patch0 -p1 %endif %patch1 -%patch3 -p1 %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 # clean jar files find . -name "*.jar" -print -delete ++++++ ant-junit.spec ++++++ --- /var/tmp/diff_new_pack.avfNGt/_old 2018-02-25 11:35:06.754412181 +0100 +++ /var/tmp/diff_new_pack.avfNGt/_new 2018-02-25 11:35:06.758412036 +0100 @@ -1,7 +1,7 @@ # # spec file for package ant-junit # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2000-2009, JPackage Project # # All modifications and additions to the file contributed by third parties @@ -24,7 +24,7 @@ %bcond_without junit %bcond_with antlr Name: ant-junit -Version: 1.9.9 +Version: 1.9.10 Release: 0 Summary: Optional junit tasks for ant License: Apache-2.0 @@ -37,12 +37,11 @@ Source1002: ant.keyring Patch0: apache-ant-no-test-jar.patch Patch1: apache-ant-class-path-in-manifest.patch -#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 #PATCH-FEATURE-OPENSUSE bmwiedemann -- have fixed build dates Patch6: reproducible-build-date.patch +Patch7: ant-python3.patch BuildRequires: antlr-bootstrap BuildRequires: java-devel >= 1.6 BuildRequires: javapackages-tools @@ -130,9 +129,9 @@ Summary: Additional scripts for ant License: Apache-2.0 Group: Development/Tools/Building -Requires: %{_bindir}/perl -Requires: %{_bindir}/python Requires: ant = %{version} +Requires: perl +Requires: python3-base %description -n ant-scripts Apache Ant is a Java-based build tool. @@ -338,10 +337,10 @@ %patch0 -p1 %endif %patch1 -%patch3 -p1 %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 # clean jar files find . -name "*.jar" -print -delete ++++++ ant.spec ++++++ --- /var/tmp/diff_new_pack.avfNGt/_old 2018-02-25 11:35:06.786411019 +0100 +++ /var/tmp/diff_new_pack.avfNGt/_new 2018-02-25 11:35:06.794410729 +0100 @@ -1,7 +1,7 @@ # # spec file for package ant # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2000-2009, JPackage Project # # All modifications and additions to the file contributed by third parties @@ -23,7 +23,7 @@ %bcond_with junit %bcond_with antlr Name: ant -Version: 1.9.9 +Version: 1.9.10 Release: 0 Summary: Java-based build tool License: Apache-2.0 @@ -36,12 +36,11 @@ Source1002: ant.keyring Patch0: apache-ant-no-test-jar.patch Patch1: apache-ant-class-path-in-manifest.patch -#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 #PATCH-FEATURE-OPENSUSE bmwiedemann -- have fixed build dates Patch6: reproducible-build-date.patch +Patch7: ant-python3.patch BuildRequires: antlr-bootstrap BuildRequires: java-devel >= 1.6 BuildRequires: javapackages-tools @@ -129,9 +128,9 @@ Summary: Additional scripts for ant License: Apache-2.0 Group: Development/Tools/Building -Requires: %{_bindir}/perl -Requires: %{_bindir}/python Requires: ant = %{version} +Requires: perl +Requires: python3-base %description -n ant-scripts Apache Ant is a Java-based build tool. @@ -337,10 +336,10 @@ %patch0 -p1 %endif %patch1 -%patch3 -p1 %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 # clean jar files find . -name "*.jar" -print -delete @@ -531,6 +530,8 @@ -a ! -name tagdiff.xsl \ -print -delete %endif +# remove *.orig +rm -rf %{buildroot}/usr/bin/ant.orig %if %{with bootstrap} %files ++++++ ant-python3.patch ++++++ Index: apache-ant-1.9.10/src/script/runant.py =================================================================== --- apache-ant-1.9.10.orig/src/script/runant.py +++ apache-ant-1.9.10/src/script/runant.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with # this work for additional information regarding copyright ownership. @@ -36,7 +36,7 @@ debug = 0 ####################################################################### # If ANT_HOME is not set default to script's parent directory -if os.environ.has_key('ANT_HOME'): +if 'ANT_HOME' in os.environ: ANT_HOME = os.environ['ANT_HOME'] else: ANT_HOME = os.path.dirname(os.path.dirname(os.path.abspath(sys.argv[0]))) @@ -46,17 +46,17 @@ ANT_LIB = os.path.join(ANT_HOME, 'lib') # set JAVACMD (check variables JAVACMD and JAVA_HOME) JAVACMD = None -if not os.environ.has_key('JAVACMD'): - if os.environ.has_key('JAVA_HOME'): +if 'JAVACMD' not in os.environ: + if 'JAVA_HOME' in os.environ: if not os.path.exists(os.environ['JAVA_HOME']): - print "Warning: JAVA_HOME is not defined correctly." + print("Warning: JAVA_HOME is not defined correctly.") else: JAVA_HOME = os.environ['JAVA_HOME'] while JAVA_HOME[0] == JAVA_HOME[-1] == "\"": JAVA_HOME = JAVA_HOME[1:-1] JAVACMD = os.path.join(JAVA_HOME, 'bin', 'java') else: - print "Warning: JAVA_HOME not set." + print("Warning: JAVA_HOME not set.") else: JAVACMD = os.environ['JAVACMD'] if not JAVACMD: @@ -64,28 +64,28 @@ if not JAVACMD: launcher_jar = os.path.join(ANT_LIB, 'ant-launcher.jar') if not os.path.exists(launcher_jar): - print 'Warning: Unable to locate ant-launcher.jar. Expected to find it in %s' % \ - ANT_LIB + print('Warning: Unable to locate ant-launcher.jar. Expected to find it in %s' % \ + ANT_LIB) # Build up standard classpath (LOCALCLASSPATH) LOCALCLASSPATH = launcher_jar -if os.environ.has_key('LOCALCLASSPATH'): +if 'LOCALCLASSPATH' in os.environ: LOCALCLASSPATH += os.pathsep + os.environ['LOCALCLASSPATH'] ANT_OPTS = "" -if os.environ.has_key('ANT_OPTS'): +if 'ANT_OPTS' in os.environ: ANT_OPTS = os.environ['ANT_OPTS'] OPTS = "" -if os.environ.has_key('JIKESPATH'): +if 'JIKESPATH' in os.environ: OPTS = '-Djikes.class.path=\"%s\"' % os.environ['JIKESPATH'] ANT_ARGS = "" -if os.environ.has_key('ANT_ARGS'): +if 'ANT_ARGS' in os.environ: ANT_ARGS = os.environ['ANT_ARGS'] CLASSPATH = "" -if os.environ.has_key('CLASSPATH'): +if 'CLASSPATH' in os.environ: CLASSPATH = "-lib " + os.environ['CLASSPATH'] while JAVACMD[0] == JAVACMD[-1] == "\"": @@ -98,7 +98,7 @@ cmdline = ('"%s" %s -classpath %s -Dant. CLASSPATH, string.join(sys.argv[1:], ' ')) if debug: - print '\n%s\n\n' % (cmdline) + print('\n%s\n\n' % (cmdline)) sys.stdout.flush() # Run the biniou! ++++++ apache-ant-1.9.9-src.tar.bz2 -> apache-ant-1.9.10-src.tar.bz2 ++++++ ++++ 41601 lines of diff (skipped) ++++++ apache-ant-bootstrap.patch ++++++ --- /var/tmp/diff_new_pack.avfNGt/_old 2018-02-25 11:35:09.294319960 +0100 +++ /var/tmp/diff_new_pack.avfNGt/_new 2018-02-25 11:35:09.294319960 +0100 @@ -1,12 +1,13 @@ ---- 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 +Index: apache-ant-1.9.10/bootstrap.sh +=================================================================== +--- apache-ant-1.9.10.orig/bootstrap.sh ++++ apache-ant-1.9.10/bootstrap.sh +@@ -129,7 +129,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 \ + ${TOOLS}/ant/util/regexp/RegexpMatcher.java \ + ${TOOLS}/ant/util/regexp/RegexpMatcherFactory.java \ + ${TOOLS}/ant/property/*.java \ ++++++ apache-ant-class-path-in-manifest.patch ++++++ --- /var/tmp/diff_new_pack.avfNGt/_old 2018-02-25 11:35:09.302319670 +0100 +++ /var/tmp/diff_new_pack.avfNGt/_new 2018-02-25 11:35:09.306319525 +0100 @@ -2,13 +2,13 @@ =================================================================== --- build.xml.orig +++ build.xml -@@ -717,10 +717,6 @@ +@@ -724,10 +724,6 @@ <include name="LICENSE.txt"/> <include name="NOTICE.txt"/> </metainf> - <manifest> - <attribute name="Class-Path" -- value="ant.jar xalan.jar"/> +- value="ant.jar xalan.jar"/> - </manifest> </jar> ++++++ apache-ant-no-test-jar.patch ++++++ --- /var/tmp/diff_new_pack.avfNGt/_old 2018-02-25 11:35:09.314319234 +0100 +++ /var/tmp/diff_new_pack.avfNGt/_new 2018-02-25 11:35:09.314319234 +0100 @@ -2,16 +2,16 @@ build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: apache-ant-1.9.2/build.xml +Index: apache-ant-1.9.10/build.xml =================================================================== ---- apache-ant-1.9.2.orig/build.xml -+++ apache-ant-1.9.2/build.xml -@@ -873,7 +873,7 @@ +--- apache-ant-1.9.10.orig/build.xml ++++ apache-ant-1.9.10/build.xml +@@ -878,7 +878,7 @@ + Create the essential distribution that can run Apache Ant =================================================================== --> - <target name="dist-lite" -- depends="jars,test-jar" -+ depends="jars" - description="--> creates a minimum distribution to run Apache Ant"> +- <target name="dist-lite" depends="jars,test-jar" ++ <target name="dist-lite" depends="jars" + description="--> creates a minimum distribution to run Apache Ant"> <mkdir dir="${dist.dir}"/>
