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-04-02 18:20:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dom4j (Old) and /work/SRC/openSUSE:Factory/.dom4j.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dom4j" Sat Apr 2 18:20:39 2022 rev:25 rq:965872 version:1.6.1 Changes: -------- --- /work/SRC/openSUSE:Factory/dom4j/dom4j.changes 2022-03-28 16:59:25.828877211 +0200 +++ /work/SRC/openSUSE:Factory/.dom4j.new.1900/dom4j.changes 2022-04-02 18:20:51.454061592 +0200 @@ -1,0 +2,11 @@ +Wed Mar 30 09:56:14 UTC 2022 - Fridrich Strba <[email protected]> + +- Build against the standalone JavaEE modules inconditionally + +------------------------------------------------------------------- +Mon Mar 28 13:50:07 UTC 2022 - Fridrich Strba <[email protected]> + +- Add alias to the new artifact coordinates org.dom4j:dom4j +- Simplify the spec file a bit + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dom4j.spec ++++++ --- /var/tmp/diff_new_pack.lrP9kM/_old 2022-04-02 18:20:51.954055979 +0200 +++ /var/tmp/diff_new_pack.lrP9kM/_new 2022-04-02 18:20:51.962055890 +0200 @@ -33,7 +33,7 @@ # tar --exclude-vcs -cjf dom4j-1.6.1-debian.tar.bz2 dom4j/ Source0: dom4j-1.6.1-debian.tar.bz2 Source1: dom4j_rundemo.sh -Source2: http://repo1.maven.org/maven2/dom4j/dom4j/1.6.1/dom4j-1.6.1.pom +Source2: https://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 Patch2: dom4j-javadoc.patch @@ -48,6 +48,7 @@ BuildRequires: ant-junit BuildRequires: bea-stax BuildRequires: fdupes +BuildRequires: glassfish-jaxb-api BuildRequires: isorelax BuildRequires: java-devel >= 1.6 # Needed for maven conversions @@ -65,6 +66,7 @@ BuildRequires: xpp2 BuildRequires: xpp3 Requires: bea-stax +Requires: glassfish-jaxb-api Requires: isorelax Requires: java >= 1.6.0 Requires: jaxen >= 1.1 @@ -79,10 +81,6 @@ Requires(post): javapackages-tools 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 @@ -126,9 +124,8 @@ # 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 @@ -176,9 +173,7 @@ %build 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 @@ -188,12 +183,11 @@ # jars install -d -m 755 %{buildroot}%{_javadir} install -d -m 755 %{buildroot}%{_datadir}/maven2/poms -cp -p build/%{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar -(cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) +cp -p build/%{name}.jar %{buildroot}%{_javadir}/%{name}.jar mkdir -p %{buildroot}/%{_mavenpomdir} install -m 644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP-%{name}.pom -%add_maven_depmap +%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "org.dom4j:dom4j" # javadoc mkdir -p %{buildroot}%{_javadocdir}/%{name} @@ -213,13 +207,8 @@ %fdupes -s %{buildroot}%{_docdir}/%{name}-%{version} %fdupes -s %{buildroot}%{_datadir}/%{name} -%files -%defattr(0644,root,root,0755) +%files -f .mfiles %license LICENSE.txt -%{_javadir}/%{name}.jar -%{_javadir}/%{name}-%{version}.jar -%{_mavenpomdir}/* -%{_datadir}/maven-metadata/%{name}.xml* %files javadoc %defattr(0644,root,root,0755)
