diff --git a/xalan-j2.spec b/xalan-j2.spec index 11b92f1..e29e8b1 100644 --- a/xalan-j2.spec +++ b/xalan-j2.spec @@ -12,7 +12,6 @@ Source0: http://www.apache.org/dist/xml/xalan-j/source/xalan-j_%{cvs_vers Patch0: %{name}-noxsltcdeps.patch Patch1: %{name}-manifest.patch Patch2: %{name}-crosslink.patch -Patch3: %{name}-bz130162.patch Patch4: %{name}-bz152255.patch URL: http://xml.apache.org/xalan-j/ Group: Text Processing/Markup/XML @@ -20,7 +19,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot Provides: jaxp_transform_impl 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 # RHEL3 and FC2 Obsoletes: xalan-j <= 0:2.4.1 @@ -82,10 +81,6 @@ find . -name "*.jar" \ ! -name xalan2jdoc.jar \ ! -name stylebook-1.0-b3_xalan-2.jar \ -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 %build @@ -220,6 +215,9 @@ ln -s %{name}-%{version} %{_javadocdir}/%{name} %{_datadir}/%{name} %changelog +* Fri May 27 2005 Gary Benson +- Remove now-unnecessary workaround for #130162. + * Tue May 24 2005 Gary Benson 0:2.6.0-2jpp_2fc - Add DOM3 stubs to classes that need them (#152255). - BC-compile the main jarfile.