[fop/f15] Incorporate workaround from upstream bug #50575

[Rüdiger Landmann]

commit 5fdf32024a17dccfcd9b039a247b0a4b31743be0
Author: Ruediger Landmann <r.landmann at redhat.com>
Date:   Wed Sep 7 16:12:06 2011 +1000

    Incorporate workaround from upstream bug #50575

 fop.spec         |   13 +++++----
 qdox-build.patch |   80 ------------------------------------------------------
 sources          |    1 -
 3 files changed, 7 insertions(+), 87 deletions(-)
---
diff --git a/fop.spec b/fop.spec
index 188d1ee..ec9987a 100644
--- a/fop.spec
+++ b/fop.spec
@@ -1,7 +1,7 @@
 Summary:	XSL-driven print formatter
 Name:		fop
 Version:	1.0
-Release:	16%{?dist}
+Release:	17%{?dist}
 License:	ASL 2.0
 Group:		Applications/Text
 URL:		http://xmlgraphics.apache.org/fop
@@ -9,10 +9,8 @@ Source0:	http://www.apache.org/dist/xmlgraphics/fop/source/%{name}-%{version}-sr
 Source1:	%{name}.script
 Source2:	batik-pdf-MANIFEST.MF
 Source3:	http://mirrors.ibiblio.org/pub/mirrors/maven2/org/apache/xmlgraphics/%{name}/%{version}/%{name}-%{version}.pom
-Source4:	event-model.tgz
 Patch0:		%{name}-manifest.patch
 Patch1:		%{name}-main.patch
-Patch2:		qdox-build.patch
 BuildArch:  noarch
 Requires:	xmlgraphics-commons >= 1.2
 Requires:	avalon-framework >= 4.1.4
@@ -60,18 +58,21 @@ Requires:	jpackage-utils
 Javadoc for %{name}.
 
 %prep
-%setup -q -a 4
+%setup -q
 %patch0 -p1
 %patch1 -p0
-%patch2 -b .sav
 
 find -name '*.class' -exec rm -f '{}' \;
 find -name '*.jar' -exec rm -f '{}' \;
 
 sed -i -e "s|1.4|1.5|g" build.xml
 
+#upstream workaround -- many thanks to spepping at apache.org -- see https://issues.apache.org/bugzilla/show_bug.cgi?id=50575
+ln -s %{_javadir}/qdox.jar lib/build/qdox.jar
+
 %build
-export CLASSPATH=$(build-classpath apache-commons-logging apache-commons-io xmlgraphics-commons batik-all avalon-framework-api avalon-framework-impl servlet batik/batik-svg-dom xml-commons-apis xml-commons-apis-ext qdox objectweb-asm/asm-all xmlunit)
+#qdox intentionally left off classpath -- see https://issues.apache.org/bugzilla/show_bug.cgi?id=50575
+export CLASSPATH=$(build-classpath apache-commons-logging apache-commons-io xmlgraphics-commons batik-all avalon-framework-api avalon-framework-impl servlet batik/batik-svg-dom xml-commons-apis xml-commons-apis-ext objectweb-asm/asm-all xmlunit)
 ant jar-main transcoder-pkg javadocs
 
 %install
diff --git a/sources b/sources
index bfb227b..49c53ca 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-b5e6011022ea23187c3d591e55965113  event-model.tgz
 95dcc4c2dd08b4bc88ce9ce1ee88c439  fop-1.0-src.tar.gz