Fixes per BZ 825463

fop.script

@@ -26,7 +26,7 @@ MAIN_CLASS=org.apache.fop.cli.Main
 # Set parameters
 set_jvm
 set_classpath commons-io batik-all avalon-framework-api \
-  avalon-framework-impl xmlgraphics-commons \
+  avalon-framework-impl xmlgraphics-commons xml-commons-apis-ext \
   commons-logging fop
 set_flags $BASE_FLAGS
 set_options $BASE_OPTIONS

fop.spec

@@ -1,7 +1,7 @@
 Summary:	XSL-driven print formatter
 Name:		fop
 Version:	1.0
-Release:	16%{?dist}
+Release:	20%{?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@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
@@ -131,6 +132,15 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 
 
 %changelog
+* Sun Nov 18 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.0-20
+- Add xml-commons-apis-ext to classpath
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
 * Tue Jun 21 2011 Rüdiger Landmann <r.landmann@redhat.com> 1.0-16
 - Supply missing event-model.xml files
 

qdox-build.patch

@@ -1,80 +0,0 @@
---- src/codegen/java/org/apache/fop/tools/EventProducerCollector.java.sav	2010-07-12 22:34:46.000000000 +0300
-+++ src/codegen/java/org/apache/fop/tools/EventProducerCollector.java	2011-03-10 16:59:50.680483330 +0200
-@@ -15,13 +15,12 @@
-  * limitations under the License.
-  */
- 
--/* $Id: EventProducerCollector.java 932502 2010-04-09 16:48:27Z vhennebert $ */
-+/* $Id: EventProducerCollector.java 1066078 2011-02-01 16:04:41Z jeremias $ */
- 
- package org.apache.fop.tools;
- 
- import java.io.File;
- import java.io.IOException;
--import java.util.ArrayList;
- import java.util.Collections;
- import java.util.List;
- import java.util.Map;
-@@ -47,10 +46,10 @@ import com.thoughtworks.qdox.model.Type;
- class EventProducerCollector {
- 
-     private static final String CLASSNAME_EVENT_PRODUCER = EventProducer.class.getName();
--    private static final Map PRIMITIVE_MAP;
-+    private static final Map<String, Class<?>> PRIMITIVE_MAP;
- 
-     static {
--        Map m = new java.util.HashMap();
-+        Map <String, Class<?>> m = new java.util.HashMap<String, Class<?>>();
-         m.put("boolean", Boolean.class);
-         m.put("byte", Byte.class);
-         m.put("char", Character.class);
-@@ -63,7 +62,7 @@ class EventProducerCollector {
-     }
- 
-     private DocletTagFactory tagFactory;
--    private List models = new ArrayList();
-+    private List<EventModel> models = new java.util.ArrayList<EventModel>();
- 
-     /**
-      * Creates a new EventProducerCollector.
-@@ -123,6 +122,9 @@ class EventProducerCollector {
-      */
-     protected void processEventProducerInterface(JavaClass clazz)
-                 throws EventConventionException, ClassNotFoundException {
-+    	if (clazz.getParentClass() == null || clazz.getParentClass().getName().equals("java.lang.Object")) {
-+    		return;
-+    	}
-         EventProducerModel prodMeta = new EventProducerModel(clazz.getFullyQualifiedName());
-         JavaMethod[] methods = clazz.getMethods(true);
-         for (int i = 0, c = methods.length; i < c; i++) {
-@@ -139,7 +141,7 @@ class EventProducerCollector {
-             throws EventConventionException, ClassNotFoundException {
-         JavaClass clazz = method.getParentClass();
-         //Check EventProducer conventions
--        if (!method.getReturns().isVoid()) {
-+        if (!method.getReturnType().isVoid()) {
-             throw new EventConventionException("All methods of interface "
-                     + clazz.getFullyQualifiedName() + " must have return type 'void'!");
-         }
-@@ -168,10 +170,10 @@ class EventProducerCollector {
-         if (params.length > 1) {
-             for (int j = 1, cj = params.length; j < cj; j++) {
-                 JavaParameter p = params[j];
--                Class type;
-+                Class<?> type;
-                 JavaClass pClass = p.getType().getJavaClass();
-                 if (p.getType().isPrimitive()) {
--                    type = (Class)PRIMITIVE_MAP.get(pClass.getName());
-+                    type = PRIMITIVE_MAP.get(pClass.getName());
-                     if (type == null) {
-                         throw new UnsupportedOperationException(
-                                 "Primitive datatype not supported: " + pClass.getName());
-@@ -197,7 +199,7 @@ class EventProducerCollector {
-      * Returns the event model that has been accumulated.
-      * @return the event model.
-      */
--    public List getModels() {
-+    public List<EventModel> getModels() {
-         return this.models;
-     }
- 

sources

@@ -1,2 +1 @@
-b5e6011022ea23187c3d591e55965113  event-model.tgz
 95dcc4c2dd08b4bc88ce9ce1ee88c439  fop-1.0-src.tar.gz