rpms/xml-commons-apis
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Allow building against Java 11

Browse Source
This commit is contained in:
Mat Booth 2020-06-19 21:38:51 +01:00
parent 61f773453d
commit 9629b6aafc
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
xml-commons-apis.spec
View File

@ -1,6 +1,6 @@
Name: xml-commons-apis Name: xml-commons-apis
Version: 1.4.01 Version: 1.4.01
Release: 29%{?dist} Release: 30%{?dist}
Summary: APIs for DOM, SAX, and JAXP Summary: APIs for DOM, SAX, and JAXP
License: ASL 2.0 and W3C and Public Domain License: ASL 2.0 and W3C and Public Domain
URL: http://xml.apache.org/commons/ URL: http://xml.apache.org/commons/
@ -53,6 +53,14 @@ iconv -f iso8859-1 -t utf-8 LICENSE.dom-documentation.txt > \
iconv -f iso8859-1 -t utf-8 LICENSE.dom-software.txt > \ iconv -f iso8859-1 -t utf-8 LICENSE.dom-software.txt > \
LICENSE.dom-sof.temp && mv -f LICENSE.dom-sof.temp LICENSE.dom-software.txt LICENSE.dom-sof.temp && mv -f LICENSE.dom-sof.temp LICENSE.dom-software.txt
# disable javadoc linting
sed -i -e '/javadoc packagenames/aadditionalparam="-Xdoclint:none"' build.xml
# in Java 9+ a single underscore is no longer a valid identifier
sed -i -e 's/\(Throwable\|Exception\) _/\1 ex/' \
src/javax/xml/validation/SchemaFactoryFinder.java \
src/javax/xml/xpath/XPathFactoryFinder.java
# remove bogus section from poms # remove bogus section from poms
cp %{SOURCE3} %{SOURCE4} . cp %{SOURCE3} %{SOURCE4} .
sed -i '/distributionManagement/,/\/distributionManagement/ {d}' *.pom sed -i '/distributionManagement/,/\/distributionManagement/ {d}' *.pom
@ -62,7 +70,7 @@ sed -i '/distributionManagement/,/\/distributionManagement/ {d}' *.pom
%mvn_alias :xml-apis-ext xerces:dom3-xml-apis %mvn_alias :xml-apis-ext xerces:dom3-xml-apis
%build %build
ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 jar javadoc ant -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 jar javadoc
# inject OSGi manifests # inject OSGi manifests
jar ufm build/xml-apis.jar %{SOURCE1} jar ufm build/xml-apis.jar %{SOURCE1}
@ -91,6 +99,9 @@ rm -rf build/docs/javadoc
%{_javadocdir}/* %{_javadocdir}/*
%changelog %changelog
* Fri Jun 19 2020 Mat Booth <mat.booth@redhat.com> - 1.4.01-30
- Allow building against Java 11
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.01-29 * Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.01-29
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild