From 0d291f6ecf6e863629607d840f0eab04ecfceb3d Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 10 Nov 2022 10:29:06 -0600 Subject: [PATCH] 2.8 --- sources | 2 +- test.patch | 21 +++++++++++++++++++++ xmlgraphics-commons.spec | 10 ++++++++-- 3 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 test.patch diff --git a/sources b/sources index 96f98e0..ef74ff3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmlgraphics-commons-2.7-src.tar.gz) = 7d3993fc920767512f94edef3342757f0ffc9c9dbad80695fe3d77b0ec162380d9b467682ae41238e7ee719601709edb41b2dab06c385dfd9fa898577d8d2c22 +SHA512 (xmlgraphics-commons-2.8-src.tar.gz) = 3e6c397a7444c4ce1d1aeda96a7c9abfd3d8d57a0997d7d6ae2be36303dd17550b7b92fd86eac832566bbeefccdd06619e31c0d907cd6b953a8eb934d7fa618b diff --git a/test.patch b/test.patch new file mode 100644 index 0000000..450e1dd --- /dev/null +++ b/test.patch @@ -0,0 +1,21 @@ +--- xmlgraphics/commons/trunk/src/test/java/org/apache/xmlgraphics/image/loader/CorruptImagesTestCase.java 2022/10/06 12:37:37 1904425 ++++ xmlgraphics/commons/trunk/src/test/java/org/apache/xmlgraphics/image/loader/CorruptImagesTestCase.java 2022/11/10 08:15:05 1905215 +@@ -36,9 +36,14 @@ + + ImageSessionContext sessionContext = imageContext.newSessionContext(); + ImageManager manager = imageContext.getImageManager(); +- +- ImageInfo imageInfo = manager.preloadImage(uri, sessionContext); +- assertEquals(imageInfo.getMimeType(), "image/png"); ++ try { ++ ImageInfo imageInfo = manager.preloadImage(uri, sessionContext); ++ //IOException should continue to raw png ++ assertEquals(imageInfo.getMimeType(), "image/png"); ++ } catch (Exception e) { ++ //Otherwise should throw exception ++ assertEquals(e.getMessage(), "pos < flushedPos!"); ++ } + } + + } + diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec index 8fa7ee0..1ce524f 100644 --- a/xmlgraphics-commons.spec +++ b/xmlgraphics-commons.spec @@ -1,12 +1,13 @@ Name: xmlgraphics-commons -Version: 2.7 -Release: 4%{?dist} +Version: 2.8 +Release: 1%{?dist} Epoch: 0 Summary: XML Graphics Commons License: ASL 2.0 URL: http://xmlgraphics.apache.org/ Source0: http://archive.apache.org/dist/xmlgraphics/commons/source/xmlgraphics-commons-%{version}-src.tar.gz +Patch0: test.patch BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -37,6 +38,8 @@ This package contains API documentation for %{name}. %prep %setup -q %{name}-%{version} +%patch0 -p3 + find -name "*.jar" -delete # Disable plugins not needed for RPM build @@ -68,6 +71,9 @@ find -name "*.jar" -delete %license LICENSE NOTICE %changelog +* Wed Nov 09 2022 Gwyn Ciesla - 0:2.8-1 +- 2.8 + * Sat Jul 23 2022 Fedora Release Engineering - 0:2.7-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild