From cb5c769f6359fd0160f2f0c360ac6b729c3f07f79724da000a2a882f81e6f821 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Thu, 4 Jun 2020 05:29:15 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/xmlgraphics-fop?expand=0&rev=97

---
 xmlgraphics-fop.changes | 22 ++++++++++++++++++++++
 xmlgraphics-fop.spec    | 11 ++++-------
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/xmlgraphics-fop.changes b/xmlgraphics-fop.changes
index 3db0d13..1bd38fe 100644
--- a/xmlgraphics-fop.changes
+++ b/xmlgraphics-fop.changes
@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Thu Jun  4 05:13:44 UTC 2020 - Fridrich Strba <fstrba@suse.com>
+
+- version 2.5
+  * Does not need avalon-framework to build or run
+  * Adapt the command-line scripts by removing avalon-framework
+    from classpath
+  * Build against fontbox from apache-pdfbox >= 2
+  * Use the included pom file instead of downloading the same
+    file from maven central
+- Removed patch:
+  * fop-2.1-batik-xmlconstants.patch
+    + Included directly in this version. Requires batik >= 1.11
+- Modified patches:
+  * fop-2.1-QDox-2.0.patch -> fop-2.5-QDox-2.0.patch
+  * fix-javadoc-java8.patch
+  * hyphenation-more-stack.patch
+  * java8-compatibility.patch
+  * reproducible-build-manifest.patch
+  * xmlgraphics-fop-cli.patch
+    + Port to fop 2.5
+
 -------------------------------------------------------------------
 Mon May 18 14:41:12 UTC 2020 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/xmlgraphics-fop.spec b/xmlgraphics-fop.spec
index 85d9629..2969e9f 100644
--- a/xmlgraphics-fop.spec
+++ b/xmlgraphics-fop.spec
@@ -85,11 +85,8 @@ representation), Print, AWT, MIF, and TXT.
 
 %prep
 %setup -q -n %{bname}-%{version} -a1
-ln -tfop/hyph offo-hyphenation/hyph/*.xml
+ln -t fop/hyph offo-hyphenation/hyph/*.xml
 find -name "*.jar" | xargs -t rm
-# Remove this file. It needs jai and we don't compile it.
-# Just javadoc chokes on it.
-# rm src/java/org/apache/fop/util/bitmap/JAIMonochromeBitmapConverter.java
 %patch1 -p1 -b .cli
 %patch2 -p1
 %patch3 -p1
@@ -135,15 +132,15 @@ build-jar-repository -s fop/lib \
         fontbox \
         glassfish-servlet-api \
         batik-all \
-		xml-commons-apis \
-		xml-commons-apis-ext \
+        xml-commons-apis \
+        xml-commons-apis-ext \
         xmlgraphics-commons \
         qdox
 
 export CLASSPATH= LANG=en_US.UTF-8
 %{ant} -f fop/build.xml \
     -Djavac.source=1.8 -Djavac.target=1.8 \
-	package
+    package
 
 # Build the manpage(s) and HTML
 DB=%{_datadir}/xml/docbook/stylesheet/nwalsh/current