Accepting request 1250478 from Java:packages

more reproducible changes

OBS-URL: https://build.opensuse.org/request/show/1250478
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xmlgraphics-fop?expand=0&rev=53

ioexception.patch

@@ -1,36 +0,0 @@
-diff -urEbwB fop-2.10.orig/fop-core/src/main/java/org/apache/fop/pdf/PDFOutputIntent.java fop-2.10/fop-core/src/main/java/org/apache/fop/pdf/PDFOutputIntent.java
---- fop-2.10.orig/fop-core/src/main/java/org/apache/fop/pdf/PDFOutputIntent.java	2026-02-06 15:00:51.925506699 +0100
-+++ fop-2.10/fop-core/src/main/java/org/apache/fop/pdf/PDFOutputIntent.java	2026-02-06 15:01:50.805544209 +0100
-@@ -130,7 +130,6 @@
-     /** {@inheritDoc} */
-     public byte[] toPDF() {
-         ByteArrayOutputStream bout = new ByteArrayOutputStream(128);
--        try {
-             bout.write(encode("<<\n"));
-             bout.write(encode("/Type /OutputIntent\n"));
- 
-@@ -165,9 +164,6 @@
-             }
- 
-             bout.write(encode(">>"));
--        } catch (IOException ioe) {
--            log.error("Ignored I/O exception", ioe);
--        }
-         byte[] bytes = bout.toByteArray();
-         IOUtils.closeQuietly(bout);
-         return bytes;
-diff -urEbwB fop-2.10.orig/fop-core/src/main/java/org/apache/fop/render/pdf/AbstractImageAdapter.java fop-2.10/fop-core/src/main/java/org/apache/fop/render/pdf/AbstractImageAdapter.java
---- fop-2.10.orig/fop-core/src/main/java/org/apache/fop/render/pdf/AbstractImageAdapter.java	2026-02-06 15:00:51.933619573 +0100
-+++ fop-2.10/fop-core/src/main/java/org/apache/fop/render/pdf/AbstractImageAdapter.java	2026-02-06 15:05:54.463586122 +0100
-@@ -261,11 +261,7 @@
-         isDeviceGray = Arrays.equals(reds, blues) && Arrays.equals(blues, greens);
-         if  (isDeviceGray) {
-             indexed.add(new PDFName("DeviceGray"));
--            try {
-                 baout.write(blues);
--            } catch (IOException e) {
--                e.printStackTrace();
--            }
-         }  else {
-             indexed.add(new PDFName(toPDFColorSpace(icm.getColorSpace()).getName()));
-             for (int i = 0; i < c; i++) {

xmlgraphics-fop.changes

@@ -1,10 +1,3 @@
--------------------------------------------------------------------
-Fri Feb  6 14:08:26 UTC 2026 - Fridrich Strba <fstrba@suse.com>
-
-- Added patch
-  * ioexception.patch
-    + fix build with commons-io >= 2.19
-
 -------------------------------------------------------------------
 Wed Mar  5 17:50:56 UTC 2025 - Fridrich Strba <fstrba@suse.com>
 

xmlgraphics-fop.spec

@@ -43,14 +43,13 @@ Patch4:         encoding.patch
 Patch5:         reproducible-build-manifest.patch
 Patch6:         fop-2.10-QDox-2.0.patch
 Patch7:         reproducible.patch
-Patch8:         ioexception.patch
-Patch9:         java8-compatibility.patch
+Patch8:         java8-compatibility.patch
 BuildRequires:  ant >= 1.9.15
 BuildRequires:  apache-pdfbox >= 2.0.23
 BuildRequires:  bouncycastle
 BuildRequires:  bouncycastle-pkix
 BuildRequires:  bouncycastle-util
-BuildRequires:  commons-io >= 2.19
+BuildRequires:  commons-io >= 2.4
 BuildRequires:  commons-logging
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  jakarta-servlet
@@ -88,9 +87,8 @@ find -name "*.jar" | xargs -t rm
 %patch -P 5 -p1
 %patch -P 6 -p1
 %patch -P 7 -p1
-%patch -P 8 -p1
 %if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
-%patch -P 9 -p1
+%patch -P 8 -p1
 %endif
 
 # Replace keyword "VERSION" in XML files with the real one: