Remove dependency on xalan-j2

Resolves: rhbz#1977007
This commit is contained in:
Mikolaj Izdebski 2021-06-28 12:28:29 +02:00
parent 5a8d5d565d
commit 88716c0766

View File

@ -2,7 +2,7 @@
Name: xerces-j2
Version: 2.12.1
Release: 4%{?dist}
Release: 5%{?dist}
Summary: Java XML parser
# Most of the source is ASL 2.0
# W3C licensed files:
@ -14,8 +14,6 @@ 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: http://www.apache.org/dist/xerces/j/source/Xerces-J-src.%{version}.tar.gz.asc
Source2: http://www.apache.org/dist/xerces/j/binaries/KEYS
Source11: %{name}-version.1
Source12: %{name}-constants.1
@ -38,13 +36,10 @@ 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
BuildRequires: gnupg2
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
@ -109,10 +104,10 @@ Requires: %{name} = %{version}-%{release}
%{summary}.
%prep
# Verify the source file
%{gpgverify} --data=%{SOURCE0} --signature=%{SOURCE1} --keyring=%{SOURCE2}
%autosetup -p0 -n xerces-%{cvs_version}
%setup -n xerces-%{cvs_version}
%patch0 -p0
%patch1 -p0
%patch2 -p0
# Copy the custom ant task into place
mkdir -p tools/org/apache/xerces/util
@ -138,10 +133,9 @@ 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
@ -198,6 +192,10 @@ ln -sf %{name}.jar %{_javadir}/jaxp_parser_impl.jar
%{_datadir}/%{name}
%changelog
* Mon Jun 28 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.12.1-5
- 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