pool/jdom
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/jdom?expand=0&rev=56

Browse Source
This commit is contained in:
Fridrich Strba 2022-03-17 15:51:20 +00:00 committed by Git OBS Bridge
parent f6f9c8ed48
commit b47791ef13
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jdom.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Mar 17 15:50:20 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Build against standalone jaxb-api on distributions that have
JDK without the JavaEE modules
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Mar 2 06:26:31 UTC 2022 - Fridrich Strba <fstrba@suse.com> Wed Mar 2 06:26:31 UTC 2022 - Fridrich Strba <fstrba@suse.com>

16
jdom.spec
View File

@ -60,7 +60,6 @@ Patch1: jdom-1.1-OSGiManifest.patch
Patch2: jdom-1.1-xom-get-jaxen.patch Patch2: jdom-1.1-xom-get-jaxen.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: ant-junit BuildRequires: ant-junit
BuildRequires: glassfish-jaxb-api
BuildRequires: java-devel BuildRequires: java-devel
BuildRequires: javapackages-local BuildRequires: javapackages-local
BuildRequires: junit BuildRequires: junit
@ -74,6 +73,9 @@ BuildRequires: xpp3
Requires: mvn(jaxen:jaxen) Requires: mvn(jaxen:jaxen)
Requires: mvn(xerces:xercesImpl) Requires: mvn(xerces:xercesImpl)
BuildArch: noarch BuildArch: noarch
%if 0%{?suse_version} > 1500
BuildRequires: glassfish-jaxb-api
%endif
%description %description
JDOM is, quite simply, a Java representation of an XML document. JDOM JDOM is, quite simply, a Java representation of an XML document. JDOM
@ -148,13 +150,13 @@ Release: 0
Summary: The jaxen project is a Java XPath Engine Summary: The jaxen project is a Java XPath Engine
License: Apache-2.0 License: Apache-2.0
Group: Development/Libraries/Java Group: Development/Libraries/Java
Provides: jaxen-bootstrap = %{version}
Obsoletes: jaxen-bootstrap < %{version}
Requires: mvn(dom4j:dom4j) Requires: mvn(dom4j:dom4j)
Requires: mvn(jdom:jdom) Requires: mvn(jdom:jdom)
Requires: mvn(xerces:xercesImpl) Requires: mvn(xerces:xercesImpl)
Requires: mvn(xml-apis:xml-apis) Requires: mvn(xml-apis:xml-apis)
Requires: mvn(xom:xom) Requires: mvn(xom:xom)
Provides: jaxen-bootstrap = %{version}
Obsoletes: jaxen-bootstrap < %{version}
%description -n jaxen %description -n jaxen
Jaxen is a universal object model walker, capable of evaluating XPath Jaxen is a universal object model walker, capable of evaluating XPath
@ -183,7 +185,11 @@ export JAVA_OPTS="-source 1.6 -target 1.6 -encoding UTF-8 -J-Xss6m"
export JAVAC="javac ${JAVA_OPTS} " export JAVAC="javac ${JAVA_OPTS} "
export ANT_OPTS="-Xss6m" export ANT_OPTS="-Xss6m"
i=0 i=0
CLASSPATH="%{stage1_build_dir}:$(build-classpath xerces-j2 xalan-j2 xalan-j2-serializer junit relaxngDatatype servletapi5 xpp2 xpp3 glassfish-jaxb-api)" CLASSPATH="%{stage1_build_dir}:$(build-classpath \
%if 0%{?suse_version} > 1500
glassfish-jaxb-api \
%endif
xerces-j2 xalan-j2 xalan-j2-serializer junit relaxngDatatype servletapi5 xpp2 xpp3)"
SOURCE_DIRS="%{jaxen_dir}/src/java/main/ %{jdom_dir}/src/java/ %{saxpath_dir}/src/java/main/ %{xom_dir}/src/ %{dom4j_dir}/src/java" SOURCE_DIRS="%{jaxen_dir}/src/java/main/ %{jdom_dir}/src/java/ %{saxpath_dir}/src/java/main/ %{xom_dir}/src/ %{dom4j_dir}/src/java"
SOURCE_PATH=$(echo ${SOURCE_DIRS} | sed 's#\ #:#g') SOURCE_PATH=$(echo ${SOURCE_DIRS} | sed 's#\ #:#g')
# Failing files # Failing files
@ -206,7 +212,7 @@ ant -Dparser.jar=$(build-classpath xerces-j2) \
-Dxml-apis.jar=$(build-classpath xml-commons-apis) \ -Dxml-apis.jar=$(build-classpath xml-commons-apis) \
-Djaxen.lib.dir=%{jdom_dir} \ -Djaxen.lib.dir=%{jdom_dir} \
-Dcompile.source=1.6 -Dcompile.target=1.6 \ -Dcompile.source=1.6 -Dcompile.target=1.6 \
-Dversion=%jdom_version \ -Dversion=%{jdom_version} \
package package
mv build/jdom-%{jdom_version}.jar %{_builddir}/jdom-%{jdom_version}.jar mv build/jdom-%{jdom_version}.jar %{_builddir}/jdom-%{jdom_version}.jar
rm jaxen.jar rm jaxen.jar