.gitignore

@@ -1 +1 @@
-SOURCES/Xerces-J-src.2.12.0.tar.gz
+SOURCES/Xerces-J-src.2.12.1.tar.gz

.xerces-j2.metadata

@@ -1 +1 @@
-474275833fe481c1da2461d6b2bb6bd3304dee7e SOURCES/Xerces-J-src.2.12.0.tar.gz
+b5d934e54b8864f09c683ca8666147c101faeb69 SOURCES/Xerces-J-src.2.12.1.tar.gz

SOURCES/getContentDocument.patch

@@ -1,84 +0,0 @@
-From: Markus Koschany <apo@debian.org>
-Date: Sat, 12 May 2018 22:12:44 +0200
-Subject: getContentDocument
-
-Fix FTBFS with Java10 due to missing method getContentDocument.
-
-Forwarded: no
----
- src/org/apache/html/dom/HTMLFrameElementImpl.java  | 7 +++++++
- src/org/apache/html/dom/HTMLIFrameElementImpl.java | 5 +++++
- src/org/apache/html/dom/HTMLObjectElementImpl.java | 5 +++++
- 3 files changed, 17 insertions(+)
-
-diff --git a/src/org/apache/html/dom/HTMLFrameElementImpl.java b/src/org/apache/html/dom/HTMLFrameElementImpl.java
-index 18ab953..e90a592 100644
---- a/src/org/apache/html/dom/HTMLFrameElementImpl.java
-+++ b/src/org/apache/html/dom/HTMLFrameElementImpl.java
-@@ -17,6 +17,8 @@
- package org.apache.html.dom;
- 
- import org.w3c.dom.html.HTMLFrameElement;
-+import org.w3c.dom.Document;
-+
- 
- /**
-  * @xerces.internal
-@@ -127,6 +129,11 @@ public class HTMLFrameElementImpl
-         setAttribute( "src", src );
-     }
- 
-+    public Document getContentDocument()
-+    {
-+        return null;
-+    }
-+
-     
-     /**
-      * Constructor requires owner document.
-diff --git a/src/org/apache/html/dom/HTMLIFrameElementImpl.java b/src/org/apache/html/dom/HTMLIFrameElementImpl.java
-index c326557..287ba9e 100644
---- a/src/org/apache/html/dom/HTMLIFrameElementImpl.java
-+++ b/src/org/apache/html/dom/HTMLIFrameElementImpl.java
-@@ -17,6 +17,7 @@
- package org.apache.html.dom;
- 
- import org.w3c.dom.html.HTMLIFrameElement;
-+import org.w3c.dom.Document;
- 
- /**
-  * @xerces.internal
-@@ -150,6 +151,10 @@ public class HTMLIFrameElementImpl
-         setAttribute( "width", width );
-     }
- 
-+    public Document getContentDocument()
-+    {
-+        return null;
-+    }
-     
-     /**
-      * Constructor requires owner document.
-diff --git a/src/org/apache/html/dom/HTMLObjectElementImpl.java b/src/org/apache/html/dom/HTMLObjectElementImpl.java
-index b065e69..cd27fc8 100644
---- a/src/org/apache/html/dom/HTMLObjectElementImpl.java
-+++ b/src/org/apache/html/dom/HTMLObjectElementImpl.java
-@@ -17,6 +17,7 @@
- package org.apache.html.dom;
- 
- import org.w3c.dom.html.HTMLObjectElement;
-+import org.w3c.dom.Document;
- 
- /**
-  * @xerces.internal
-@@ -239,6 +240,10 @@ public class HTMLObjectElementImpl
-         setAttribute( "width", width );
-     }
- 
-+    public Document getContentDocument()
-+    {
-+        return null;
-+    }
-     
-     
-     /**

SOURCES/xerces-j2-constants.sh

@@ -1,20 +0,0 @@
-#!/bin/sh
-# 
-# Xerces-J2 constants script
-# JPackage Project (http://www.jpackage.org/)
-# $Id: xerces-j2-constants.sh,v 1.3 2005/05/26 14:21:22 gbenson Exp $
-
-# Source functions library
-. /usr/share/java-utils/java-functions
-
-# Configuration
-MAIN_CLASS=org.apache.xerces.impl.Constants
-
-# Set parameters
-set_jvm
-export CLASSPATH=$(build-classpath xerces-j2)
-set_flags $BASE_FLAGS
-set_options $BASE_OPTIONS
-
-# Let's start
-run "$@"

SOURCES/xerces-j2-modulefix.patch

@@ -0,0 +1,12 @@
+diff -up ./build.xml.fix2 ./build.xml
+--- ./build.xml.fix2	2020-06-24 14:11:03.342338406 -0400
++++ ./build.xml	2020-06-24 14:14:03.000100028 -0400
+@@ -447,7 +447,7 @@ Authors:
+       author='true' version='true'
+       windowtitle='XML Standard API' doctitle='XML Standard API'
+       bottom='${copyright}'
+-      additionalparam='${additional.param}'
++      additionalparam='--patch-module jdk.xml.dom=${build.src}/org/w3c/dom/html ${additional.param}'
+       />
+     <mkdir dir='${build.dir}/docs/javadocs/xni'/>
+     <javadoc packagenames='org.apache.xerces.xni.*'

SOURCES/xerces-j2-version.sh

@@ -1,20 +0,0 @@
-#!/bin/sh
-# 
-# Xerces-J2 version script
-# JPackage Project (http://www.jpackage.org/)
-# $Id: xerces-j2-version.sh,v 1.3 2005/05/26 14:21:22 gbenson Exp $
-
-# Source functions library
-. /usr/share/java-utils/java-functions
-
-# Configuration
-MAIN_CLASS=org.apache.xerces.impl.Version
-
-# Set parameters
-set_jvm
-export CLASSPATH=$(build-classpath xerces-j2)
-set_flags $BASE_FLAGS
-set_options $BASE_OPTIONS
-
-# Let's start
-run "$@"

SPECS/xerces-j2.spec

@@ -1,10 +1,8 @@
-%global cvs_version 2_12_0
-
 %define __requires_exclude system.bundle
 
 Name:          xerces-j2
-Version:       2.12.0
+Version:       2.12.1
-Release:       4%{?dist}
+Release:       6%{?dist}
 Summary:       Java XML parser
 # Most of the source is ASL 2.0
 # W3C licensed files:
@@ -13,9 +11,9 @@ Summary:       Java XML parser
 License:       ASL 2.0 and W3C
 URL:           http://xerces.apache.org/xerces2-j/
 
+%global cvs_version %(tr . _ <<< %{version})
+
 Source0:       http://mirror.ox.ac.uk/sites/rsync.apache.org/xerces/j/source/Xerces-J-src.%{version}.tar.gz
-Source1:       %{name}-version.sh
-Source2:       %{name}-constants.sh
 Source11:      %{name}-version.1
 Source12:      %{name}-constants.1
 
@@ -30,19 +28,18 @@ Patch0:        %{name}-build.patch
 # Patch the manifest so that it includes OSGi stuff
 Patch1:        %{name}-manifest.patch
 
-# Fix FTBFS with Java10 due to missing method getContentDocument
+# Patch build.xml to patch modules as needed during javadoc generation
-Patch2:        https://sources.debian.org/data/main/libx/libxerces2-java/2.12.0-1/debian/patches/getContentDocument.patch
+Patch2:        %{name}-modulefix.patch
 
 BuildArch:     noarch
 
 BuildRequires: javapackages-local
 BuildRequires: ant
 BuildRequires: apache-parent
-BuildRequires: xalan-j2 >= 2.7.1
 BuildRequires: xml-commons-apis >= 1.4.01
 BuildRequires: xml-commons-resolver >= 1.2
+BuildRequires: java-devel
 
-Requires:      xalan-j2 >= 2.7.1
 Requires:      xml-commons-apis >= 1.4.01
 Requires:      xml-commons-resolver >= 1.2
 # Explicit javapackages-tools requires since scripts use
@@ -52,10 +49,13 @@ Requires:      javapackages-tools
 Provides:      jaxp_parser_impl = 1.4
 Provides:      %{name}-scripts = %{version}-%{release}
 
+Obsoletes:     %{name}-scripts < 2.11.0-6
 
 # This documentation is provided by xml-commons-apis
+Obsoletes:     %{name}-javadoc-apis < %{version}-%{release}
 
 # http://mail-archives.apache.org/mod_mbox/xerces-j-dev/201008.mbox/%3COF8D7E2F83.0271A181-ON8525777F.00528302-8525777F.0054BBE0@ca.ibm.com%3E
+Obsoletes:     %{name}-manual < %{version}-%{release}
 
 %description
 Welcome to the future! Xerces2 is the next generation of high performance,
@@ -84,6 +84,18 @@ also handles name spaces according to the XML Namespaces 1.1 Recommendation,
 and will correctly serialize XML 1.1 documents if the DOM level 3 load/save
 APIs are in use.
 
+%package        javadoc
+Summary:        Javadocs for %{name}
+
+# Consolidating all javadocs into one package
+Obsoletes:      %{name}-javadoc-impl < %{version}-%{release}
+Obsoletes:      %{name}-javadoc-xs < %{version}-%{release}
+Obsoletes:      %{name}-javadoc-xni < %{version}-%{release}
+Obsoletes:      %{name}-javadoc-other < %{version}-%{release}
+
+%description    javadoc
+This package contains the API documentation for %{name}.
+
 %package        demo
 Summary:        Demonstrations and samples for %{name}
 Requires:       %{name} = %{version}-%{release}
@@ -92,22 +104,24 @@ Requires:       %{name} = %{version}-%{release}
 %{summary}.
 
 %prep
-%setup -q -n xerces-%{cvs_version}
+%setup -n xerces-%{cvs_version}
-%patch0 -p0 -b .orig
+%patch0 -p0
-%patch1 -p0 -b .orig
+%patch1 -p0
-%patch2 -p1
+%patch2 -p0
 
-# Copy the custom ant tasks into place
+# Copy the custom ant task into place
 mkdir -p tools/org/apache/xerces/util
 mkdir -p tools/bin
 cp -a %{SOURCE3} tools/org/apache/xerces/util
 
 # Make sure upstream hasn't sneaked in any jars we don't know about
-find -name '*.class' -exec rm -f '{}' \;
+find . \( -name '*.class' -o -name '*.jar' \) -delete
-find -name '*.jar' -exec rm -f '{}' \;
 
 sed -i 's/\r//' LICENSE README NOTICE
 
+# Disable javadoc linting
+sed -i -e "s|additionalparam='|additionalparam='-Xdoclint:none |" build.xml
+
 # legacy aliases for compatability
 %mvn_alias : xerces:xerces xerces:xmlParserAPIs apache:xerces-j2
 %mvn_file : %{name} jaxp_parser_impl
@@ -119,26 +133,37 @@ pushd tools
 javac -classpath $(build-classpath ant) org/apache/xerces/util/XJavac.java
 jar cf bin/xjavac.jar org/apache/xerces/util/XJavac.class
 
-ln -sf $(build-classpath xalan-j2-serializer) serializer.jar
+jar cmf /dev/null serializer.jar
 ln -sf $(build-classpath xml-commons-apis) xml-apis.jar
 ln -sf $(build-classpath xml-commons-resolver) resolver.jar
-ln -sf $(build-classpath xerces-j2) x.jar
 popd
 
 # Build everything
-export ANT_OPTS="-Xmx256m -Djava.awt.headless=true -Dbuild.sysclasspath=first -Ddisconnected=true"
+export ANT_OPTS="-Xmx512m -Djava.awt.headless=true -Dbuild.sysclasspath=first -Ddisconnected=true"
-ant -Djavac.source=1.6 -Djavac.target=1.6 \
+ant -Djavac.source=1.8 -Djavac.target=1.8 \
     -Dbuild.compiler=modern \
-    clean jars
+    clean jars javadocs
 
 %mvn_artifact %{SOURCE7} build/xercesImpl.jar
 
 %install
 %mvn_install
 
+# javadoc
+mkdir -p %{buildroot}%{_javadocdir}/%{name}
+mkdir -p %{buildroot}%{_javadocdir}/%{name}/impl
+mkdir -p %{buildroot}%{_javadocdir}/%{name}/xs
+mkdir -p %{buildroot}%{_javadocdir}/%{name}/xni
+mkdir -p %{buildroot}%{_javadocdir}/%{name}/other
+
+cp -pr build/docs/javadocs/xerces2/* %{buildroot}%{_javadocdir}/%{name}/impl
+cp -pr build/docs/javadocs/api/* %{buildroot}%{_javadocdir}/%{name}/xs
+cp -pr build/docs/javadocs/xni/* %{buildroot}%{_javadocdir}/%{name}/xni
+cp -pr build/docs/javadocs/other/* %{buildroot}%{_javadocdir}/%{name}/other
+
 # scripts
-install -pD -m755 -T %{SOURCE1} %{buildroot}%{_bindir}/%{name}-version
+%jpackage_script org.apache.xerces.impl.Version "" "" %{name} %{name}-version 1
-install -pD -m755 -T %{SOURCE2} %{buildroot}%{_bindir}/%{name}-constants
+%jpackage_script org.apache.xerces.impl.Constants "" "" %{name} %{name}-constants 1
 
 # manual pages
 install -d -m 755 %{buildroot}%{_mandir}/man1
@@ -150,7 +175,7 @@ install -pD -T build/xercesSamples.jar %{buildroot}%{_datadir}/%{name}/%{name}-s
 cp -pr data %{buildroot}%{_datadir}/%{name}
 
 %post
-# alternatives suppoort removed in f26
+# alternatives support removed in f26
 update-alternatives --remove jaxp_parser_impl %{_javadir}/%{name}.jar >/dev/null 2>&1 || :
 # it deletes the link, set it up again
 ln -sf %{name}.jar %{_javadir}/jaxp_parser_impl.jar
@@ -160,15 +185,63 @@ ln -sf %{name}.jar %{_javadir}/jaxp_parser_impl.jar
 %{_bindir}/*
 %{_mandir}/*/*
 
