SPECS/xml-commons-apis.spec

@@ -1,6 +1,6 @@
 Name:          xml-commons-apis
 Version:       1.4.01
-Release:       27%{?dist}
+Release:       31%{?dist}
 Summary:       APIs for DOM, SAX, and JAXP
 License:       ASL 2.0 and W3C and Public Domain
 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 > \
   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
 cp %{SOURCE3} %{SOURCE4} .
 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
 
 %build
-ant -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 jar javadoc
+ant -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 jar javadoc
 
 # inject OSGi manifests
 jar ufm build/xml-apis.jar %{SOURCE1}
@@ -82,18 +90,32 @@ rm -rf build/docs/javadoc
 %doc LICENSE.dom-documentation.txt README.dom.txt
 %doc LICENSE.dom-software.txt LICENSE.sac.html
 %doc LICENSE.sax.txt README-sax  README.sax.txt
+%{_javadir}/*
 
 %files manual
 %doc build/docs/*
 
-%files javadoc -f .mfiles-javadoc
+%files javadoc
+%{_javadocdir}/*
 
 %changelog
-* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4.01-27
-- Mass rebuild for javapackages-tools 201902
+* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 1.4.01-31
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
 
-* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4.01-26
-- Mass rebuild for javapackages-tools 201901
+* 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
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.01-28
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.01-27
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.01-26
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.01-25
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
@@ -285,4 +307,4 @@ rm -rf build/docs/javadoc
 - RH vacuuming part II
 
 * Tue Mar  2 2004 Frank Ch. Eigler <fche@redhat.com> - 0:1.0-0.b2.6jpp_1rh
-- RH vacuuming
+- RH vacuuming