diff --git a/jdk25.patch b/jdk25.patch deleted file mode 100644 index 2b6713a..0000000 --- a/jdk25.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- 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/sources b/sources index 1bba186..854c9d9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmlgraphics-commons-2.11-src.tar.gz) = 2249a1ca0ee26522d0a8f34af96791611dfe849278ad98b2f5a571fde662a8eef7f2594f6929f2414f57e0bcd286ed14192471556fb29c9355cb046e9c806e0c +SHA512 (xmlgraphics-commons-2.10-src.tar.gz) = 49b055891e6b76f3c357b616c34f152033ccf807432d55dd57ac83c41234c224d1a716f77ae7ef24ff49d9f376dfa6b161cde18b258d94438a467a4ad91be21d diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec index 8f86f5c..c193549 100644 --- a/xmlgraphics-commons.spec +++ b/xmlgraphics-commons.spec @@ -1,18 +1,17 @@ Name: xmlgraphics-commons -Version: 2.11 -Release: 7%{?dist} +Version: 2.10 +Release: 1%{?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-openjdk25 +BuildRequires: maven-local BuildRequires: mvn(commons-io:commons-io) BuildRequires: mvn(commons-logging:commons-logging) BuildRequires: mvn(junit:junit) @@ -37,7 +36,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 @@ -68,27 +67,6 @@ 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 - -* 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 - -* 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 - -* 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