Hello community, here is the log from the commit of package netbeans-resolver for openSUSE:Factory checked in at 2017-09-20 17:12:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/netbeans-resolver (Old) and /work/SRC/openSUSE:Factory/.netbeans-resolver.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "netbeans-resolver" Wed Sep 20 17:12:50 2017 rev:15 rq:527344 version:6.7.1 Changes: -------- --- /work/SRC/openSUSE:Factory/netbeans-resolver/netbeans-resolver.changes 2013-09-12 17:04:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.netbeans-resolver.new/netbeans-resolver.changes 2017-09-20 17:12:58.919097170 +0200 @@ -1,0 +2,11 @@ +Tue Sep 19 15:16:33 UTC 2017 - [email protected] + +- Modified patch: + * netbeans-resolver-6.7.1-resolver.patch + + Don't hardcode source 1.4, since we are specifying the level + on command-line + + Rename enum -> emun to avoid clash with reserved word in + java 5 +- Fix build with jdk9: specify source and target level 1.6 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ netbeans-resolver.spec ++++++ --- /var/tmp/diff_new_pack.EH1llV/_old 2017-09-20 17:12:59.603000897 +0200 +++ /var/tmp/diff_new_pack.EH1llV/_new 2017-09-20 17:12:59.607000334 +0200 @@ -1,7 +1,7 @@ # # spec file for package netbeans-resolver # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -62,7 +62,10 @@ dos2unix -k LICENSE.resolver.txt %build -%{ant} -f resolver.xml jar +%{ant} \ + -f resolver.xml \ + -Djavac.target=1.6 -Djavac.source=1.6 \ + jar %install ++++++ netbeans-resolver-6.7.1-resolver.patch ++++++ --- /var/tmp/diff_new_pack.EH1llV/_old 2017-09-20 17:12:59.634996393 +0200 +++ /var/tmp/diff_new_pack.EH1llV/_new 2017-09-20 17:12:59.638995830 +0200 @@ -1,15 +1,3 @@ -diff -Nur xml-commons-resolver-1.2/resolver.xml xml-commons-resolver-1.2.new/resolver.xml ---- xml-commons-resolver-1.2/resolver.xml 2006-11-20 15:23:08.000000000 +0300 -+++ xml-commons-resolver-1.2.new/resolver.xml 2009-08-12 01:21:03.000000000 +0400 -@@ -88,7 +88,7 @@ - - <echo message="Compiling..." /> - -- <javac srcdir="${src.dir}" destdir="${build.classes.dir}" debug="true" optimize="true" deprecation="true" verbose="false"> -+ <javac srcdir="${src.dir}" destdir="${build.classes.dir}" debug="true" optimize="true" deprecation="true" verbose="false" source="1.4" > - <!-- <classpath> not needed since Ant already supplies these Sep-03 -sc --> - <include name="${resolver.subdir}/*.java"/> - <include name="${resolver.subdir}/helpers/*.java"/> diff -Nur xml-commons-resolver-1.2/src/org/apache/xml/resolver/Catalog.java xml-commons-resolver-1.2.new/src/org/apache/xml/resolver/Catalog.java --- xml-commons-resolver-1.2/src/org/apache/xml/resolver/Catalog.java 2006-11-20 15:23:08.000000000 +0300 +++ xml-commons-resolver-1.2.new/src/org/apache/xml/resolver/Catalog.java 2009-08-12 01:44:32.000000000 +0400 @@ -30,10 +18,10 @@ + */ + public Iterator getPublicIDs() { + Vector v = new Vector(); -+ Enumeration enum = catalogEntries.elements(); ++ Enumeration emun = catalogEntries.elements(); + -+ while (enum.hasMoreElements()) { -+ CatalogEntry e = (CatalogEntry) enum.nextElement(); ++ while (emun.hasMoreElements()) { ++ CatalogEntry e = (CatalogEntry) emun.nextElement(); + if (e.getEntryType() == PUBLIC) { + v.add(e.getEntryArg(0)); + }
