pool/dom4j
SHA256
5
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 962501 from Java:packages

Browse Source 
build against standalone jaxb-api

OBS-URL: https://build.opensuse.org/request/show/962501
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dom4j?expand=0&rev=24
This commit is contained in:
Dominique Leuenberger 2022-03-28 14:58:55 +00:00 committed by Git OBS Bridge
commit 51ac0f0b40
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dom4j.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Mar 17 15:40:13 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Add jaxb-api dependency for relevant distribution versions so that
we can build with JDKs that do not include the JavaEE modules
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Apr 17 12:04:59 UTC 2020 - Pedro Monreal Gonzalez <pmonrealgonzalez@suse.com> Fri Apr 17 12:04:59 UTC 2020 - Pedro Monreal Gonzalez <pmonrealgonzalez@suse.com>

23
dom4j.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package dom4j # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -22,7 +22,7 @@ Release: 0
Summary: JarJar of dom4j for JBoss Summary: JarJar of dom4j for JBoss
License: Apache-1.1 License: Apache-1.1
Group: Development/Libraries/Java Group: Development/Libraries/Java
URL: http://www.dom4j.org/ URL: https://www.dom4j.org/
#Source0: dom4j-1.6.1.tar.gz #Source0: dom4j-1.6.1.tar.gz
# Debian sources don't need a proprietary msv for build, so that's why I used them # 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 # svn co svn://svn.debian.org/svn/pkg-java/trunk/dom4j
@ -77,9 +77,12 @@ Requires: xpp2
Requires: xpp3 Requires: xpp3
#Requires: jaxp = 1.2 #Requires: jaxp = 1.2
Requires(post): javapackages-tools Requires(post): javapackages-tools
Requires(postun): javapackages-tools Requires(postun):javapackages-tools
BuildRoot: %{_tmppath}/%{name}-%{version}-build
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
@ -122,6 +125,10 @@ DOM, SAX and JAXP and is seamlessly integrated with full XPath support.
%setup -q -n %{name} %setup -q -n %{name}
# replace run.sh # replace run.sh
cp %{SOURCE1} 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 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
@ -168,7 +175,11 @@ popd
popd popd
%build %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" export OPT_JAR_LIST="junit ant/ant-junit"
rm -rf src/java/org/dom4j/datatype rm -rf src/java/org/dom4j/datatype
ant package release-javadoc ant package release-javadoc
@ -181,7 +192,7 @@ 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) (cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
mkdir -p %{buildroot}/%{_mavenpomdir} 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 %add_maven_depmap
# javadoc # javadoc