From 0e68d521474916928c854a7b3a82fcecd0ef82cb4a4722e61d50bc2a49893805 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 8 Mar 2016 12:32:37 +0000 Subject: [PATCH] Accepting request 368070 from home:favogt:branches:Java:packages - Fix manpage for xmlgraphics-fop-fontmetrics - Update to fop 2.1 - https://xmlgraphics.apache.org/fop/changes.html#version_2.1 - Remove upstreamed fop-commons-2.0.patch and xmlgraphics-fop-xconf.patch - Add hyphenation-more-stack.patch to fix build with offo 2.2 OBS-URL: https://build.opensuse.org/request/show/368070 OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmlgraphics-fop?expand=0&rev=49 --- fop-1.1-src.tar.gz | 3 --- fop-2.1-src.tar.gz | 3 +++ fop-commons-2.0.patch | 42 ------------------------------- hyphenation-more-stack.patch | 17 +++++++++++++ offo-hyphenation.zip | 3 +++ offo-hyphenation_v2.0.zip | 3 --- xmlgraphics-fop-fontmetrics.xml | 2 +- xmlgraphics-fop-pom-template.pom | 24 +++++++++--------- xmlgraphics-fop-xconf.patch | 10 -------- xmlgraphics-fop.changes | 14 +++++++++++ xmlgraphics-fop.spec | 43 ++++++++++++++------------------ 11 files changed, 69 insertions(+), 95 deletions(-) delete mode 100644 fop-1.1-src.tar.gz create mode 100644 fop-2.1-src.tar.gz delete mode 100644 fop-commons-2.0.patch create mode 100644 hyphenation-more-stack.patch create mode 100644 offo-hyphenation.zip delete mode 100644 offo-hyphenation_v2.0.zip delete mode 100644 xmlgraphics-fop-xconf.patch diff --git a/fop-1.1-src.tar.gz b/fop-1.1-src.tar.gz deleted file mode 100644 index 8eedf10..0000000 --- a/fop-1.1-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:58164cb3298d130522ecd445b8082c71c36242ea6464c8f02ab4157e4a332522 -size 24513986 diff --git a/fop-2.1-src.tar.gz b/fop-2.1-src.tar.gz new file mode 100644 index 0000000..42fe794 --- /dev/null +++ b/fop-2.1-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e5af1d81df8f9fab8aa473e6a1c1407c1bf1c3d327df9b04c3861e8247e8b998 +size 23308630 diff --git a/fop-commons-2.0.patch b/fop-commons-2.0.patch deleted file mode 100644 index 8c27ca7..0000000 --- a/fop-commons-2.0.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 07f112a532b277e6ebada50f8654b3aacb8e9a47 Mon Sep 17 00:00:00 2001 -From: Simon Steiner -Date: Thu, 21 Aug 2014 14:42:22 +0000 -Subject: [PATCH] FOP-2353: PDF-A preflight warnings - -git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1619415 13f79535-47bb-0310-9956-ffa450edef68 ---- - .../apache/fop/render/pdf/PDFRenderingUtil.java | 8 +++++++- - .../fop/render/pdf/PDFStructureTreeBuilder.java | 16 ++++++++++++++-- - 3 files changed, 21 insertions(+), 3 deletions(-) - -Index: fop-1.1/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java -=================================================================== ---- fop-1.1.orig/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java -+++ fop-1.1/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java -@@ -25,6 +25,7 @@ import java.io.IOException; - import java.io.InputStream; - import java.io.OutputStream; - import java.net.URL; -+import java.util.ArrayList; - import java.util.Map; - - import javax.xml.transform.Source; -@@ -37,6 +38,7 @@ import org.apache.commons.logging.LogFac - import org.apache.xmlgraphics.image.loader.util.ImageUtil; - import org.apache.xmlgraphics.java2d.color.profile.ColorProfileUtil; - import org.apache.xmlgraphics.xmp.Metadata; -+import org.apache.xmlgraphics.xmp.schemas.DublinCoreSchema; - import org.apache.xmlgraphics.xmp.schemas.XMPBasicAdapter; - import org.apache.xmlgraphics.xmp.schemas.XMPBasicSchema; - -@@ -352,8 +354,8 @@ class PDFRenderingUtil implements PDFCon - public void renderXMPMetadata(XMPMetadata metadata) { - 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); -+ ArrayList exclude = new ArrayList(); -+ fopXMP.mergeInto(docXMP, exclude); - XMPBasicAdapter xmpBasic = XMPBasicSchema.getAdapter(docXMP); - //Metadata was changed so update metadata date - xmpBasic.setMetadataDate(new java.util.Date()); diff --git a/hyphenation-more-stack.patch b/hyphenation-more-stack.patch new file mode 100644 index 0000000..db77da2 --- /dev/null +++ b/hyphenation-more-stack.patch @@ -0,0 +1,17 @@ +--- + build.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: fop-2.1/build.xml +=================================================================== +--- fop-2.1.orig/build.xml ++++ fop-2.1/build.xml +@@ -181,7 +181,7 @@ list of possible build targets. + + + +- ++ + + + diff --git a/offo-hyphenation.zip b/offo-hyphenation.zip new file mode 100644 index 0000000..82b26af --- /dev/null +++ b/offo-hyphenation.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df0b863a2ef269ac7defd497f74da54480cd2c03ad665304e7c05334ab3f289f +size 883080 diff --git a/offo-hyphenation_v2.0.zip b/offo-hyphenation_v2.0.zip deleted file mode 100644 index ed8f393..0000000 --- a/offo-hyphenation_v2.0.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:79d341820583aa5b77ee00dc7da59bfafb92adceb88c7a1922fe300a90a22c4e -size 858046 diff --git a/xmlgraphics-fop-fontmetrics.xml b/xmlgraphics-fop-fontmetrics.xml index a92e507..0917e4d 100644 --- a/xmlgraphics-fop-fontmetrics.xml +++ b/xmlgraphics-fop-fontmetrics.xml @@ -2,7 +2,7 @@ + ]> diff --git a/xmlgraphics-fop-pom-template.pom b/xmlgraphics-fop-pom-template.pom index c5bdbd3..381e368 100644 --- a/xmlgraphics-fop-pom-template.pom +++ b/xmlgraphics-fop-pom-template.pom @@ -75,32 +75,32 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.xmlgraphics xmlgraphics-commons - 1.5 + 2.1 org.apache.xmlgraphics batik-svg-dom - 1.7 + 1.8 org.apache.xmlgraphics batik-bridge - 1.7 + 1.8 org.apache.xmlgraphics batik-awt-util - 1.7 + 1.8 org.apache.xmlgraphics batik-gvt - 1.7 + 1.8 org.apache.xmlgraphics batik-transcoder - 1.7 + 1.8 org.apache.xmlgraphics @@ -111,12 +111,12 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.xmlgraphics batik-extension - 1.7 + 1.8 org.apache.xmlgraphics batik-ext - 1.7 + 1.8 @@ -132,12 +132,12 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.avalon.framework avalon-framework-api - 4.2.0 + 4.3.1 - + org.apache.avalon.framework avalon-framework-impl - 4.2.0 + 4.3.1 javax.servlet @@ -148,7 +148,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> xalan xalan - 2.7.0 + 2.7.2 provided diff --git a/xmlgraphics-fop-xconf.patch b/xmlgraphics-fop-xconf.patch deleted file mode 100644 index f8ec029..0000000 --- a/xmlgraphics-fop-xconf.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- fop-1.1.orig/conf/fop.xconf 2012-11-11 10:53:23.000000000 +0400 -+++ fop-1.1/conf/fop.xconf 2012-12-09 10:57:56.000000000 +0400 -@@ -78,6 +78,7 @@ - - - --> -+ - - - diff --git a/xmlgraphics-fop.changes b/xmlgraphics-fop.changes index 0491b2e..a96f905 100644 --- a/xmlgraphics-fop.changes +++ b/xmlgraphics-fop.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Tue Mar 8 08:52:41 UTC 2016 - fvogt@suse.com + +- Fix manpage for xmlgraphics-fop-fontmetrics + +------------------------------------------------------------------- +Thu Mar 3 12:05:58 UTC 2016 - fvogt@suse.com + +- Update to fop 2.1 + - https://xmlgraphics.apache.org/fop/changes.html#version_2.1 +- Remove upstreamed fop-commons-2.0.patch + and xmlgraphics-fop-xconf.patch +- Add hyphenation-more-stack.patch to fix build with offo 2.2 + ------------------------------------------------------------------- Wed Mar 18 09:46:25 UTC 2015 - tchvatal@suse.com diff --git a/xmlgraphics-fop.spec b/xmlgraphics-fop.spec index 2d13609..b896c7e 100644 --- a/xmlgraphics-fop.spec +++ b/xmlgraphics-fop.spec @@ -1,7 +1,7 @@ # # spec file for package xmlgraphics-fop # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2000-2008, JPackage Project # # All modifications and additions to the file contributed by third parties @@ -19,30 +19,29 @@ %define bname fop Name: xmlgraphics-fop -Version: 1.1 +Version: 2.1 Release: 0 Summary: Formatter for Printing XSLT Processed XML Files License: Apache-2.0 Group: Productivity/Publishing/XML Url: http://xmlgraphics.apache.org/fop/ -Source0: http://ftp.halifax.rwth-aachen.de/apache/xmlgraphics/fop/source/fop-1.1-src.tar.gz +Source0: http://ftp.halifax.rwth-aachen.de/apache/xmlgraphics/fop/source/fop-2.1-src.tar.gz #FIX-OPENSUSE: add xmlgraphics-commons to classpath Source1: %{name}.script -Source2: http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-1_1/xmlgraphics-fop-pom-template.pom +Source2: http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-2_1/xmlgraphics-fop-pom-template.pom Source3: %{name}-fontmetrics.script Source4: %{name}-fontlist.script -Source5: http://heanet.dl.sourceforge.net/project/offo/offo-hyphenation/2.0/offo-hyphenation_v2.0.zip +Source5: http://heanet.dl.sourceforge.net/project/offo/offo-hyphenation/2.2/offo-hyphenation.zip # Manpage(s) Source10: %{name}.xml Source11: %{name}-fontmetrics.xml Source12: %{name}-fontlist.xml Patch1: xmlgraphics-fop-cli.patch -Patch2: xmlgraphics-fop-xconf.patch -# PATCH-FIX-UPSTREAM: build with xmlgraphics-commons-2.0 -Patch3: fop-commons-2.0.patch +Patch2: hyphenation-more-stack.patch BuildRequires: ant >= 1.6.5 BuildRequires: apache-commons-io >= 2.4 BuildRequires: apache-commons-logging +BuildRequires: apache-pdfbox BuildRequires: avalon-framework BuildRequires: docbook-xsl-stylesheets BuildRequires: gpg2 @@ -53,16 +52,17 @@ BuildRequires: qdox >= 1.12 BuildRequires: servlet_api BuildRequires: unzip BuildRequires: xml-commons-jaxp-1.3-apis -BuildRequires: xmlgraphics-batik -BuildRequires: xmlgraphics-commons >= 1.5 +BuildRequires: xmlgraphics-batik >= 1.8 +BuildRequires: xmlgraphics-commons >= 2.1 Requires: apache-commons-io >= 2.4 Requires: apache-commons-logging +Requires: apache-pdfbox Requires: avalon-framework Requires: java >= 1.6.0 Requires: javapackages-tools Requires: xml-commons-jaxp-1.3-apis -Requires: xmlgraphics-batik -Requires: xmlgraphics-commons >= 1.5 +Requires: xmlgraphics-batik >= 1.8 +Requires: xmlgraphics-commons >= 2.1 Requires(post): javapackages-tools Requires(postun): javapackages-tools #!BuildIgnore: saxon @@ -84,8 +84,7 @@ representation), Print, AWT, MIF, and TXT. ln -thyph offo-hyphenation/hyph/*.xml find -name "*.jar" | xargs -t rm %patch1 -p1 -b .cli -%patch2 -p1 -b .cli -%patch3 -p1 -b .xml2 +%patch2 -p1 cp %{SOURCE2} %{SOURCE3} %{SOURCE4} . # Replace keyword "VERSION" in XML files with the real one: @@ -98,6 +97,7 @@ pushd lib ln -s $(build-classpath avalon-framework) ln -s $(build-classpath commons-io) ln -s $(build-classpath commons-logging) +ln -s $(build-classpath fontbox) ln -s $(build-classpath servlet_api) ln -s $(build-classpath xml-commons-jaxp-1.3-apis) ln -s $(build-classpath xml-commons-jaxp-1.3-apis-ext) @@ -120,13 +120,8 @@ ln -s $(build-classpath xmlgraphics-commons) ln -s $(build-classpath qdox) popd export CLASSPATH= LANG=en_US.UTF-8 -export OPT_JAR_LIST=`cat %{_sysconfdir}/ant.d/trax` -ant \ - -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \ - package \ - maven-artifacts +ant package maven-artifacts -# false # Build the manpage(s) and HTML DB=%{_datadir}/xml/docbook/stylesheet/nwalsh/current for m in %{SOURCE10} %{SOURCE11} %{SOURCE12}; do @@ -178,15 +173,15 @@ popd %files %defattr(0644,root,root,0755) -%doc NOTICE LICENSE README known-issues.xml status.xml +%doc NOTICE LICENSE README known-issues.xml %doc *.html %attr(0755,root,root) %{_bindir}/%{name} -%attr(0755,root,root) %{_bindir}/%{bname} +%{_bindir}/%{bname} %attr(0755,root,root) %{_bindir}/%{name}-fontmetrics -%attr(0755,root,root) %{_bindir}/%{bname}-fontmetrics +%{_bindir}/%{bname}-fontmetrics %attr(0755,root,root) %{_bindir}/%{name}-fontlist -%attr(0755,root,root) %{_bindir}/%{bname}-fontlist +%{_bindir}/%{bname}-fontlist %{_javadir}/%{name}.jar %{_datadir}/%{name} %{_mavenpomdir}/*