From 2dd5bb12633f652971404263fef4d3bfeec3935f Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Jul 14 2015 15:42:28 +0000 Subject: Update to upstream version 2.0 --- diff --git a/.gitignore b/.gitignore index 9ab3c16..cbd8a15 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ fop-1.0-src.tar.gz /fop-1.1-src.tar.gz /fop-1.1-clean.tar.gz /LICENSE-1.1.txt +/fop-2.0-clean.tar.gz +/fop-2.0.pom diff --git a/0001-Main.patch b/0001-Main.patch new file mode 100644 index 0000000..bf09bc7 --- /dev/null +++ b/0001-Main.patch @@ -0,0 +1,29 @@ +From 040c088781b565273ccc085b597bab2e7b99c782 Mon Sep 17 00:00:00 2001 +From: Michael Simacek +Date: Tue, 14 Jul 2015 16:54:43 +0200 +Subject: [PATCH 1/4] Main + +--- + src/java/org/apache/fop/cli/Main.java | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/src/java/org/apache/fop/cli/Main.java b/src/java/org/apache/fop/cli/Main.java +index d56b2ca..35e76cc 100644 +--- a/src/java/org/apache/fop/cli/Main.java ++++ b/src/java/org/apache/fop/cli/Main.java +@@ -213,11 +213,7 @@ public final class Main { + * @param args the command line parameters + */ + public static void main(String[] args) { +- if (checkDependencies()) { +- startFOP(args); +- } else { +- startFOPWithDynamicClasspath(args); +- } ++ startFOP(args); + } + + } +-- +2.1.0 + diff --git a/0001-Port-to-xmlgraphics-commons-2.0.patch b/0001-Port-to-xmlgraphics-commons-2.0.patch deleted file mode 100644 index c4818ea..0000000 --- a/0001-Port-to-xmlgraphics-commons-2.0.patch +++ /dev/null @@ -1,25 +0,0 @@ -From d346bc582f35a1dce998543d2540c226f3238389 Mon Sep 17 00:00:00 2001 -From: Michael Simacek -Date: Mon, 16 Mar 2015 16:20:10 +0100 -Subject: [PATCH 1/3] Port to xmlgraphics-commons-2.0 - ---- - src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java b/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java -index 1f49de7..81608ed 100644 ---- a/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java -+++ b/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java -@@ -353,7 +353,7 @@ class PDFRenderingUtil implements PDFConfigurationConstants { - Metadata docXMP = metadata.getMetadata(); - Metadata fopXMP = PDFMetadata.createXMPFromPDFDocument(pdfDoc); - //Merge FOP's own metadata into the one from the XSL-FO document -- fopXMP.mergeInto(docXMP); -+ fopXMP.mergeInto(docXMP, java.util.Collections.emptyList()); - XMPBasicAdapter xmpBasic = XMPBasicSchema.getAdapter(docXMP); - //Metadata was changed so update metadata date - xmpBasic.setMetadataDate(new java.util.Date()); --- -2.1.0 - diff --git a/0002-Port-to-QDox-2.0.patch b/0002-Port-to-QDox-2.0.patch deleted file mode 100644 index 8b8ec36..0000000 --- a/0002-Port-to-QDox-2.0.patch +++ /dev/null @@ -1,159 +0,0 @@ -From 7c14c67785aebe7a3bc7712dc7dde19a790a0034 Mon Sep 17 00:00:00 2001 -From: Michael Simacek -Date: Tue, 17 Mar 2015 10:59:41 +0100 -Subject: [PATCH 2/3] Port to QDox 2.0 - ---- - .../apache/fop/tools/EventProducerCollector.java | 59 ++++++++-------------- - 1 file changed, 22 insertions(+), 37 deletions(-) - -diff --git a/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java b/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java -index c6674ba..e39bf50 100644 ---- a/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java -+++ b/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java -@@ -21,6 +21,7 @@ package org.apache.fop.tools; - - import java.io.File; - import java.io.IOException; -+import java.util.Collection; - import java.util.Collections; - import java.util.List; - import java.util.Map; -@@ -31,14 +32,11 @@ import org.apache.fop.events.model.EventModel; - import org.apache.fop.events.model.EventProducerModel; - import org.apache.fop.events.model.EventSeverity; - --import com.thoughtworks.qdox.JavaDocBuilder; --import com.thoughtworks.qdox.model.DefaultDocletTagFactory; -+import com.thoughtworks.qdox.JavaProjectBuilder; - import com.thoughtworks.qdox.model.DocletTag; --import com.thoughtworks.qdox.model.DocletTagFactory; - import com.thoughtworks.qdox.model.JavaClass; - import com.thoughtworks.qdox.model.JavaMethod; - import com.thoughtworks.qdox.model.JavaParameter; --import com.thoughtworks.qdox.model.Type; - - /** - * Finds EventProducer interfaces and builds the event model for them. -@@ -61,22 +59,12 @@ class EventProducerCollector { - PRIMITIVE_MAP = Collections.unmodifiableMap(m); - } - -- private DocletTagFactory tagFactory; - private List models = new java.util.ArrayList(); - - /** - * Creates a new EventProducerCollector. - */ - EventProducerCollector() { -- this.tagFactory = createDocletTagFactory(); -- } -- -- /** -- * Creates the {@link DocletTagFactory} to be used by the collector. -- * @return the doclet tag factory -- */ -- protected DocletTagFactory createDocletTagFactory() { -- return new DefaultDocletTagFactory(); - } - - /** -@@ -89,12 +77,11 @@ class EventProducerCollector { - */ - public boolean scanFile(File src) - throws IOException, EventConventionException, ClassNotFoundException { -- JavaDocBuilder builder = new JavaDocBuilder(this.tagFactory); -+ JavaProjectBuilder builder = new JavaProjectBuilder(); - builder.addSource(src); -- JavaClass[] classes = builder.getClasses(); -+ Collection classes = builder.getClasses(); - boolean eventProducerFound = false; -- for (int i = 0, c = classes.length; i < c; i++) { -- JavaClass clazz = classes[i]; -+ for (JavaClass clazz: classes) { - if (clazz.isInterface() && implementsInterface(clazz, CLASSNAME_EVENT_PRODUCER)) { - processEventProducerInterface(clazz); - eventProducerFound = true; -@@ -104,9 +91,8 @@ class EventProducerCollector { - } - - private boolean implementsInterface(JavaClass clazz, String intf) { -- JavaClass[] classes = clazz.getImplementedInterfaces(); -- for (int i = 0, c = classes.length; i < c; i++) { -- JavaClass cl = classes[i]; -+ List classes = clazz.getImplementedInterfaces(); -+ for (JavaClass cl: classes) { - if (cl.getFullyQualifiedName().equals(intf)) { - return true; - } -@@ -123,9 +109,8 @@ class EventProducerCollector { - protected void processEventProducerInterface(JavaClass clazz) - throws EventConventionException, ClassNotFoundException { - EventProducerModel prodMeta = new EventProducerModel(clazz.getFullyQualifiedName()); -- JavaMethod[] methods = clazz.getMethods(true); -- for (int i = 0, c = methods.length; i < c; i++) { -- JavaMethod method = methods[i]; -+ List methods = clazz.getMethods(true); -+ for (JavaMethod method: methods) { - EventMethodModel methodMeta = createMethodModel(method); - prodMeta.addMethod(methodMeta); - } -@@ -138,18 +123,18 @@ class EventProducerCollector { - throws EventConventionException, ClassNotFoundException { - JavaClass clazz = method.getParentClass(); - //Check EventProducer conventions -- if (!method.getReturnType().isVoid()) { -+ if (!method.getReturns().isVoid()) { - throw new EventConventionException("All methods of interface " - + clazz.getFullyQualifiedName() + " must have return type 'void'!"); - } - String methodSig = clazz.getFullyQualifiedName() + "." + method.getCallSignature(); -- JavaParameter[] params = method.getParameters(); -- if (params.length < 1) { -+ List params = method.getParameters(); -+ if (params.size() < 1) { - throw new EventConventionException("The method " + methodSig - + " must have at least one parameter: 'Object source'!"); - } -- Type firstType = params[0].getType(); -- if (firstType.isPrimitive() || !"source".equals(params[0].getName())) { -+ JavaClass firstType = params.get(0).getJavaClass(); -+ if (firstType.isPrimitive() || !"source".equals(params.get(0).getName())) { - throw new EventConventionException("The first parameter of the method " + methodSig - + " must be: 'Object source'!"); - } -@@ -164,12 +149,12 @@ class EventProducerCollector { - } - EventMethodModel methodMeta = new EventMethodModel( - method.getName(), severity); -- if (params.length > 1) { -- for (int j = 1, cj = params.length; j < cj; j++) { -- JavaParameter p = params[j]; -+ if (params.size() > 1) { -+ for (int j = 1, cj = params.size(); j < cj; j++) { -+ JavaParameter p = params.get(j); - Class type; -- JavaClass pClass = p.getType().getJavaClass(); -- if (p.getType().isPrimitive()) { -+ JavaClass pClass = p.getJavaClass(); -+ if (pClass.isPrimitive()) { - type = PRIMITIVE_MAP.get(pClass.getName()); - if (type == null) { - throw new UnsupportedOperationException( -@@ -182,10 +167,10 @@ class EventProducerCollector { - methodMeta.addParameter(type, p.getName()); - } - } -- Type[] exceptions = method.getExceptions(); -- if (exceptions != null && exceptions.length > 0) { -+ List exceptions = method.getExceptions(); -+ if (exceptions != null && exceptions.size() > 0) { - //We only use the first declared exception because that is always thrown -- JavaClass cl = exceptions[0].getJavaClass(); -+ JavaClass cl = exceptions.get(0); - methodMeta.setExceptionClass(cl.getFullyQualifiedName()); - methodMeta.setSeverity(EventSeverity.FATAL); //In case it's not set in the comments - } --- -2.1.0 - diff --git a/0002-Use-sRGB.icc-color-profile-from-colord-package.patch b/0002-Use-sRGB.icc-color-profile-from-colord-package.patch new file mode 100644 index 0000000..18ab448 --- /dev/null +++ b/0002-Use-sRGB.icc-color-profile-from-colord-package.patch @@ -0,0 +1,41 @@ +From bddb924b5390c98dc012e0bc15fa6bddb53a64aa Mon Sep 17 00:00:00 2001 +From: Michael Simacek +Date: Tue, 14 Jul 2015 16:56:49 +0200 +Subject: [PATCH 2/4] Use sRGB.icc color profile from colord package + +It's a replacement for non-free color profile shipped with fop +--- + src/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/src/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java b/src/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java +index 89a2c06..f0867a9 100644 +--- a/src/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java ++++ b/src/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java +@@ -22,7 +22,9 @@ package org.apache.fop.pdf; + import java.awt.color.ColorSpace; + import java.awt.color.ICC_Profile; + import java.io.IOException; ++import java.io.FileNotFoundException; + import java.io.InputStream; ++import java.io.FileInputStream; + import java.util.Set; + + import org.apache.commons.io.IOUtils; +@@ -138,7 +140,12 @@ public class PDFICCBasedColorSpace extends PDFObject implements PDFColorSpace { + public static PDFICCStream setupsRGBColorProfile(PDFDocument pdfDoc) { + ICC_Profile profile; + PDFICCStream sRGBProfile = pdfDoc.getFactory().makePDFICCStream(); +- InputStream in = PDFDocument.class.getResourceAsStream("sRGB Color Space Profile.icm"); ++ InputStream in; ++ try { ++ in = new FileInputStream("/usr/share/color/icc/colord/sRGB.icc"); ++ } catch (FileNotFoundException e) { ++ in = null; ++ } + if (in != null) { + try { + profile = ColorProfileUtil.getICC_Profile(in); +-- +2.1.0 + diff --git a/0003-Disable-javadoc-doclint.patch b/0003-Disable-javadoc-doclint.patch index 410cc15..9a9b2ed 100644 --- a/0003-Disable-javadoc-doclint.patch +++ b/0003-Disable-javadoc-doclint.patch @@ -1,17 +1,17 @@ -From 7d404f47740cf679bf2e94a1cc03e78c5692df6c Mon Sep 17 00:00:00 2001 +From 1af3481114fda16bc6104618ac19b98577b69460 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 14 May 2015 06:26:09 +0200 -Subject: [PATCH 3/3] Disable javadoc doclint +Subject: [PATCH 3/4] Disable javadoc doclint --- build.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/build.xml b/build.xml -index 7c05049..d15b403 100644 +index 427aa4c..4f212f0 100644 --- a/build.xml +++ b/build.xml -@@ -951,6 +951,7 @@ NOTE: +@@ -964,6 +964,7 @@ NOTE: bottom="Copyright ${year} The Apache Software Foundation. All Rights Reserved." overview="${src.dir}/java/org/apache/fop/overview.html" maxmemory="256M"> diff --git a/0004-Port-to-QDox-2.0.patch b/0004-Port-to-QDox-2.0.patch new file mode 100644 index 0000000..ba6d04c --- /dev/null +++ b/0004-Port-to-QDox-2.0.patch @@ -0,0 +1,159 @@ +From 3edb7de2cdd7dab48947882ae3340b0c3a0a9f87 Mon Sep 17 00:00:00 2001 +From: Michael Simacek +Date: Tue, 17 Mar 2015 10:59:41 +0100 +Subject: [PATCH 4/4] Port to QDox 2.0 + +--- + .../apache/fop/tools/EventProducerCollector.java | 59 ++++++++-------------- + 1 file changed, 22 insertions(+), 37 deletions(-) + +diff --git a/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java b/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java +index c6674ba..e39bf50 100644 +--- a/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java ++++ b/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java +@@ -21,6 +21,7 @@ package org.apache.fop.tools; + + import java.io.File; + import java.io.IOException; ++import java.util.Collection; + import java.util.Collections; + import java.util.List; + import java.util.Map; +@@ -31,14 +32,11 @@ import org.apache.fop.events.model.EventModel; + import org.apache.fop.events.model.EventProducerModel; + import org.apache.fop.events.model.EventSeverity; + +-import com.thoughtworks.qdox.JavaDocBuilder; +-import com.thoughtworks.qdox.model.DefaultDocletTagFactory; ++import com.thoughtworks.qdox.JavaProjectBuilder; + import com.thoughtworks.qdox.model.DocletTag; +-import com.thoughtworks.qdox.model.DocletTagFactory; + import com.thoughtworks.qdox.model.JavaClass; + import com.thoughtworks.qdox.model.JavaMethod; + import com.thoughtworks.qdox.model.JavaParameter; +-import com.thoughtworks.qdox.model.Type; + + /** + * Finds EventProducer interfaces and builds the event model for them. +@@ -61,22 +59,12 @@ class EventProducerCollector { + PRIMITIVE_MAP = Collections.unmodifiableMap(m); + } + +- private DocletTagFactory tagFactory; + private List models = new java.util.ArrayList(); + + /** + * Creates a new EventProducerCollector. + */ + EventProducerCollector() { +- this.tagFactory = createDocletTagFactory(); +- } +- +- /** +- * Creates the {@link DocletTagFactory} to be used by the collector. +- * @return the doclet tag factory +- */ +- protected DocletTagFactory createDocletTagFactory() { +- return new DefaultDocletTagFactory(); + } + + /** +@@ -89,12 +77,11 @@ class EventProducerCollector { + */ + public boolean scanFile(File src) + throws IOException, EventConventionException, ClassNotFoundException { +- JavaDocBuilder builder = new JavaDocBuilder(this.tagFactory); ++ JavaProjectBuilder builder = new JavaProjectBuilder(); + builder.addSource(src); +- JavaClass[] classes = builder.getClasses(); ++ Collection classes = builder.getClasses(); + boolean eventProducerFound = false; +- for (int i = 0, c = classes.length; i < c; i++) { +- JavaClass clazz = classes[i]; ++ for (JavaClass clazz: classes) { + if (clazz.isInterface() && implementsInterface(clazz, CLASSNAME_EVENT_PRODUCER)) { + processEventProducerInterface(clazz); + eventProducerFound = true; +@@ -104,9 +91,8 @@ class EventProducerCollector { + } + + private boolean implementsInterface(JavaClass clazz, String intf) { +- JavaClass[] classes = clazz.getImplementedInterfaces(); +- for (int i = 0, c = classes.length; i < c; i++) { +- JavaClass cl = classes[i]; ++ List classes = clazz.getImplementedInterfaces(); ++ for (JavaClass cl: classes) { + if (cl.getFullyQualifiedName().equals(intf)) { + return true; + } +@@ -123,9 +109,8 @@ class EventProducerCollector { + protected void processEventProducerInterface(JavaClass clazz) + throws EventConventionException, ClassNotFoundException { + EventProducerModel prodMeta = new EventProducerModel(clazz.getFullyQualifiedName()); +- JavaMethod[] methods = clazz.getMethods(true); +- for (int i = 0, c = methods.length; i < c; i++) { +- JavaMethod method = methods[i]; ++ List methods = clazz.getMethods(true); ++ for (JavaMethod method: methods) { + EventMethodModel methodMeta = createMethodModel(method); + prodMeta.addMethod(methodMeta); + } +@@ -138,18 +123,18 @@ class EventProducerCollector { + throws EventConventionException, ClassNotFoundException { + JavaClass clazz = method.getParentClass(); + //Check EventProducer conventions +- if (!method.getReturnType().isVoid()) { ++ if (!method.getReturns().isVoid()) { + throw new EventConventionException("All methods of interface " + + clazz.getFullyQualifiedName() + " must have return type 'void'!"); + } + String methodSig = clazz.getFullyQualifiedName() + "." + method.getCallSignature(); +- JavaParameter[] params = method.getParameters(); +- if (params.length < 1) { ++ List params = method.getParameters(); ++ if (params.size() < 1) { + throw new EventConventionException("The method " + methodSig + + " must have at least one parameter: 'Object source'!"); + } +- Type firstType = params[0].getType(); +- if (firstType.isPrimitive() || !"source".equals(params[0].getName())) { ++ JavaClass firstType = params.get(0).getJavaClass(); ++ if (firstType.isPrimitive() || !"source".equals(params.get(0).getName())) { + throw new EventConventionException("The first parameter of the method " + methodSig + + " must be: 'Object source'!"); + } +@@ -164,12 +149,12 @@ class EventProducerCollector { + } + EventMethodModel methodMeta = new EventMethodModel( + method.getName(), severity); +- if (params.length > 1) { +- for (int j = 1, cj = params.length; j < cj; j++) { +- JavaParameter p = params[j]; ++ if (params.size() > 1) { ++ for (int j = 1, cj = params.size(); j < cj; j++) { ++ JavaParameter p = params.get(j); + Class type; +- JavaClass pClass = p.getType().getJavaClass(); +- if (p.getType().isPrimitive()) { ++ JavaClass pClass = p.getJavaClass(); ++ if (pClass.isPrimitive()) { + type = PRIMITIVE_MAP.get(pClass.getName()); + if (type == null) { + throw new UnsupportedOperationException( +@@ -182,10 +167,10 @@ class EventProducerCollector { + methodMeta.addParameter(type, p.getName()); + } + } +- Type[] exceptions = method.getExceptions(); +- if (exceptions != null && exceptions.length > 0) { ++ List exceptions = method.getExceptions(); ++ if (exceptions != null && exceptions.size() > 0) { + //We only use the first declared exception because that is always thrown +- JavaClass cl = exceptions[0].getJavaClass(); ++ JavaClass cl = exceptions.get(0); + methodMeta.setExceptionClass(cl.getFullyQualifiedName()); + methodMeta.setSeverity(EventSeverity.FATAL); //In case it's not set in the comments + } +-- +2.1.0 + diff --git a/clean-tarball.sh b/clean-tarball.sh index abdde65..0360298 100755 --- a/clean-tarball.sh +++ b/clean-tarball.sh @@ -27,4 +27,3 @@ tar xvf ${NAME}-${VERSION}-src.tar.gz tar czvf ${NAME}-${VERSION}-clean.tar.gz ${NAME}-${VERSION} rm -Rf ${NAME}-${VERSION}.tar.gz - diff --git a/fop-Use-sRGB.icc-color-profile-from-icc-profiles-openicc.patch b/fop-Use-sRGB.icc-color-profile-from-icc-profiles-openicc.patch deleted file mode 100644 index a40018a..0000000 --- a/fop-Use-sRGB.icc-color-profile-from-icc-profiles-openicc.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 275f22df6791135dde308f76cf4b2f7ec30f1840 Mon Sep 17 00:00:00 2001 -From: Michal Srb -Date: Fri, 12 Apr 2013 15:43:11 +0200 -Subject: [PATCH] Use sRGB.icc color profile from colord package - -It's a replacement for non-free color profile shipped with fop ---- - src/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/src/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java b/src/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java -index 60fea88..e041344 100644 ---- a/src/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java -+++ b/src/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java -@@ -21,8 +21,10 @@ package org.apache.fop.pdf; - - import java.awt.color.ColorSpace; - import java.awt.color.ICC_Profile; -+import java.io.FileNotFoundException; - import java.io.IOException; - import java.io.InputStream; -+import java.io.FileInputStream; - - import org.apache.commons.io.IOUtils; - -@@ -137,7 +139,12 @@ public class PDFICCBasedColorSpace extends PDFObject implements PDFColorSpace { - public static PDFICCStream setupsRGBColorProfile(PDFDocument pdfDoc) { - ICC_Profile profile; - PDFICCStream sRGBProfile = pdfDoc.getFactory().makePDFICCStream(); -- InputStream in = PDFDocument.class.getResourceAsStream("sRGB Color Space Profile.icm"); -+ InputStream in; -+ try { -+ in = new FileInputStream("/usr/share/color/icc/colord/sRGB.icc"); -+ } catch (FileNotFoundException e) { -+ in = null; -+ } - if (in != null) { - try { - profile = ColorProfileUtil.getICC_Profile(in); --- -1.8.1.4 - diff --git a/fop-main.patch b/fop-main.patch deleted file mode 100644 index 1726940..0000000 --- a/fop-main.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- ../../orig/fop-0.94/src/java/org/apache/fop/cli/Main.java 2007-08-18 13:56:46.000000000 -0400 -+++ src/java/org/apache/fop/cli/Main.java 2007-09-18 09:19:53.000000000 -0400 -@@ -193,11 +193,7 @@ - * @param args the command line parameters - */ - public static void main(String[] args) { -- if (checkDependencies()) { -- startFOP(args); -- } else { -- startFOPWithDynamicClasspath(args); -- } -+ startFOP(args); - } - - } diff --git a/fop.spec b/fop.spec index 4cbda22..ace14fa 100644 --- a/fop.spec +++ b/fop.spec @@ -1,48 +1,49 @@ -Name: fop -Summary: XSL-driven print formatter -Version: 1.1 -Release: 11%{?dist} +Name: fop +Summary: XSL-driven print formatter +Version: 2.0 +Release: 1%{?dist} # ASL 1.1: # several files in src/java/org/apache/fop/render/awt/viewer/resources/ # rest is ASL 2.0 -License: ASL 2.0 and ASL 1.1 -URL: http://xmlgraphics.apache.org/fop +License: ASL 2.0 and ASL 1.1 +URL: http://xmlgraphics.apache.org/fop # ./clean-tarball %%{version} -Source0: %{name}-%{version}-clean.tar.gz -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: http://www.apache.org/licenses/LICENSE-1.1.txt -Patch0: %{name}-main.patch -Patch1: %{name}-Use-sRGB.icc-color-profile-from-icc-profiles-openicc.patch -Patch2: 0001-Port-to-xmlgraphics-commons-2.0.patch -Patch3: 0002-Port-to-QDox-2.0.patch -Patch4: 0003-Disable-javadoc-doclint.patch - -BuildArch: noarch - -Requires: xmlgraphics-commons >= 1.5 -Requires: avalon-framework >= 4.1.4 -Requires: batik >= 1.7 -Requires: xalan-j2 >= 2.7.0 -Requires: xml-commons-apis >= 1.3.04 -Requires: jakarta-commons-httpclient -Requires: apache-commons-io >= 1.2 -Requires: apache-commons-logging >= 1.0.4 -Requires: java - -BuildRequires: ant -BuildRequires: java-devel -BuildRequires: apache-commons-logging -BuildRequires: apache-commons-io -BuildRequires: avalon-framework -BuildRequires: xmlgraphics-commons >= 1.5 -BuildRequires: batik -BuildRequires: servlet -BuildRequires: qdox -BuildRequires: xmlunit -BuildRequires: zip -BuildRequires: junit +Source0: %{name}-%{version}-clean.tar.gz +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: http://www.apache.org/licenses/LICENSE-1.1.txt +Patch0: 0001-Main.patch +Patch1: 0002-Use-sRGB.icc-color-profile-from-colord-package.patch +Patch2: 0003-Disable-javadoc-doclint.patch +Patch3: 0004-Port-to-QDox-2.0.patch + +BuildArch: noarch + +Requires: xmlgraphics-commons >= 1.5 +Requires: avalon-framework >= 4.1.4 +Requires: batik >= 1.7 +Requires: xalan-j2 >= 2.7.0 +Requires: xml-commons-apis >= 1.3.04 +Requires: jakarta-commons-httpclient +Requires: apache-commons-io >= 1.2 +Requires: apache-commons-logging >= 1.0.4 +Requires: fontbox +Requires: java + +BuildRequires: ant +BuildRequires: javapackages-local +BuildRequires: apache-commons-logging +BuildRequires: apache-commons-io +BuildRequires: avalon-framework +BuildRequires: xmlgraphics-commons >= 1.5 +BuildRequires: batik +BuildRequires: servlet +BuildRequires: qdox +BuildRequires: xmlunit +BuildRequires: zip +BuildRequires: junit +BuildRequires: fontbox %description FOP is the world's first print formatter driven by XSL formatting @@ -53,29 +54,29 @@ Xalan) or can be passed in memory as a DOM Document or (in the case of XT) SAX events. %package javadoc -Summary: Javadoc for %{name} +Summary: Javadoc for %{name} %description javadoc Javadoc for %{name}. %prep %setup -q -%patch0 -p0 +%patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 cp %{SOURCE4} LICENSE-1.1 -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 #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) +export CLASSPATH=$(build-classpath apache-commons-logging apache-commons-io \ + fontbox 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 @@ -119,6 +120,9 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %changelog +* Tue Jul 14 2015 Michael Simacek - 2.0-1 +- Update to upstream version 2.0 + * Wed Jun 17 2015 Fedora Release Engineering - 1.1-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 1887526..0e607c2 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ -0eaef1991f1dbc1fcfb238c918cecbf3 fop-1.1-clean.tar.gz +be48a90731a82b8e752a6460f544290d fop-2.0-clean.tar.gz +3e6fd7f8ae8da63b6ff8f13bf09f0ae6 fop-2.0.pom 92afa66b413bb09a3bbd590091a836f5 LICENSE-1.1.txt