Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package jdom for openSUSE:Factory checked in
at 2022-03-28 16:59:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/jdom (Old)
and /work/SRC/openSUSE:Factory/.jdom.new.1900 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jdom"
Mon Mar 28 16:59:08 2022 rev:29 rq:962935 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/jdom/jdom.changes 2022-03-05
14:44:14.215713332 +0100
+++ /work/SRC/openSUSE:Factory/.jdom.new.1900/jdom.changes 2022-03-28
16:59:44.504902582 +0200
@@ -1,0 +2,13 @@
+Fri Mar 18 19:12:10 UTC 2022 - Fridrich Strba <fst...@suse.com>
+
+- Modified patch:
+ * jdom-1.1-build.xml.patch
+ + Build with source/target levels 8
+
+-------------------------------------------------------------------
+Thu Mar 17 15:50:20 UTC 2022 - Fridrich Strba <fst...@suse.com>
+
+- Build against standalone jaxb-api on distributions that have
+ JDK without the JavaEE modules
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ jdom.spec ++++++
--- /var/tmp/diff_new_pack.TJoEZ9/_old 2022-03-28 16:59:45.104903397 +0200
+++ /var/tmp/diff_new_pack.TJoEZ9/_new 2022-03-28 16:59:45.108903403 +0200
@@ -60,7 +60,7 @@
Patch2: jdom-1.1-xom-get-jaxen.patch
BuildRequires: ant
BuildRequires: ant-junit
-BuildRequires: java-devel
+BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local
BuildRequires: junit
BuildRequires: relaxngDatatype
@@ -73,6 +73,9 @@
Requires: mvn(jaxen:jaxen)
Requires: mvn(xerces:xercesImpl)
BuildArch: noarch
+%if 0%{?suse_version} > 1500
+BuildRequires: glassfish-jaxb-api
+%endif
%description
JDOM is, quite simply, a Java representation of an XML document. JDOM
@@ -147,13 +150,13 @@
Summary: The jaxen project is a Java XPath Engine
License: Apache-2.0
Group: Development/Libraries/Java
-Provides: jaxen-bootstrap = %{version}
-Obsoletes: jaxen-bootstrap < %{version}
Requires: mvn(dom4j:dom4j)
Requires: mvn(jdom:jdom)
Requires: mvn(xerces:xercesImpl)
Requires: mvn(xml-apis:xml-apis)
Requires: mvn(xom:xom)
+Provides: jaxen-bootstrap = %{version}
+Obsoletes: jaxen-bootstrap < %{version}
%description -n jaxen
Jaxen is a universal object model walker, capable of evaluating XPath
@@ -178,11 +181,15 @@
%pom_remove_parent jaxen-%{jaxen_version}.pom
%build
-export JAVA_OPTS="-source 1.6 -target 1.6 -encoding UTF-8 -J-Xss6m"
+export JAVA_OPTS="-source 1.8 -target 1.8 -encoding UTF-8 -J-Xss6m"
export JAVAC="javac ${JAVA_OPTS} "
export ANT_OPTS="-Xss6m"
i=0
-CLASSPATH="%{stage1_build_dir}:$(build-classpath xerces-j2 xalan-j2
xalan-j2-serializer junit relaxngDatatype servletapi5 xpp2 xpp3)"
+CLASSPATH="%{stage1_build_dir}:$(build-classpath \
+%if 0%{?suse_version} > 1500
+ glassfish-jaxb-api \
+%endif
+ xerces-j2 xalan-j2 xalan-j2-serializer junit relaxngDatatype servletapi5
xpp2 xpp3)"
SOURCE_DIRS="%{jaxen_dir}/src/java/main/ %{jdom_dir}/src/java/
%{saxpath_dir}/src/java/main/ %{xom_dir}/src/ %{dom4j_dir}/src/java"
SOURCE_PATH=$(echo ${SOURCE_DIRS} | sed 's#\ #:#g')
# Failing files
@@ -204,8 +211,8 @@
ant -Dparser.jar=$(build-classpath xerces-j2) \
-Dxml-apis.jar=$(build-classpath xml-commons-apis) \
-Djaxen.lib.dir=%{jdom_dir} \
- -Dcompile.source=1.6 -Dcompile.target=1.6 \
- -Dversion=%jdom_version \
+ -Dcompile.source=1.8 -Dcompile.target=1.8 \
+ -Dversion=%{jdom_version} \
package
mv build/jdom-%{jdom_version}.jar %{_builddir}/jdom-%{jdom_version}.jar
rm jaxen.jar
@@ -224,7 +231,7 @@
mv build/saxpath.jar %{_builddir}/saxpath-%{saxpath_version}.jar
popd
pushd %{xom_dir}
-ant \
+%ant \
-Djaxen.dir=%{stage1_build_dir} \
-Dxml-apis.jar=$(build-classpath xml-commons-apis) \
-Dparser.jar=$(build-classpath xerces-j2) \
@@ -233,7 +240,7 @@
-Djunit.jar=$(build-classpath junit) \
-Dresolver.jar=$(build-classpath xml-commons-resolver) \
-Ddom4j.jar=%{stage1_build_dir} \
--Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \
+-Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 \
compile compile15 jar
mv build/xom-%{xom_version}.jar %{_builddir}
popd
++++++ jdom-1.1-build.xml.patch ++++++
--- /var/tmp/diff_new_pack.TJoEZ9/_old 2022-03-28 16:59:45.176903495 +0200
+++ /var/tmp/diff_new_pack.TJoEZ9/_new 2022-03-28 16:59:45.180903500 +0200
@@ -6,8 +6,8 @@
deprecation="${deprecation}"
- target="1.2"
- source="1.3"
-+ target="1.6"
-+ source="1.6"
++ target="1.8"
++ source="1.8"
encoding="UTF-8"
excludes="nu/xom/pantry/* nu/xom/tools/*
nu/xom/samples/*Servlet.java">
<classpath refid="compile.class.path"/>
@@ -17,8 +17,8 @@
deprecation="${deprecation}"
- target="1.2"
- source="1.3"
-+ target="1.6"
-+ source="1.6"
++ target="1.8"
++ source="1.8"
encoding="UTF-8">
<classpath refid="compile.class.path"/>
<include name="nu/xom/samples/*Servlet.java" />
@@ -28,8 +28,8 @@
deprecation="${deprecation}"
- target="1.2"
- source="1.3"
-+ target="1.6"
-+ source="1.6"
++ target="1.8"
++ source="1.8"
encoding="UTF-8"
failonerror="false">
<classpath refid="compile.class.path"/>
@@ -39,8 +39,8 @@
deprecation="${deprecation}"
- target="1.2"
- source="1.3"
-+ target="1.6"
-+ source="1.6"
++ target="1.8"
++ source="1.8"
encoding="UTF-8"
includes="nu/xom/tools/*">
<classpath>
@@ -50,8 +50,8 @@
deprecation="${deprecation}"
- target="1.2"
- source="1.3"
-+ target="1.6"
-+ source="1.6"
++ target="1.8"
++ source="1.8"
encoding="UTF-8"
includeAntRuntime="no"
excludes="org/jaxen/dom/**
