Hello community, here is the log from the commit of package jdom for openSUSE:Factory checked in at 2017-10-06 10:54:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jdom (Old) and /work/SRC/openSUSE:Factory/.jdom.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jdom" Fri Oct 6 10:54:20 2017 rev:22 rq:530251 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/jdom/jdom.changes 2017-09-17 22:36:22.401150157 +0200 +++ /work/SRC/openSUSE:Factory/.jdom.new/jdom.changes 2017-10-06 10:54:21.907757276 +0200 @@ -1,0 +2,10 @@ +Fri Sep 29 06:37:03 UTC 2017 - [email protected] + +- Fix build with jdk9: specify java source and target level 1.6 +- Modified patch: + * jdom-1.1-build.xml.patch + + specify java source and target level 1.6 +- Add more BuildRequires, in order to build more java files in + stage 1 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jdom.spec ++++++ --- /var/tmp/diff_new_pack.KPh1S9/_old 2017-10-06 10:54:22.723633965 +0200 +++ /var/tmp/diff_new_pack.KPh1S9/_new 2017-10-06 10:54:22.727633360 +0200 @@ -56,22 +56,16 @@ Patch2: jdom-1.1-xom-get-jaxen.patch BuildRequires: ant BuildRequires: ant-junit -BuildRequires: java-1_5_0-gcj-compat-devel +BuildRequires: java-devel BuildRequires: junit +BuildRequires: relaxngDatatype BuildRequires: servletapi5 BuildRequires: unzip BuildRequires: xalan-j2 BuildRequires: xerces-j2 -#!BuildIgnore: java-1_6_0-openjdk -#!BuildIgnore: java-1_6_0-openjdk-devel -#!BuildIgnore: java-1_7_0-openjdk -#!BuildIgnore: java-1_7_0-openjdk-devel -#!BuildIgnore: java-1_8_0-openjdk -#!BuildIgnore: java-1_8_0-openjdk-devel -#!BuildIgnore: java-9-openjdk -#!BuildIgnore: java-9-openjdk-devel +BuildRequires: xpp2 +BuildRequires: xpp3 BuildArch: noarch -BuildConflicts: java-devel >= 1.9 %description JDOM is, quite simply, a Java representation of an XML document. JDOM @@ -162,11 +156,11 @@ %patch2 %build -export JAVA_OPTS="-source 1.5 -target 1.5 -J-Xss4m" +export JAVA_OPTS="-source 1.6 -target 1.6 -encoding UTF-8 -J-Xss4m" export JAVAC="javac ${JAVA_OPTS} " export ANT_OPTS="-Xss4m" i=0 -export CLASSPATH="%{stage1_build_dir}:$(build-classpath $LIBGCJ xerces-j2 xalan-j2 xalan-j2-serializer junit servletapi5):%{jaxen_dir}/src/java/main/:%{jdom_dir}/src/java/:%{saxpath_dir}/src/java/main/:%{xom_dir}/src/:%{dom4j_dir}/src/java" +export CLASSPATH="%{stage1_build_dir}:$(build-classpath $LIBGCJ xerces-j2 xalan-j2 xalan-j2-serializer junit relaxngDatatype servletapi5 xpp2 xpp3):%{jaxen_dir}/src/java/main/:%{jdom_dir}/src/java/:%{saxpath_dir}/src/java/main/:%{xom_dir}/src/:%{dom4j_dir}/src/java" SOURCE_DIRS="%{jaxen_dir}/src/java/main/ %{jdom_dir}/src/java/ %{saxpath_dir}/src/java/main/ %{xom_dir}/src/ %{dom4j_dir}/src/java" MAX=$(find ${SOURCE_DIRS} -iname "*.java" | wc -l) for file in $(find ${SOURCE_DIRS} -name "*.java") @@ -182,7 +176,7 @@ -Dxml-apis.jar=$(build-classpath xml-commons-apis) \ -Dglibj.jar=$(build-classpath glibj) \ -Djaxen.lib.dir=%{stage1_build_dir} \ - -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \ + -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \ package mv build/jdom.jar %{_builddir}/jdom-%{jdom_version}.jar popd ++++++ jdom-1.1-build.xml.patch ++++++ --- /var/tmp/diff_new_pack.KPh1S9/_old 2017-10-06 10:54:22.767627316 +0200 +++ /var/tmp/diff_new_pack.KPh1S9/_new 2017-10-06 10:54:22.767627316 +0200 @@ -6,8 +6,8 @@ <property name="compile.optimize" value="true" /> - <property name="compile.target" value="1.2" /> - <property name="compile.source" value="1.2" /> -+ <property name="compile.target" value="1.5" /> -+ <property name="compile.source" value="1.5" /> ++ <property name="compile.target" value="1.6" /> ++ <property name="compile.source" value="1.6" /> <property name="compile.deprecation" value="true" /> <property name="src.dir" value="./src/java"/> @@ -19,3 +19,60 @@ <fileset dir="${jaxen.lib.dir}"> <include name="jaxen-*.jar"/> +--- XOM/build.xml ++++ XOM/build.xml +@@ -201,8 +201,8 @@ + debug="${debug}" + optimize="${optimize}" + deprecation="${deprecation}" +- target="1.2" +- source="1.3" ++ target="1.6" ++ source="1.6" + encoding="UTF-8" + excludes="nu/xom/pantry/* nu/xom/tools/* nu/xom/samples/*Servlet.java"> + <classpath refid="compile.class.path"/> +@@ -228,8 +228,8 @@ + debug="${debug}" + optimize="${optimize}" + deprecation="${deprecation}" +- target="1.2" +- source="1.3" ++ target="1.6" ++ source="1.6" + encoding="UTF-8"> + <classpath refid="compile.class.path"/> + <include name="nu/xom/samples/*Servlet.java" /> +@@ -244,8 +244,8 @@ + debug="${debug}" + optimize="${optimize}" + deprecation="${deprecation}" +- target="1.2" +- source="1.3" ++ target="1.6" ++ source="1.6" + encoding="UTF-8" + failonerror="false"> + <classpath refid="compile.class.path"/> +@@ -462,8 +462,8 @@ + debug="${debug}" + optimize="${optimize}" + deprecation="${deprecation}" +- target="1.2" +- source="1.3" ++ target="1.6" ++ source="1.6" + encoding="UTF-8" + includes="nu/xom/tools/*"> + <classpath> +@@ -705,8 +705,8 @@ + debug="${debug}" + optimize="${optimize}" + deprecation="${deprecation}" +- target="1.2" +- source="1.3" ++ target="1.6" ++ source="1.6" + encoding="UTF-8" + includeAntRuntime="no" + excludes="org/jaxen/dom/**
