From 707669e0f06626eac267e5c820300b5a0d3d2b44332f8177495ef016b14b0b05 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Wed, 30 Mar 2022 09:56:28 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/dom4j?expand=0&rev=35

---
 dom4j.changes |  5 +++++
 dom4j.spec    | 11 +++--------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dom4j.changes b/dom4j.changes
index 7397d29..985fb07 100644
--- a/dom4j.changes
+++ b/dom4j.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Mar 30 09:56:14 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Build against the standalone JavaEE modules inconditionally
+
 -------------------------------------------------------------------
 Mon Mar 28 13:50:07 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/dom4j.spec b/dom4j.spec
index 944ee2b..ed9393c 100644
--- a/dom4j.spec
+++ b/dom4j.spec
@@ -48,6 +48,7 @@ BuildRequires:  ant-apache-resolver
 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:  xerces-j2
 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:       xpp3
 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 @@ DOM, SAX and JAXP and is seamlessly integrated with full XPath support.
 # 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 @@ popd
 
 %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