diff --git a/xalan-j2.spec b/xalan-j2.spec index f3ed3fc..fa9530c 100644 --- a/xalan-j2.spec +++ b/xalan-j2.spec @@ -12,6 +12,7 @@ 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 URL: http://xml.apache.org/xalan-j/ Group: Text Processing/Markup/XML #Vendor: JPackage Project @@ -23,8 +24,8 @@ Provides: jaxp_transform_impl Requires: jaxp_parser_impl, /usr/sbin/update-alternatives BuildRequires: ant, xml-commons-apis, bcel, servlet, jlex, java_cup, sed BuildRequires: jpackage-utils >= 0:1.5, java-devel, xerces-j2 -Obsoletes: xalan-j -Provides: xalan-j +# RHEL3 and FC2 +Obsoletes: xalan-j <= 0:2.4.1 %description Xalan is an XSLT processor for transforming XML documents into HTML, @@ -78,6 +79,10 @@ 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 %build if [ ! -e "$JAVA_HOME" ] ; then export JAVA_HOME="%{java_home}" ; fi