Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package dom4j for openSUSE:Factory checked in at 2022-03-28 16:58:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dom4j (Old) and /work/SRC/openSUSE:Factory/.dom4j.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dom4j" Mon Mar 28 16:58:55 2022 rev:24 rq:962501 version:1.6.1 Changes: -------- --- /work/SRC/openSUSE:Factory/dom4j/dom4j.changes 2020-04-29 20:43:25.443805601 +0200 +++ /work/SRC/openSUSE:Factory/.dom4j.new.1900/dom4j.changes 2022-03-28 16:59:25.828877211 +0200 @@ -1,0 +2,6 @@ +Thu Mar 17 15:40:13 UTC 2022 - Fridrich Strba <fst...@suse.com> + +- Add jaxb-api dependency for relevant distribution versions so that + we can build with JDKs that do not include the JavaEE modules + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dom4j.spec ++++++ --- /var/tmp/diff_new_pack.buknDl/_old 2022-03-28 16:59:26.300877852 +0200 +++ /var/tmp/diff_new_pack.buknDl/_new 2022-03-28 16:59:26.304877857 +0200 @@ -1,7 +1,7 @@ # # spec file for package dom4j # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ Summary: JarJar of dom4j for JBoss License: Apache-1.1 Group: Development/Libraries/Java -URL: http://www.dom4j.org/ +URL: https://www.dom4j.org/ #Source0: dom4j-1.6.1.tar.gz # Debian sources don't need a proprietary msv for build, so that's why I used them # svn co svn://svn.debian.org/svn/pkg-java/trunk/dom4j @@ -77,9 +77,12 @@ Requires: xpp3 #Requires: jaxp = 1.2 Requires(post): javapackages-tools -Requires(postun): javapackages-tools -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires(postun):javapackages-tools BuildArch: noarch +%if 0%{?suse_version} > 1500 +BuildRequires: glassfish-jaxb-api +Requires: glassfish-jaxb-api +%endif %description dom4j is an easy to use Open Source XML, XPath and XSLT framework for @@ -122,6 +125,10 @@ %setup -q -n %{name} # replace run.sh cp %{SOURCE1} run.sh +cp %{SOURCE2} pom.xml +%if 0%{?suse_version} > 1500 +%pom_add_dep javax.xml.bind:jaxb-api pom.xml "<optional>true</optional>" +%endif rm -f src/test/org/dom4j/xpath/MatrixConcatTest.java # won't succeed in headless environment rm src/test/org/dom4j/bean/BeansTest.java @@ -168,7 +175,11 @@ popd %build -export CLASSPATH=$(build-classpath jaxen relaxngDatatype xpp3 xpp2) +export CLASSPATH=$(build-classpath \ +%if 0%{?suse_version} > 1500 + glassfish-jaxb-api \ +%endif + jaxen relaxngDatatype xpp3 xpp2) export OPT_JAR_LIST="junit ant/ant-junit" rm -rf src/java/org/dom4j/datatype ant package release-javadoc @@ -181,7 +192,7 @@ (cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) mkdir -p %{buildroot}/%{_mavenpomdir} -install -m 644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-%{name}.pom +install -m 644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP-%{name}.pom %add_maven_depmap # javadoc
