From c70d25810ac0ba4634102ec6e17c9030b7f3381d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 04:09:03 +0000 Subject: [PATCH 01/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- xmlgraphics-commons.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec index 5cf7d0a..f2b2bd7 100644 --- a/xmlgraphics-commons.spec +++ b/xmlgraphics-commons.spec @@ -1,6 +1,6 @@ Name: xmlgraphics-commons Version: 2.0 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 0 Summary: XML Graphics Commons @@ -75,6 +75,9 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 0:2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Fri Jan 30 2015 Rüdiger Landmann - 0:2.0-1 - Rebase on new upstream From bc3ebf2abdbf6a9db12810e32333ba722b23374f Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Tue, 14 Jul 2015 17:37:27 +0200 Subject: [PATCH 02/41] Update to upstream version 2.0.1 --- .gitignore | 1 + sources | 2 +- xmlgraphics-commons.spec | 15 +++++++-------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index fb2e593..32c7b74 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ xmlgraphics-commons-1.3-src.tar.gz xmlgraphics-commons-1.3.1-src.tar.gz /xmlgraphics-commons-1.5-src.tar.gz /xmlgraphics-commons-2.0-src.tar.gz +/xmlgraphics-commons-2.0.1-src.tar.gz diff --git a/sources b/sources index e3e9f5e..d227ec8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f970745b10f7add8c2cabec90d0a6b46 xmlgraphics-commons-2.0-src.tar.gz +d8b3b07116e5387c760f4fe6dbe598c0 xmlgraphics-commons-2.0.1-src.tar.gz diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec index f2b2bd7..a2d823c 100644 --- a/xmlgraphics-commons.spec +++ b/xmlgraphics-commons.spec @@ -1,24 +1,22 @@ Name: xmlgraphics-commons -Version: 2.0 -Release: 2%{?dist} +Version: 2.0.1 +Release: 1%{?dist} Epoch: 0 Summary: XML Graphics Commons -Group: Development/Libraries License: ASL 2.0 URL: http://xmlgraphics.apache.org/ -Source0: http://apache.skknet.net/xmlgraphics/commons/source/%{name}-%{version}-src.tar.gz +Source0: http://apache.org/dist/xmlgraphics/commons/source/%{name}-%{version}-src.tar.gz BuildArch: noarch BuildRequires: java-devel >= 1:1.6.0 -BuildRequires: jpackage-utils +BuildRequires: javapackages-local BuildRequires: ant >= 0:1.6 BuildRequires: ant-junit >= 0:1.6 BuildRequires: junit BuildRequires: apache-commons-io >= 1.3.1 BuildRequires: apache-commons-logging >= 1.0.4 Requires: java -Requires: jpackage-utils Requires: apache-commons-io >= 1.3.1 Requires: apache-commons-logging >= 1.0.4 @@ -33,8 +31,6 @@ PostScript files, and much more. %package javadoc Summary: Javadoc for %{name} -Group: Documentation -Requires: jpackage-utils %description javadoc %{summary}. @@ -75,6 +71,9 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %changelog +* Tue Jul 14 2015 Michael Simacek - 0:2.0.1-1 +- Update to upstream version 2.0.1 + * Fri Jun 19 2015 Fedora Release Engineering - 0:2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From c11873e748c68a2c482e9716809812d3013b717b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 03:36:12 +0000 Subject: [PATCH 03/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- xmlgraphics-commons.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec index a2d823c..d4fecc2 100644 --- a/xmlgraphics-commons.spec +++ b/xmlgraphics-commons.spec @@ -1,6 +1,6 @@ Name: xmlgraphics-commons Version: 2.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 0 Summary: XML Graphics Commons @@ -71,6 +71,9 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 0:2.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Tue Jul 14 2015 Michael Simacek - 0:2.0.1-1 - Update to upstream version 2.0.1 From ab4c96f0d2b06cc14bde315d5ea9d7421f101dbd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 17:57:33 +0000 Subject: [PATCH 04/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- xmlgraphics-commons.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec index d4fecc2..1270a85 100644 --- a/xmlgraphics-commons.spec +++ b/xmlgraphics-commons.spec @@ -1,6 +1,6 @@ Name: xmlgraphics-commons Version: 2.0.1 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 0 Summary: XML Graphics Commons @@ -71,6 +71,9 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 0:2.0.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Fri Feb 05 2016 Fedora Release Engineering - 0:2.0.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 3f630ab736d31a1be800153fce5388097024abf6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 22:13:42 +0000 Subject: [PATCH 05/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- xmlgraphics-commons.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec index 1270a85..f91f4c5 100644 --- a/xmlgraphics-commons.spec +++ b/xmlgraphics-commons.spec @@ -1,6 +1,6 @@ Name: xmlgraphics-commons Version: 2.0.1 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 0 Summary: XML Graphics Commons @@ -71,6 +71,9 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 0:2.0.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 0:2.0.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From f9b054d772b0c5dc9c8f1b5dc0848bf594e1b224 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Tue, 16 Jan 2018 16:04:18 +0100 Subject: [PATCH 06/41] Install with XMvn --- xmlgraphics-commons.spec | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec index f91f4c5..e29387f 100644 --- a/xmlgraphics-commons.spec +++ b/xmlgraphics-commons.spec @@ -1,6 +1,6 @@ Name: xmlgraphics-commons Version: 2.0.1 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 0 Summary: XML Graphics Commons @@ -16,9 +16,7 @@ BuildRequires: ant-junit >= 0:1.6 BuildRequires: junit BuildRequires: apache-commons-io >= 1.3.1 BuildRequires: apache-commons-logging >= 1.0.4 -Requires: java -Requires: apache-commons-io >= 1.3.1 -Requires: apache-commons-logging >= 1.0.4 +BuildRequires: apache-parent %description Apache XML Graphics Commons is a library that consists of @@ -54,23 +52,23 @@ popd ant package javadocs %install -install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} -install -Dpm 0644 build/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar -install -pm 644 %{name}.pom $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom -%add_maven_depmap +%mvn_file : %{name} +%mvn_artifact %{name}.pom build/%{name}-%{version}.jar -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} -cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} +%mvn_install -J build/javadocs %files -f .mfiles -%doc LICENSE NOTICE README +%license LICENSE NOTICE +%doc README -%files javadoc -%doc LICENSE NOTICE -%doc %{_javadocdir}/%{name} +%files javadoc -f .mfiles-javadoc +%license LICENSE NOTICE %changelog +* Tue Jan 16 2018 Michael Simacek - 0:2.0.1-5 +- Install with XMvn + * Thu Jul 27 2017 Fedora Release Engineering - 0:2.0.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 17e0cddede5eb491b32f5f4e5ce916ed937754f1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 21:47:08 +0000 Subject: [PATCH 07/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlgraphics-commons.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec index e29387f..0e40d5d 100644 --- a/xmlgraphics-commons.spec +++ b/xmlgraphics-commons.spec @@ -1,6 +1,6 @@ Name: xmlgraphics-commons Version: 2.0.1 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 0 Summary: XML Graphics Commons @@ -66,6 +66,9 @@ ant package javadocs %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 0:2.0.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Tue Jan 16 2018 Michael Simacek - 0:2.0.1-5 - Install with XMvn From 01cd68834211d1aab42edb793ab842386259f6f5 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Thu, 26 Apr 2018 10:44:27 +0100 Subject: [PATCH 08/41] Update to latest release Switch to maven-based build Add OSGi metadata --- .gitignore | 1 + sources | 2 +- xmlgraphics-commons.spec | 68 ++++++++++++++++++++++------------------ 3 files changed, 39 insertions(+), 32 deletions(-) diff --git a/.gitignore b/.gitignore index 32c7b74..45aab53 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ xmlgraphics-commons-1.3.1-src.tar.gz /xmlgraphics-commons-1.5-src.tar.gz /xmlgraphics-commons-2.0-src.tar.gz /xmlgraphics-commons-2.0.1-src.tar.gz +/xmlgraphics-commons-2.2-src.tar.gz diff --git a/sources b/sources index d227ec8..0c19da9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d8b3b07116e5387c760f4fe6dbe598c0 xmlgraphics-commons-2.0.1-src.tar.gz +SHA512 (xmlgraphics-commons-2.2-src.tar.gz) = c0c786e774da535d7ed100c3c78ba1483fde371b7353226bb72076aab39ad33e752fa9d85fd368f65cfb50cc25ae904868d8f939323ea96876523e09f1259211 diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec index 0e40d5d..de29cb7 100644 --- a/xmlgraphics-commons.spec +++ b/xmlgraphics-commons.spec @@ -1,22 +1,22 @@ Name: xmlgraphics-commons -Version: 2.0.1 -Release: 6%{?dist} +Version: 2.2 +Release: 1%{?dist} Epoch: 0 Summary: XML Graphics Commons License: ASL 2.0 URL: http://xmlgraphics.apache.org/ -Source0: http://apache.org/dist/xmlgraphics/commons/source/%{name}-%{version}-src.tar.gz +Source0: http://archive.apache.org/dist/xmlgraphics/commons/source/xmlgraphics-commons-%{version}-src.tar.gz BuildArch: noarch -BuildRequires: java-devel >= 1:1.6.0 -BuildRequires: javapackages-local -BuildRequires: ant >= 0:1.6 -BuildRequires: ant-junit >= 0:1.6 -BuildRequires: junit -BuildRequires: apache-commons-io >= 1.3.1 -BuildRequires: apache-commons-logging >= 1.0.4 -BuildRequires: apache-parent + +BuildRequires: maven-local +BuildRequires: mvn(commons-io:commons-io) +BuildRequires: mvn(commons-logging:commons-logging) +BuildRequires: mvn(junit:junit) +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: mvn(org.mockito:mockito-core) +BuildRequires: mvn(xml-resolver:xml-resolver) %description Apache XML Graphics Commons is a library that consists of @@ -27,35 +27,37 @@ find components such as a PDF library, an RTF library, Graphics2D implementations that let you generate PDF & PostScript files, and much more. -%package javadoc -Summary: Javadoc for %{name} - -%description javadoc -%{summary}. +%package javadoc +Summary: Javadoc for %{name} +%description javadoc +This package contains API documentation for %{name}. %prep %setup -q %{name}-%{version} -rm -f `find . -name "*.jar"` -# create pom from template -sed "s:@version@:%{version}:g" %{name}-pom-template.pom \ - > %{name}.pom +find -name "*.jar" -delete +# Disable plugins not needed for RPM build +%pom_remove_plugin :maven-checkstyle-plugin +%pom_remove_plugin :findbugs-maven-plugin + +# Make into OSGi bundle +%pom_xpath_inject pom:project 'bundle' +%pom_add_plugin org.apache.felix:maven-bundle-plugin . \ +" true + + + org.apache.xmlgraphics + + " %build -export CLASSPATH=$(build-classpath commons-logging) -export OPT_JAR_LIST="ant/ant-junit junit" -pushd lib -ln -sf $(build-classpath commons-io) . -popd -ant package javadocs +%mvn_file : %{name} +%mvn_build %install -%mvn_file : %{name} -%mvn_artifact %{name}.pom build/%{name}-%{version}.jar - -%mvn_install -J build/javadocs +%mvn_install %files -f .mfiles %license LICENSE NOTICE @@ -64,8 +66,12 @@ ant package javadocs %files javadoc -f .mfiles-javadoc %license LICENSE NOTICE - %changelog +* Thu Apr 26 2018 Mat Booth - 0:2.2-1 +- Update to latest release +- Switch to maven-based build +- Add OSGi metadata + * Fri Feb 09 2018 Fedora Release Engineering - 0:2.0.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From e3064a17deefc2a4e3b765f00b9df10d3474f749 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:23:35 +0000 Subject: [PATCH 09/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlgraphics-commons.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec index de29cb7..dca0a82 100644 --- a/xmlgraphics-commons.spec +++ b/xmlgraphics-commons.spec @@ -1,6 +1,6 @@ Name: xmlgraphics-commons Version: 2.2 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 0 Summary: XML Graphics Commons @@ -67,6 +67,9 @@ find -name "*.jar" -delete %license LICENSE NOTICE %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 0:2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Apr 26 2018 Mat Booth - 0:2.2-1 - Update to latest release - Switch to maven-based build From 4eb074f7b66712359cff6d465b3120aacf943ae4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 12:33:16 +0000 Subject: [PATCH 10/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlgraphics-commons.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec index dca0a82..e8b4110 100644 --- a/xmlgraphics-commons.spec +++ b/xmlgraphics-commons.spec @@ -1,6 +1,6 @@ Name: xmlgraphics-commons Version: 2.2 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 0 Summary: XML Graphics Commons @@ -67,6 +67,9 @@ find -name "*.jar" -delete %license LICENSE NOTICE %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 0:2.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 0:2.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 047db54f2c389cb5afcdf5720183c79844ac6377 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Wed, 15 May 2019 16:02:45 +0100 Subject: [PATCH 11/41] Update to latest upstream release --- .gitignore | 8 ++------ sources | 2 +- xmlgraphics-commons.spec | 7 +++++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 45aab53..eb74f1f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,2 @@ -xmlgraphics-commons-1.3-src.tar.gz -xmlgraphics-commons-1.3.1-src.tar.gz -/xmlgraphics-commons-1.5-src.tar.gz -/xmlgraphics-commons-2.0-src.tar.gz -/xmlgraphics-commons-2.0.1-src.tar.gz -/xmlgraphics-commons-2.2-src.tar.gz +/xmlgraphics-commons-*-src.tar.gz +/*.src.rpm diff --git a/sources b/sources index 0c19da9..c9e1563 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmlgraphics-commons-2.2-src.tar.gz) = c0c786e774da535d7ed100c3c78ba1483fde371b7353226bb72076aab39ad33e752fa9d85fd368f65cfb50cc25ae904868d8f939323ea96876523e09f1259211 +SHA512 (xmlgraphics-commons-2.3-src.tar.gz) = bcca47dd3be8371fccddb5c9f41485f53fc3c54cdfb4037af89955447137ed075f96d8c1aa6890d0cdaa265c31072bffcc7b6a6aa43dc1945ef153a840431b97 diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec index e8b4110..c7ba43f 100644 --- a/xmlgraphics-commons.spec +++ b/xmlgraphics-commons.spec @@ -1,6 +1,6 @@ Name: xmlgraphics-commons -Version: 2.2 -Release: 3%{?dist} +Version: 2.3 +Release: 1%{?dist} Epoch: 0 Summary: XML Graphics Commons @@ -67,6 +67,9 @@ find -name "*.jar" -delete %license LICENSE NOTICE %changelog +* Wed May 15 2019 Mat Booth - 0:2.3-1 +- Update to latest upstream release + * Sun Feb 03 2019 Fedora Release Engineering - 0:2.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 36ebead96576fc670fd5391495c97b4a63dabf4a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 04:20:57 +0000 Subject: [PATCH 12/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlgraphics-commons.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec index c7ba43f..520d6db 100644 --- a/xmlgraphics-commons.spec +++ b/xmlgraphics-commons.spec @@ -1,6 +1,6 @@ Name: xmlgraphics-commons Version: 2.3 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 0 Summary: XML Graphics Commons @@ -67,6 +67,9 @@ find -name "*.jar" -delete %license LICENSE NOTICE %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 0:2.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Wed May 15 2019 Mat Booth - 0:2.3-1 - Update to latest upstream release From 9303e8ad00ab574dbb0870cb28736e61266e90b0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 04:36:13 +0000 Subject: [PATCH 13/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlgraphics-commons.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec index 520d6db..736f1e2 100644 --- a/xmlgraphics-commons.spec +++ b/xmlgraphics-commons.spec @@ -1,6 +1,6 @@ Name: xmlgraphics-commons Version: 2.3 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 0 Summary: XML Graphics Commons @@ -67,6 +67,9 @@ find -name "*.jar" -delete %license LICENSE NOTICE %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 0:2.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jul 27 2019 Fedora Release Engineering - 0:2.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 533b201c471506e15d683be46015e610332c31ea Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 11 Jul 2020 08:50:00 +0200 Subject: [PATCH 14/41] Rebuilt for JDK-11 --- xmlgraphics-commons.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec index 736f1e2..43e447b 100644 --- a/xmlgraphics-commons.spec +++ b/xmlgraphics-commons.spec @@ -1,6 +1,6 @@ Name: xmlgraphics-commons Version: 2.3 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 0 Summary: XML Graphics Commons @@ -67,6 +67,9 @@ find -name "*.jar" -delete %license LICENSE NOTICE %changelog +* Sat Jul 11 2020 Jiri Vanek - 0:2.3-4 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + * Fri Jan 31 2020 Fedora Release Engineering - 0:2.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 15388402d80aba6f41daf108ef2045b4eadd40a3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 14:50:19 +0000 Subject: [PATCH 15/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlgraphics-commons.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec index 43e447b..7743a78 100644 --- a/xmlgraphics-commons.spec +++ b/xmlgraphics-commons.spec @@ -1,6 +1,6 @@ Name: xmlgraphics-commons Version: 2.3 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 0 Summary: XML Graphics Commons @@ -67,6 +67,9 @@ find -name "*.jar" -delete %license LICENSE NOTICE %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 0:2.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sat Jul 11 2020 Jiri Vanek - 0:2.3-4 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 From 7cfaf7ee62d45053f6de0ec484e43a851cff8c97 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Sun, 1 Nov 2020 20:39:47 +0000 Subject: [PATCH 16/41] Update to latest upstream release --- sources | 2 +- xmlgraphics-commons.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index c9e1563..4be9686 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmlgraphics-commons-2.3-src.tar.gz) = bcca47dd3be8371fccddb5c9f41485f53fc3c54cdfb4037af89955447137ed075f96d8c1aa6890d0cdaa265c31072bffcc7b6a6aa43dc1945ef153a840431b97 +SHA512 (xmlgraphics-commons-2.4-src.tar.gz) = f3a7f34d30b1e3957509c3a1a37ca3996eb4d4dada71b85877f7193fbcd0d1465bfd63a91941446ef83559c9ba40b3115dfa42a28b83bd49f9f9d5bb1c2cca74 diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec index 7743a78..dd50eb7 100644 --- a/xmlgraphics-commons.spec +++ b/xmlgraphics-commons.spec @@ -1,6 +1,6 @@ Name: xmlgraphics-commons -Version: 2.3 -Release: 5%{?dist} +Version: 2.4 +Release: 1%{?dist} Epoch: 0 Summary: XML Graphics Commons @@ -67,6 +67,9 @@ find -name "*.jar" -delete %license LICENSE NOTICE %changelog +* Sun Nov 01 2020 Mat Booth - 0:2.4-1 +- Update to latest upstream release + * Wed Jul 29 2020 Fedora Release Engineering - 0:2.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 66607829eee210fe1d4d859211fb0a6640eec545 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 28 Jan 2021 00:09:41 +0000 Subject: [PATCH 17/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlgraphics-commons.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec index dd50eb7..285fe2e 100644 --- a/xmlgraphics-commons.spec +++ b/xmlgraphics-commons.spec @@ -1,6 +1,6 @@ Name: xmlgraphics-commons Version: 2.4 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 0 Summary: XML Graphics Commons @@ -67,6 +67,9 @@ find -name "*.jar" -delete %license LICENSE NOTICE %changelog +* Thu Jan 28 2021 Fedora Release Engineering - 0:2.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sun Nov 01 2020 Mat Booth - 0:2.4-1 - Update to latest upstream release From a3661164cde39bd6a5976b8f701768f19edbc196 Mon Sep 17 00:00:00 2001 From: Jie Kang Date: Mon, 1 Mar 2021 14:41:39 -0500 Subject: [PATCH 18/41] Update to 2.6 --- sources | 2 +- xmlgraphics-commons.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 4be9686..7089618 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmlgraphics-commons-2.4-src.tar.gz) = f3a7f34d30b1e3957509c3a1a37ca3996eb4d4dada71b85877f7193fbcd0d1465bfd63a91941446ef83559c9ba40b3115dfa42a28b83bd49f9f9d5bb1c2cca74 +SHA512 (xmlgraphics-commons-2.6-src.tar.gz) = bdf7fb21d076ba722648da016b0686ed3ea6f56b8ba1a8cea34b517095bf91ff900a937e45aba0977389ab736b1815a5733908ad4242911246555dce61cf4cfd diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec index 285fe2e..ae31afb 100644 --- a/xmlgraphics-commons.spec +++ b/xmlgraphics-commons.spec @@ -1,6 +1,6 @@ Name: xmlgraphics-commons -Version: 2.4 -Release: 2%{?dist} +Version: 2.6 +Release: 1%{?dist} Epoch: 0 Summary: XML Graphics Commons @@ -67,6 +67,9 @@ find -name "*.jar" -delete %license LICENSE NOTICE %changelog +* Mon Mar 01 2021 Jie Kang - 0:2.6-1 +- Update to latest upstream release + * Thu Jan 28 2021 Fedora Release Engineering - 0:2.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 5c0ac2eb836b8895ae358c55f9e0f1b0e0c3109d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 21:43:06 +0000 Subject: [PATCH 19/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlgraphics-commons.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec index ae31afb..d43986d 100644 --- a/xmlgraphics-commons.spec +++ b/xmlgraphics-commons.spec @@ -1,6 +1,6 @@ Name: xmlgraphics-commons Version: 2.6 -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 23 2021 Fedora Release Engineering - 0:2.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Mar 01 2021 Jie Kang - 0:2.6-1 - Update to latest upstream release From 33446336ef7a0d9307856c1bd9a2c11f79bde448 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 05:15:38 +0000 Subject: [PATCH 20/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlgraphics-commons.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec index d43986d..f13596b 100644 --- a/xmlgraphics-commons.spec +++ b/xmlgraphics-commons.spec @@ -1,6 +1,6 @@ Name: xmlgraphics-commons Version: 2.6 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 0 Summary: XML Graphics Commons @@ -67,6 +67,9 @@ find -name "*.jar" -delete %license LICENSE NOTICE %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 0:2.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 0:2.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 020611d46ad6d22407ffa50a1753a5074c27a3e8 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 24 Jan 2022 14:21:20 -0600 Subject: [PATCH 21/41] 2.7 --- sources | 2 +- xmlgraphics-commons.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 7089618..96f98e0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmlgraphics-commons-2.6-src.tar.gz) = bdf7fb21d076ba722648da016b0686ed3ea6f56b8ba1a8cea34b517095bf91ff900a937e45aba0977389ab736b1815a5733908ad4242911246555dce61cf4cfd +SHA512 (xmlgraphics-commons-2.7-src.tar.gz) = 7d3993fc920767512f94edef3342757f0ffc9c9dbad80695fe3d77b0ec162380d9b467682ae41238e7ee719601709edb41b2dab06c385dfd9fa898577d8d2c22 diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec index f13596b..029e260 100644 --- a/xmlgraphics-commons.spec +++ b/xmlgraphics-commons.spec @@ -1,6 +1,6 @@ Name: xmlgraphics-commons -Version: 2.6 -Release: 3%{?dist} +Version: 2.7 +Release: 1%{?dist} Epoch: 0 Summary: XML Graphics Commons @@ -67,6 +67,9 @@ find -name "*.jar" -delete %license LICENSE NOTICE %changelog +* Mon Jan 24 2022 Gwyn Ciesla - 0:2.7-1 +- 2.7 + * Sat Jan 22 2022 Fedora Release Engineering - 0:2.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From f6f86976ca5e9cb407108eba54caea0d18230dbb Mon Sep 17 00:00:00 2001 From: Jiri Date: Sun, 6 Feb 2022 00:44:59 +0100 Subject: [PATCH 22/41] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- xmlgraphics-commons.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec index 029e260..69fcf35 100644 --- a/xmlgraphics-commons.spec +++ b/xmlgraphics-commons.spec @@ -1,6 +1,6 @@ Name: xmlgraphics-commons Version: 2.7 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 0 Summary: XML Graphics Commons @@ -67,6 +67,9 @@ find -name "*.jar" -delete %license LICENSE NOTICE %changelog +* Sat Feb 05 2022 Jiri Vanek - 0:2.7-2 +- Rebuilt for java-17-openjdk as system jdk + * Mon Jan 24 2022 Gwyn Ciesla - 0:2.7-1 - 2.7 From 14f007e09a6823379e9a74831eeaf375a88b25cc Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 8 Jul 2022 17:01:42 +0200 Subject: [PATCH 23/41] Rebuilt for Drop i686 JDKs https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs --- xmlgraphics-commons.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec index 69fcf35..5eca963 100644 --- a/xmlgraphics-commons.spec +++ b/xmlgraphics-commons.spec @@ -1,6 +1,6 @@ Name: xmlgraphics-commons Version: 2.7 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 0 Summary: XML Graphics Commons @@ -9,6 +9,7 @@ URL: http://xmlgraphics.apache.org/ Source0: http://archive.apache.org/dist/xmlgraphics/commons/source/xmlgraphics-commons-%{version}-src.tar.gz BuildArch: noarch +ExclusiveArch: %{java_arches} noarch BuildRequires: maven-local BuildRequires: mvn(commons-io:commons-io) @@ -67,6 +68,9 @@ find -name "*.jar" -delete %license LICENSE NOTICE %changelog +* Fri Jul 08 2022 Jiri Vanek - 0:2.7-3 +- Rebuilt for Drop i686 JDKs + * Sat Feb 05 2022 Jiri Vanek - 0:2.7-2 - Rebuilt for java-17-openjdk as system jdk From f9adca45289695d7b8754dd6da6e854557de343f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 13:17:33 +0000 Subject: [PATCH 24/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlgraphics-commons.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec index 5eca963..8fa7ee0 100644 --- a/xmlgraphics-commons.spec +++ b/xmlgraphics-commons.spec @@ -1,6 +1,6 @@ Name: xmlgraphics-commons Version: 2.7 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 0 Summary: XML Graphics Commons @@ -68,6 +68,9 @@ find -name "*.jar" -delete %license LICENSE NOTICE %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 0:2.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Jul 08 2022 Jiri Vanek - 0:2.7-3 - Rebuilt for Drop i686 JDKs From 0d291f6ecf6e863629607d840f0eab04ecfceb3d Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 10 Nov 2022 10:29:06 -0600 Subject: [PATCH 25/41] 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 From 53e328aad6bec94ea8b467642b37d0c481b85690 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 07:37:46 +0000 Subject: [PATCH 26/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlgraphics-commons.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec index 1ce524f..e284f05 100644 --- a/xmlgraphics-commons.spec +++ b/xmlgraphics-commons.spec @@ -1,6 +1,6 @@ Name: xmlgraphics-commons Version: 2.8 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 0 Summary: XML Graphics Commons @@ -71,6 +71,9 @@ find -name "*.jar" -delete %license LICENSE NOTICE %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 0:2.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Nov 09 2022 Gwyn Ciesla - 0:2.8-1 - 2.8 From 01d8c0ae3145347aa5ca7332769927307fa29ada Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 2 Mar 2023 15:10:31 -0600 Subject: [PATCH 27/41] migrated to SPDX license --- xmlgraphics-commons.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec index e284f05..5aa7f5d 100644 --- a/xmlgraphics-commons.spec +++ b/xmlgraphics-commons.spec @@ -1,10 +1,10 @@ Name: xmlgraphics-commons Version: 2.8 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 0 Summary: XML Graphics Commons -License: ASL 2.0 +License: Apache-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 @@ -71,6 +71,9 @@ find -name "*.jar" -delete %license LICENSE NOTICE %changelog +* Thu Mar 02 2023 Gwyn Ciesla - 0:2.8-3 +- migrated to SPDX license + * Sat Jan 21 2023 Fedora Release Engineering - 0:2.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 0416d453f5a5a9e57808330a18f339ff6379e450 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:01:41 +0000 Subject: [PATCH 28/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlgraphics-commons.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec index 5aa7f5d..82183e4 100644 --- a/xmlgraphics-commons.spec +++ b/xmlgraphics-commons.spec @@ -1,6 +1,6 @@ Name: xmlgraphics-commons Version: 2.8 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 0 Summary: XML Graphics Commons @@ -71,6 +71,9 @@ find -name "*.jar" -delete %license LICENSE NOTICE %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 0:2.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Mar 02 2023 Gwyn Ciesla - 0:2.8-3 - migrated to SPDX license From 0a4121e22a4c648a662a1da2be46bdaf6c6303e2 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 23 Aug 2023 14:00:49 -0500 Subject: [PATCH 29/41] 2.9 --- sources | 2 +- test.patch | 21 --------------------- xmlgraphics-commons.spec | 10 +++++----- 3 files changed, 6 insertions(+), 27 deletions(-) delete mode 100644 test.patch diff --git a/sources b/sources index ef74ff3..8e926d5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmlgraphics-commons-2.8-src.tar.gz) = 3e6c397a7444c4ce1d1aeda96a7c9abfd3d8d57a0997d7d6ae2be36303dd17550b7b92fd86eac832566bbeefccdd06619e31c0d907cd6b953a8eb934d7fa618b +SHA512 (xmlgraphics-commons-2.9-src.tar.gz) = 896a5fe41277783021075df0de1aa109a7f05416af6b0141301a2452197d85df0daef28f5c2a71802644cbff3bfe79579a1544000a4c1b5cec4c211d8effd521 diff --git a/test.patch b/test.patch deleted file mode 100644 index 450e1dd..0000000 --- a/test.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- 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 82183e4..f1081bf 100644 --- a/xmlgraphics-commons.spec +++ b/xmlgraphics-commons.spec @@ -1,13 +1,12 @@ Name: xmlgraphics-commons -Version: 2.8 -Release: 4%{?dist} +Version: 2.9 +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 -Patch0: test.patch BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -38,8 +37,6 @@ 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 @@ -71,6 +68,9 @@ find -name "*.jar" -delete %license LICENSE NOTICE %changelog +* Wed Aug 23 2023 Gwyn Ciesla - 0:2.9-1 +- 2.9 + * Sat Jul 22 2023 Fedora Release Engineering - 0:2.8-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 54986fe714c845254ca24d52ec774908efa68316 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 09:52:34 +0000 Subject: [PATCH 30/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- xmlgraphics-commons.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec index f1081bf..a1d7171 100644 --- a/xmlgraphics-commons.spec +++ b/xmlgraphics-commons.spec @@ -1,6 +1,6 @@ Name: xmlgraphics-commons Version: 2.9 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 0 Summary: XML Graphics Commons @@ -68,6 +68,9 @@ find -name "*.jar" -delete %license LICENSE NOTICE %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 0:2.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Aug 23 2023 Gwyn Ciesla - 0:2.9-1 - 2.9 From 1dbbd60a629595db11ff6e30ae7b416c9685bf58 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 18:34:35 +0100 Subject: [PATCH 31/41] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- xmlgraphics-commons.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec index a1d7171..bd715a2 100644 --- a/xmlgraphics-commons.spec +++ b/xmlgraphics-commons.spec @@ -1,6 +1,6 @@ Name: xmlgraphics-commons Version: 2.9 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 0 Summary: XML Graphics Commons @@ -68,6 +68,9 @@ find -name "*.jar" -delete %license LICENSE NOTICE %changelog +* Tue Feb 27 2024 Jiri Vanek - 0:2.9-3 +- Rebuilt for java-21-openjdk as system jdk + * Sat Jan 27 2024 Fedora Release Engineering - 0:2.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 4d2815a7b30abd02d130ac7104be1bd090a60997 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:13:21 +0000 Subject: [PATCH 32/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- xmlgraphics-commons.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec index bd715a2..e649e03 100644 --- a/xmlgraphics-commons.spec +++ b/xmlgraphics-commons.spec @@ -1,6 +1,6 @@ Name: xmlgraphics-commons Version: 2.9 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 0 Summary: XML Graphics Commons @@ -68,6 +68,9 @@ find -name "*.jar" -delete %license LICENSE NOTICE %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 0:2.9-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Feb 27 2024 Jiri Vanek - 0:2.9-3 - Rebuilt for java-21-openjdk as system jdk From 0b7caab5a58649a30abddfdd3b18c091947482b5 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 9 Oct 2024 08:40:03 -0500 Subject: [PATCH 33/41] 2.10 --- sources | 2 +- xmlgraphics-commons.spec | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 8e926d5..854c9d9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmlgraphics-commons-2.9-src.tar.gz) = 896a5fe41277783021075df0de1aa109a7f05416af6b0141301a2452197d85df0daef28f5c2a71802644cbff3bfe79579a1544000a4c1b5cec4c211d8effd521 +SHA512 (xmlgraphics-commons-2.10-src.tar.gz) = 49b055891e6b76f3c357b616c34f152033ccf807432d55dd57ac83c41234c224d1a716f77ae7ef24ff49d9f376dfa6b161cde18b258d94438a467a4ad91be21d diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec index e649e03..c193549 100644 --- a/xmlgraphics-commons.spec +++ b/xmlgraphics-commons.spec @@ -1,6 +1,6 @@ Name: xmlgraphics-commons -Version: 2.9 -Release: 4%{?dist} +Version: 2.10 +Release: 1%{?dist} Epoch: 0 Summary: XML Graphics Commons @@ -41,7 +41,6 @@ find -name "*.jar" -delete # Disable plugins not needed for RPM build %pom_remove_plugin :maven-checkstyle-plugin -%pom_remove_plugin :findbugs-maven-plugin # Make into OSGi bundle %pom_xpath_inject pom:project 'bundle' @@ -68,6 +67,9 @@ find -name "*.jar" -delete %license LICENSE NOTICE %changelog +* Wed Oct 09 2024 Gwyn Ciesla - 0:2.10-1 +- 2.10 + * Sat Jul 20 2024 Fedora Release Engineering - 0:2.9-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From dcd864b2ca7c663c65614aa888b3f27cd184676c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:01:02 +0000 Subject: [PATCH 34/41] 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 35/41] 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 36/41] 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 37/41] 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 38/41] 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 39/41] 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 40/41] 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 41/41] 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