Peg to Java 8 due to build issues on Java 11

This commit is contained in:
Mat Booth 2020-06-29 22:36:21 +01:00
parent 92c68a1f57
commit 5f7a44468e

View File

@ -32,7 +32,7 @@
Name: xalan-j2 Name: xalan-j2
Version: 2.7.2 Version: 2.7.2
Release: 3%{?dist} Release: 4%{?dist}
Epoch: 0 Epoch: 0
Summary: Java XSLT processor Summary: Java XSLT processor
# src/org/apache/xpath/domapi/XPathStylesheetDOM3Exception.java is W3C # src/org/apache/xpath/domapi/XPathStylesheetDOM3Exception.java is W3C
@ -63,6 +63,7 @@ BuildRequires: sed
BuildRequires: glassfish-servlet-api BuildRequires: glassfish-servlet-api
BuildRequires: xerces-j2 >= 0:2.7.1 BuildRequires: xerces-j2 >= 0:2.7.1
BuildRequires: xml-commons-apis >= 0:1.3 BuildRequires: xml-commons-apis >= 0:1.3
BuildRequires: java-1.8.0-openjdk-devel
Requires: xerces-j2 Requires: xerces-j2
@ -132,6 +133,7 @@ sed -i 's/\r//' KEYS LICENSE.txt NOTICE.txt xdocs/style/resources/script.js \
%mvn_package :xsltc xsltc %mvn_package :xsltc xsltc
%build %build
export JAVA_HOME=%{_jvmdir}/java-1.8.0-openjdk
pushd lib pushd lib
ln -sf $(build-classpath java_cup-runtime) runtime.jar ln -sf $(build-classpath java_cup-runtime) runtime.jar
ln -sf $(build-classpath bcel) BCEL.jar ln -sf $(build-classpath bcel) BCEL.jar
@ -205,6 +207,9 @@ mv %{_javadir}/jaxp_transform_impl.jar{.tmp,} || :
%{_datadir}/%{name} %{_datadir}/%{name}
%changelog %changelog
* Mon Jun 29 2020 Mat Booth <mat.booth@redhat.com> - 0:2.7.2-4
- Peg to Java 8 due to build issues on Java 11
* Fri Jun 19 2020 Mat Booth <mat.booth@redhat.com> - 0:2.7.2-3 * Fri Jun 19 2020 Mat Booth <mat.booth@redhat.com> - 0:2.7.2-3
- Allow building against Java 11 - Allow building against Java 11