From dcd864b2ca7c663c65614aa888b3f27cd184676c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:01:02 +0000 Subject: [PATCH 1/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- xmlgraphics-commons.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec index c193549..33ddcd6 100644 --- a/xmlgraphics-commons.spec +++ b/xmlgraphics-commons.spec @@ -1,6 +1,6 @@ Name: xmlgraphics-commons Version: 2.10 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 0 Summary: XML Graphics Commons @@ -67,6 +67,9 @@ find -name "*.jar" -delete %license LICENSE NOTICE %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 0:2.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Oct 09 2024 Gwyn Ciesla - 0:2.10-1 - 2.10 From 49082124daf51c39a3eec2c78cb30be9d85a0476 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 6 May 2025 08:37:54 -0500 Subject: [PATCH 2/8] 2.11 --- sources | 2 +- xmlgraphics-commons.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 854c9d9..1bba186 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmlgraphics-commons-2.10-src.tar.gz) = 49b055891e6b76f3c357b616c34f152033ccf807432d55dd57ac83c41234c224d1a716f77ae7ef24ff49d9f376dfa6b161cde18b258d94438a467a4ad91be21d +SHA512 (xmlgraphics-commons-2.11-src.tar.gz) = 2249a1ca0ee26522d0a8f34af96791611dfe849278ad98b2f5a571fde662a8eef7f2594f6929f2414f57e0bcd286ed14192471556fb29c9355cb046e9c806e0c diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec index 33ddcd6..fff8141 100644 --- a/xmlgraphics-commons.spec +++ b/xmlgraphics-commons.spec @@ -1,6 +1,6 @@ Name: xmlgraphics-commons -Version: 2.10 -Release: 2%{?dist} +Version: 2.11 +Release: 1%{?dist} Epoch: 0 Summary: XML Graphics Commons @@ -67,6 +67,9 @@ find -name "*.jar" -delete %license LICENSE NOTICE %changelog +* Tue May 06 2025 Gwyn Ciesla - 0:2.11-1 +- 2.11 + * Sun Jan 19 2025 Fedora Release Engineering - 0:2.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From dc210a2588873c32af24950304ced624207b1461 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:55:57 +0000 Subject: [PATCH 3/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- xmlgraphics-commons.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec index fff8141..23a9805 100644 --- a/xmlgraphics-commons.spec +++ b/xmlgraphics-commons.spec @@ -1,6 +1,6 @@ Name: xmlgraphics-commons Version: 2.11 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 0 Summary: XML Graphics Commons @@ -67,6 +67,9 @@ find -name "*.jar" -delete %license LICENSE NOTICE %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 0:2.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue May 06 2025 Gwyn Ciesla - 0:2.11-1 - 2.11 From 98aabbc2352a3d29ae65981cc5b138e02c038104 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 30 Jul 2025 01:32:34 +0200 Subject: [PATCH 4/8] Rebuilt for java-25-openjdk as preffered jdk https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk Note, that since f43, you should be always explicit on what jdk to use. This commit should do exactly that. --- xmlgraphics-commons.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec index 23a9805..0aca704 100644 --- a/xmlgraphics-commons.spec +++ b/xmlgraphics-commons.spec @@ -1,6 +1,6 @@ Name: xmlgraphics-commons Version: 2.11 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 0 Summary: XML Graphics Commons @@ -11,7 +11,7 @@ Source0: http://archive.apache.org/dist/xmlgraphics/commons/source/xmlgra BuildArch: noarch ExclusiveArch: %{java_arches} noarch -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(commons-io:commons-io) BuildRequires: mvn(commons-logging:commons-logging) BuildRequires: mvn(junit:junit) @@ -67,6 +67,9 @@ find -name "*.jar" -delete %license LICENSE NOTICE %changelog +* Tue Jul 29 2025 jiri vanek - 0:2.11-3 +- Rebuilt for java-25-openjdk as preffered jdk + * Fri Jul 25 2025 Fedora Release Engineering - 0:2.11-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From c6ac148320c3440d413c0ec4d2a46351df42e2c9 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 30 Jul 2025 14:12:38 +0200 Subject: [PATCH 5/8] Rrevert to jdk21 during rebuild for https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk your package failed to build. Is preemptively reverted back to versioned jdk21 --- xmlgraphics-commons.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec index 0aca704..5b25fe2 100644 --- a/xmlgraphics-commons.spec +++ b/xmlgraphics-commons.spec @@ -1,6 +1,6 @@ Name: xmlgraphics-commons Version: 2.11 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 0 Summary: XML Graphics Commons @@ -11,7 +11,7 @@ Source0: http://archive.apache.org/dist/xmlgraphics/commons/source/xmlgra BuildArch: noarch ExclusiveArch: %{java_arches} noarch -BuildRequires: maven-local-openjdk25 +BuildRequires: maven-local-openjdk21 BuildRequires: mvn(commons-io:commons-io) BuildRequires: mvn(commons-logging:commons-logging) BuildRequires: mvn(junit:junit) @@ -67,6 +67,9 @@ find -name "*.jar" -delete %license LICENSE NOTICE %changelog +* Wed Jul 30 2025 jiri vanek - 0:2.11-4 +- Rrevert to jdk21 + * Tue Jul 29 2025 jiri vanek - 0:2.11-3 - Rebuilt for java-25-openjdk as preffered jdk From a25361ce60201aa50e74996b6a83f7c67e0f4a05 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 6 Jan 2026 10:33:17 +0100 Subject: [PATCH 6/8] Migrated to jdk25 --- jdk25.patch | 12 ++++++++++++ xmlgraphics-commons.spec | 7 ++++--- 2 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 jdk25.patch diff --git a/jdk25.patch b/jdk25.patch new file mode 100644 index 0000000..2b6713a --- /dev/null +++ b/jdk25.patch @@ -0,0 +1,12 @@ +--- xmlgraphics-commons-2.11/src/main/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderRawJPEG.java ++++ xmlgraphics-commons-2.11/src/main/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderRawJPEG.java +@@ -228,7 +228,7 @@ + if (padding != 0) { + try { + iccStream.write(new byte[padding]); +- } catch (IOException ioe) { ++ } catch (Exception ioe) { + throw new IOException("Error while aligning ICC stream: " + ioe.getMessage()); + } + } + diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec index 5b25fe2..2d150b5 100644 --- a/xmlgraphics-commons.spec +++ b/xmlgraphics-commons.spec @@ -1,17 +1,18 @@ Name: xmlgraphics-commons Version: 2.11 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 0 Summary: XML Graphics Commons License: Apache-2.0 URL: http://xmlgraphics.apache.org/ Source0: http://archive.apache.org/dist/xmlgraphics/commons/source/xmlgraphics-commons-%{version}-src.tar.gz +Patch1: jdk25.patch BuildArch: noarch ExclusiveArch: %{java_arches} noarch -BuildRequires: maven-local-openjdk21 +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(commons-io:commons-io) BuildRequires: mvn(commons-logging:commons-logging) BuildRequires: mvn(junit:junit) @@ -36,7 +37,7 @@ This package contains API documentation for %{name}. %prep %setup -q %{name}-%{version} - +patch -p1 < %{PATCH1} find -name "*.jar" -delete # Disable plugins not needed for RPM build From 72e9f67e87b49c09cc30cc22ffc8a7ce9a4314c2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:45:36 +0000 Subject: [PATCH 7/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- xmlgraphics-commons.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec index 2d150b5..038f2fe 100644 --- a/xmlgraphics-commons.spec +++ b/xmlgraphics-commons.spec @@ -1,6 +1,6 @@ Name: xmlgraphics-commons Version: 2.11 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 0 Summary: XML Graphics Commons @@ -68,6 +68,9 @@ find -name "*.jar" -delete %license LICENSE NOTICE %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 0:2.11-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Wed Jul 30 2025 jiri vanek - 0:2.11-4 - Rrevert to jdk21 From 03092b4bdb893c068b3ab58e1c5bceee6c89fe7d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:18:25 +0000 Subject: [PATCH 8/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- xmlgraphics-commons.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec index 038f2fe..8f86f5c 100644 --- a/xmlgraphics-commons.spec +++ b/xmlgraphics-commons.spec @@ -1,6 +1,6 @@ Name: xmlgraphics-commons Version: 2.11 -Release: 6%{?dist} +Release: 7%{?dist} Epoch: 0 Summary: XML Graphics Commons @@ -68,6 +68,9 @@ find -name "*.jar" -delete %license LICENSE NOTICE %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 0:2.11-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jan 17 2026 Fedora Release Engineering - 0:2.11-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild