Hello community, here is the log from the commit of package dom4j for openSUSE:Factory checked in at 2017-09-13 22:24:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dom4j (Old) and /work/SRC/openSUSE:Factory/.dom4j.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dom4j" Wed Sep 13 22:24:42 2017 rev:19 rq:523086 version:1.6.1 Changes: -------- --- /work/SRC/openSUSE:Factory/dom4j/dom4j.changes 2017-05-31 13:28:49.288147402 +0200 +++ /work/SRC/openSUSE:Factory/.dom4j.new/dom4j.changes 2017-09-13 22:24:47.602418555 +0200 @@ -1,0 +2,8 @@ +Fri Sep 8 05:47:14 UTC 2017 - [email protected] + +- Added patch: + * dom4j-sourcetarget.patch + + Use java source and target level 1.6 in order to allow + building with jdk9 + +------------------------------------------------------------------- New: ---- dom4j-sourcetarget.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dom4j.spec ++++++ --- /var/tmp/diff_new_pack.JnQZtj/_old 2017-09-13 22:24:48.306319460 +0200 +++ /var/tmp/diff_new_pack.JnQZtj/_new 2017-09-13 22:24:48.310318897 +0200 @@ -35,12 +35,13 @@ Source1: dom4j_rundemo.sh Source2: http://repo1.maven.org/maven2/dom4j/dom4j/1.6.1/dom4j-1.6.1.pom Patch0: dom4j-1.6.1-bug1618750.patch +Patch1: dom4j-sourcetarget.patch BuildRequires: ant >= 1.6.5 BuildRequires: ant-apache-resolver BuildRequires: ant-junit BuildRequires: bea-stax BuildRequires: isorelax -BuildRequires: java-devel >= 1.5.0 +BuildRequires: java-devel >= 1.6 # Needed for maven conversions BuildRequires: javapackages-local BuildRequires: javapackages-tools @@ -57,7 +58,7 @@ BuildRequires: xpp3 Requires: bea-stax Requires: isorelax -Requires: java >= 1.5.0 +Requires: java >= 1.6.0 Requires: jaxen >= 1.1 Requires: relaxngDatatype Requires: stax_1_0_api @@ -125,14 +126,12 @@ # FIXME: (yyang): failed in JDK6, maybe failed to load russArticle.xml because it's russian encoding rm -f src/test/org/dom4j/io/StaxTest.java %patch0 -p1 -b .bug1618750 +%patch1 -p1 -b .sourcetarget perl -pi -e 's/\r//g' LICENSE.txt docs/clover/*.css docs/style/*.css docs/xref/*.css docs/xref-test/*.css src/doc/style/*.css docs/benchmarks/xpath/*.java pushd lib ln -sf $(build-classpath xpp2) ln -sf $(build-classpath relaxngDatatype) -pushd endorsed -#ln -sf $(build-classpath jaxp12) -popd ln -sf $(build-classpath jaxme/jaxmeapi) #ln -sf $(build-classpath msv-xsdlib) #ln -sf $(build-classpath msv-msv) @@ -157,12 +156,10 @@ popd %build -export CLASSPATH= +export CLASSPATH=$(build-classpath jaxen relaxngDatatype xpp3 xpp2) export OPT_JAR_LIST="junit ant/ant-junit" -#ant package test release-javadoc +rm -rf src/java/org/dom4j/datatype ant package release-javadoc -#export CLASSPATH=`pwd`/dom4j-1.6.1.jar:$(build-classpath xpp2) -#ant samples %install # jars ++++++ dom4j-sourcetarget.patch ++++++ --- dom4j/build.xml 2009-05-12 15:04:18.000000000 +0200 +++ dom4j/build.xml 2017-09-11 13:36:05.252661089 +0200 @@ -142,8 +142,8 @@ destdir="${build.dest}" debug="${debug}" optimize="${optimize}" - target="1.3" - source="1.3" + target="1.6" + source="1.6" deprecation="${deprecation}" classpathref="compile.classpath"> <exclude name="org/dom4j/datatype/**"/> @@ -195,6 +195,7 @@ <mkdir dir="${build.javadocs}"/> <javadoc packagenames="${packages}" sourcepath="${build.src}" + source="1.6" destdir="${build.javadocs}" author="true" version="true" @@ -214,6 +215,7 @@ <mkdir dir="${build.javadocs}"/> <javadoc packagenames="${packages}" sourcepath="${build.src}" + source="1.6" destdir="${build.javadocs}" author="true" version="true" @@ -230,6 +232,7 @@ <mkdir dir="${build.apidocs}"/> <javadoc packagenames="${api.packages}" sourcepath="${build.src}" + source="1.6" destdir="${build.apidocs}" author="true" version="true"
