Remove now-unnecessary workaround for #130162

This commit is contained in:
gbenson 2005-05-27 12:35:08 +00:00
parent f759f44794
commit 30a91548cc

View File

@ -12,7 +12,6 @@ Source0: http://www.apache.org/dist/xml/xalan-j/source/xalan-j_%{cvs_vers
Patch0: %{name}-noxsltcdeps.patch Patch0: %{name}-noxsltcdeps.patch
Patch1: %{name}-manifest.patch Patch1: %{name}-manifest.patch
Patch2: %{name}-crosslink.patch Patch2: %{name}-crosslink.patch
Patch3: %{name}-bz130162.patch
Patch4: %{name}-bz152255.patch Patch4: %{name}-bz152255.patch
URL: http://xml.apache.org/xalan-j/ URL: http://xml.apache.org/xalan-j/
Group: Text Processing/Markup/XML Group: Text Processing/Markup/XML
@ -20,7 +19,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
Provides: jaxp_transform_impl Provides: jaxp_transform_impl
Requires: jaxp_parser_impl, /usr/sbin/update-alternatives Requires: jaxp_parser_impl, /usr/sbin/update-alternatives
BuildRequires: ant, xml-commons-apis, bcel, servlet, jlex, java_cup, sed BuildRequires: ant, xml-commons-apis, bcel, servletapi5, jlex, java_cup, sed
BuildRequires: jpackage-utils >= 0:1.5, java-devel, xerces-j2 BuildRequires: jpackage-utils >= 0:1.5, java-devel, xerces-j2
# RHEL3 and FC2 # RHEL3 and FC2
Obsoletes: xalan-j <= 0:2.4.1 Obsoletes: xalan-j <= 0:2.4.1
@ -82,10 +81,6 @@ find . -name "*.jar" \
! -name xalan2jdoc.jar \ ! -name xalan2jdoc.jar \
! -name stylebook-1.0-b3_xalan-2.jar \ ! -name stylebook-1.0-b3_xalan-2.jar \
-exec rm -f {} \; -exec rm -f {} \;
# Don't unzip stuff (#130162: gunzip task fails in libgcj)
if java -version 2>&1 | grep -q "gcj"; then
%patch3 -p1
fi
%patch4 -p1 %patch4 -p1
%build %build
@ -220,6 +215,9 @@ ln -s %{name}-%{version} %{_javadocdir}/%{name}
%{_datadir}/%{name} %{_datadir}/%{name}
%changelog %changelog
* Fri May 27 2005 Gary Benson <gbenson@redhat.com>
- Remove now-unnecessary workaround for #130162.
* Tue May 24 2005 Gary Benson <gbenson@redhat.com> 0:2.6.0-2jpp_2fc * Tue May 24 2005 Gary Benson <gbenson@redhat.com> 0:2.6.0-2jpp_2fc
- Add DOM3 stubs to classes that need them (#152255). - Add DOM3 stubs to classes that need them (#152255).
- BC-compile the main jarfile. - BC-compile the main jarfile.