This commit is contained in:
parent
9802ac49dc
commit
707669e0f0
@ -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>
|
Mon Mar 28 13:50:07 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
11
dom4j.spec
11
dom4j.spec
@ -48,6 +48,7 @@ BuildRequires: ant-apache-resolver
|
|||||||
BuildRequires: ant-junit
|
BuildRequires: ant-junit
|
||||||
BuildRequires: bea-stax
|
BuildRequires: bea-stax
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
|
BuildRequires: glassfish-jaxb-api
|
||||||
BuildRequires: isorelax
|
BuildRequires: isorelax
|
||||||
BuildRequires: java-devel >= 1.6
|
BuildRequires: java-devel >= 1.6
|
||||||
# Needed for maven conversions
|
# Needed for maven conversions
|
||||||
@ -65,6 +66,7 @@ BuildRequires: xerces-j2
|
|||||||
BuildRequires: xpp2
|
BuildRequires: xpp2
|
||||||
BuildRequires: xpp3
|
BuildRequires: xpp3
|
||||||
Requires: bea-stax
|
Requires: bea-stax
|
||||||
|
Requires: glassfish-jaxb-api
|
||||||
Requires: isorelax
|
Requires: isorelax
|
||||||
Requires: java >= 1.6.0
|
Requires: java >= 1.6.0
|
||||||
Requires: jaxen >= 1.1
|
Requires: jaxen >= 1.1
|
||||||
@ -79,10 +81,6 @@ Requires: xpp3
|
|||||||
Requires(post): javapackages-tools
|
Requires(post): javapackages-tools
|
||||||
Requires(postun):javapackages-tools
|
Requires(postun):javapackages-tools
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
%if 0%{?suse_version} > 1500
|
|
||||||
BuildRequires: glassfish-jaxb-api
|
|
||||||
Requires: glassfish-jaxb-api
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
dom4j is an easy to use Open Source XML, XPath and XSLT framework for
|
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
|
# replace run.sh
|
||||||
cp %{SOURCE1} run.sh
|
cp %{SOURCE1} run.sh
|
||||||
cp %{SOURCE2} pom.xml
|
cp %{SOURCE2} pom.xml
|
||||||
%if 0%{?suse_version} > 1500
|
|
||||||
%pom_add_dep javax.xml.bind:jaxb-api pom.xml "<optional>true</optional>"
|
%pom_add_dep javax.xml.bind:jaxb-api pom.xml "<optional>true</optional>"
|
||||||
%endif
|
|
||||||
rm -f src/test/org/dom4j/xpath/MatrixConcatTest.java
|
rm -f src/test/org/dom4j/xpath/MatrixConcatTest.java
|
||||||
# won't succeed in headless environment
|
# won't succeed in headless environment
|
||||||
rm src/test/org/dom4j/bean/BeansTest.java
|
rm src/test/org/dom4j/bean/BeansTest.java
|
||||||
@ -176,9 +173,7 @@ popd
|
|||||||
|
|
||||||
%build
|
%build
|
||||||
export CLASSPATH=$(build-classpath \
|
export CLASSPATH=$(build-classpath \
|
||||||
%if 0%{?suse_version} > 1500
|
|
||||||
glassfish-jaxb-api \
|
glassfish-jaxb-api \
|
||||||
%endif
|
|
||||||
jaxen relaxngDatatype xpp3 xpp2)
|
jaxen relaxngDatatype xpp3 xpp2)
|
||||||
export OPT_JAR_LIST="junit ant/ant-junit"
|
export OPT_JAR_LIST="junit ant/ant-junit"
|
||||||
rm -rf src/java/org/dom4j/datatype
|
rm -rf src/java/org/dom4j/datatype
|
||||||
|
Loading…
Reference in New Issue
Block a user