diff --git a/fop-2.6-src.tar.gz b/fop-2.6-src.tar.gz deleted file mode 100644 index 48be781..0000000 --- a/fop-2.6-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:084fa6c9d0a3cc7b76502f69579ba52495a7390cb86341c6aa8b54c006bcb890 -size 27478217 diff --git a/fop-2.7-src.tar.gz b/fop-2.7-src.tar.gz new file mode 100644 index 0000000..dc522c5 --- /dev/null +++ b/fop-2.7-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b4f1a5212989cebc7d17c7275fbd23de73cc57259d9288c01436556254ad86d4 +size 26799877 diff --git a/update-2.7.patch b/update-2.7.patch new file mode 100644 index 0000000..bb7a09d --- /dev/null +++ b/update-2.7.patch @@ -0,0 +1,10 @@ +--- fop-2.7/fop-core/src/main/java/org/apache/fop/render/afp/AFPImageHandlerRawStream.java ++++ fop-2.7/fop-core/src/main/java/org/apache/fop/render/afp/AFPImageHandlerRawStream.java +@@ -44,7 +44,6 @@ + ImageFlavor.RAW_JPEG, + ImageFlavor.RAW_TIFF, + ImageFlavor.RAW_EPS, +- ImageFlavor.RAW_PDF + }; + + /** logging instance */ diff --git a/xmlgraphics-fop.changes b/xmlgraphics-fop.changes index 84280cd..c4b04fc 100644 --- a/xmlgraphics-fop.changes +++ b/xmlgraphics-fop.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Jan 28 12:52:15 UTC 2022 - Quang Tran + +- version 2.7 + * Allow to embed native PDF in AFP +- Added patch: + * update-2.7.patch + ------------------------------------------------------------------- Sun Jan 24 18:01:22 UTC 2021 - Fridrich Strba diff --git a/xmlgraphics-fop.spec b/xmlgraphics-fop.spec index a78332f..131b1f6 100644 --- a/xmlgraphics-fop.spec +++ b/xmlgraphics-fop.spec @@ -1,7 +1,7 @@ # # spec file for package xmlgraphics-fop # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # Copyright (c) 2000-2008, JPackage Project # # All modifications and additions to the file contributed by third parties @@ -19,13 +19,13 @@ %define bname fop Name: xmlgraphics-fop -Version: 2.6 +Version: 2.7 Release: 0 Summary: Formatter for Printing XSLT Processed XML Files License: Apache-2.0 Group: Productivity/Publishing/XML URL: https://xmlgraphics.apache.org/fop/ -Source0: https://ftp.halifax.rwth-aachen.de/apache/xmlgraphics/fop/source/fop-%{version}-src.tar.gz +Source0: https://dlcdn.apache.org/xmlgraphics/fop/source/fop-%{version}-src.tar.gz Source1: https://download.sourceforge.net/project/offo/offo-hyphenation/2.2/offo-hyphenation.zip #FIX-OPENSUSE: add xmlgraphics-commons to classpath Source2: %{name}.script @@ -43,8 +43,9 @@ Patch4: java8-compatibility.patch Patch5: reproducible-build-manifest.patch Patch6: fop-2.5-QDox-2.0.patch Patch7: reproducible.patch -BuildRequires: ant >= 1.8.4 -BuildRequires: apache-pdfbox >= 2.0 +Patch8: update-2.7.patch +BuildRequires: ant >= 1.9.15 +BuildRequires: apache-pdfbox >= 2.0.23 BuildRequires: commons-io >= 2.4 BuildRequires: commons-logging BuildRequires: docbook-xsl-stylesheets @@ -55,8 +56,8 @@ BuildRequires: libxslt BuildRequires: qdox >= 2.0 BuildRequires: unzip BuildRequires: xml-commons-apis -BuildRequires: xmlgraphics-batik >= 1.11 -BuildRequires: xmlgraphics-commons >= 2.1 +BuildRequires: xmlgraphics-batik >= 1.14 +BuildRequires: xmlgraphics-commons >= 2.6 #!BuildIgnore: saxon Requires: java >= 1.8 Requires: xml-commons-apis @@ -64,13 +65,13 @@ Requires: mvn(com.thoughtworks.qdox:qdox) >= 2.0 Requires: mvn(commons-io:commons-io) Requires: mvn(commons-logging:commons-logging) Requires: mvn(javax.servlet:servlet-api) -Requires: mvn(org.apache.pdfbox:fontbox) >= 2.0 -Requires: mvn(org.apache.xmlgraphics:batik-anim) >= 1.11 -Requires: mvn(org.apache.xmlgraphics:batik-awt-util) >= 1.11 -Requires: mvn(org.apache.xmlgraphics:batik-bridge) >= 1.11 -Requires: mvn(org.apache.xmlgraphics:batik-extension) >= 1.11 -Requires: mvn(org.apache.xmlgraphics:batik-gvt) >= 1.11 -Requires: mvn(org.apache.xmlgraphics:batik-transcoder) >= 1.11 +Requires: mvn(org.apache.pdfbox:fontbox) >= 2.0.0 +Requires: mvn(org.apache.xmlgraphics:batik-anim) >= 1.14 +Requires: mvn(org.apache.xmlgraphics:batik-awt-util) >= 1.14 +Requires: mvn(org.apache.xmlgraphics:batik-bridge) >= 1.14 +Requires: mvn(org.apache.xmlgraphics:batik-extension) >= 1.14 +Requires: mvn(org.apache.xmlgraphics:batik-gvt) >= 1.14 +Requires: mvn(org.apache.xmlgraphics:batik-transcoder) >= 1.14 Requires: mvn(org.apache.xmlgraphics:xmlgraphics-commons) Provides: %{bname} = %{version}-%{release} Obsoletes: %{bname} < %{version}-%{release} @@ -95,6 +96,7 @@ find -name "*.jar" | xargs -t rm %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 # Replace keyword "VERSION" in XML files with the real one: for x in %{SOURCE10} %{SOURCE11} %{SOURCE12}; do @@ -118,14 +120,14 @@ done %pom_add_dep commons-io:commons-io:1.3.1 fop %pom_add_dep commons-logging:commons-logging:1.0.4 fop %pom_add_dep javax.servlet:servlet-api:2.2 fop -%pom_add_dep org.apache.pdfbox:fontbox:2.0.16 fop -%pom_add_dep org.apache.xmlgraphics:batik-anim:1.13 fop -%pom_add_dep org.apache.xmlgraphics:batik-awt-util:1.13 fop -%pom_add_dep org.apache.xmlgraphics:batik-bridge:1.13 fop -%pom_add_dep org.apache.xmlgraphics:batik-extension:1.13 fop -%pom_add_dep org.apache.xmlgraphics:batik-gvt:1.13 fop -%pom_add_dep org.apache.xmlgraphics:batik-transcoder:1.13 fop -%pom_add_dep org.apache.xmlgraphics:xmlgraphics-commons:2.4 fop +%pom_add_dep org.apache.pdfbox:fontbox:2.0 fop +%pom_add_dep org.apache.xmlgraphics:batik-anim:1.14 fop +%pom_add_dep org.apache.xmlgraphics:batik-awt-util:1.14 fop +%pom_add_dep org.apache.xmlgraphics:batik-bridge:1.14 fop +%pom_add_dep org.apache.xmlgraphics:batik-extension:1.14 fop +%pom_add_dep org.apache.xmlgraphics:batik-gvt:1.14 fop +%pom_add_dep org.apache.xmlgraphics:batik-transcoder:1.14 fop +%pom_add_dep org.apache.xmlgraphics:xmlgraphics-commons:2.6 fop %build build-jar-repository -s fop/lib \