+%files javadoc
+%{_javadocdir}/%{name}
+
 %files demo
 %{_datadir}/%{name}
 
 %changelog
-* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.12.0-4
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.12.1-6
-- Mass rebuild for javapackages-tools 201902
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
 
-* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.12.0-3
+* Mon Jun 28 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.12.1-5
-- Mass rebuild for javapackages-tools 201901
+- Remove dependency on xalan-j2
+- Resolves: rhbz#1977007
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.12.1-4
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Fri Mar 12 2021 Mat Booth <mat.booth@redhat.com> - 2.12.1-3
+- Update OSGi metadata, use import-package instead of require-bundle
+  in order to avoid some tricky OSGi breakage on Java 11
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.12.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Sep 14 2020 Jerry James <loganjerry@gmail.com> - 2.12.1-1
+- Version 2.12.1
+- Drop upstreamed getcontentdocument patch
+- Drop no longer used taglet sources
+- Verify the source tarball
+- Compute cvs_version so it doesn't have to be updated in sync with Version
+- Build with JDK 11
+- Generate the scripts with jpackage_script
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.12.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jul 14 2020 Mat Booth <mat.booth@redhat.com> - 2.12.0-8
+- Peg to Java 8 due to use of 'com.sun.tools.doclets.Taglet' that was removed in
+  Java 11
+
+* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 2.12.0-7
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Wed Jun 24 2020 Mat Booth <mat.booth@redhat.com> - 2.12.0-6
+- Turn off javadoc linting
+
+* Wed Jun 24 2020 Jeff Johnston <jjohnstn@redhat.com> - 2.12.0-5
+- Change to build using Java 11
+- Fix some impl classes that require getContentDocument() method
+- Add a patch-module option for Javadoc generation
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.12.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.12.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
 * Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.12.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild