From 9cd11b0e2301efcdba7245c82ba73f61dc5385e9 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 18:33:58 +0100 Subject: [PATCH 01/45] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- xml-commons-resolver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 1f71cf2..40dd8ed 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,6 +1,6 @@ Name: xml-commons-resolver Version: 1.2 -Release: 42%{?dist} +Release: 43%{?dist} Summary: Resolver subproject of xml-commons License: Apache-2.0 URL: http://xerces.apache.org/xml-commons/components/resolver/ @@ -72,6 +72,9 @@ install -p -m 644 %{SOURCE8} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-xread.1 %doc LICENSE.resolver.txt NOTICE-resolver.txt %changelog +* Tue Feb 27 2024 Jiri Vanek - 1.2-43 +- Rebuilt for java-21-openjdk as system jdk + * Sat Jan 27 2024 Fedora Release Engineering - 1.2-42 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From b50347cad322af87fb77410e90835b0926f0ab36 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:50 +0200 Subject: [PATCH 02/45] Eliminate use of obsolete %patchN syntax (#2283636) --- xml-commons-resolver.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 40dd8ed..811f381 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -34,8 +34,8 @@ Javadoc for %{name}. %prep %setup -q -%patch0 -p1 -%patch1 -p1 +%patch -P0 -p1 +%patch -P1 -p1 # remove all binary libs and prebuilt javadocs find . -name "*.jar" -exec rm -f {} \; From 25c5ba0e607c2d13163f0e319a247d77e5c06ebf Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 31 May 2024 05:41:47 +0200 Subject: [PATCH 03/45] Switch to a newer %patch syntax --- xml-commons-resolver.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 811f381..9872aa0 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,6 +1,6 @@ Name: xml-commons-resolver Version: 1.2 -Release: 43%{?dist} +Release: 44%{?dist} Summary: Resolver subproject of xml-commons License: Apache-2.0 URL: http://xerces.apache.org/xml-commons/components/resolver/ @@ -34,8 +34,8 @@ Javadoc for %{name}. %prep %setup -q -%patch -P0 -p1 -%patch -P1 -p1 +%patch 0 -p1 +%patch 1 -p1 # remove all binary libs and prebuilt javadocs find . -name "*.jar" -exec rm -f {} \; @@ -72,6 +72,9 @@ install -p -m 644 %{SOURCE8} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-xread.1 %doc LICENSE.resolver.txt NOTICE-resolver.txt %changelog +* Fri May 31 2024 Mikolaj Izdebski - 1.2-44 +- Switch to a newer patch macro syntax + * Tue Feb 27 2024 Jiri Vanek - 1.2-43 - Rebuilt for java-21-openjdk as system jdk From 0d46592c1b7e4d0eb01baa600aeb5e658dc40c87 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:12:32 +0000 Subject: [PATCH 04/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- xml-commons-resolver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 9872aa0..ac0f1eb 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,6 +1,6 @@ Name: xml-commons-resolver Version: 1.2 -Release: 44%{?dist} +Release: 45%{?dist} Summary: Resolver subproject of xml-commons License: Apache-2.0 URL: http://xerces.apache.org/xml-commons/components/resolver/ @@ -72,6 +72,9 @@ install -p -m 644 %{SOURCE8} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-xread.1 %doc LICENSE.resolver.txt NOTICE-resolver.txt %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 1.2-45 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri May 31 2024 Mikolaj Izdebski - 1.2-44 - Switch to a newer patch macro syntax From cdb8bf0bd33dfcd1766298ef58148c365179bbe7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 24 Jul 2024 10:54:58 +0200 Subject: [PATCH 05/45] Install license files in licensedir instead of docdir --- xml-commons-resolver.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index ac0f1eb..43b64ca 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,6 +1,6 @@ Name: xml-commons-resolver Version: 1.2 -Release: 45%{?dist} +Release: 46%{?dist} Summary: Resolver subproject of xml-commons License: Apache-2.0 URL: http://xerces.apache.org/xml-commons/components/resolver/ @@ -64,14 +64,18 @@ install -p -m 644 %{SOURCE7} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-xparse.1 install -p -m 644 %{SOURCE8} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-xread.1 %files -f .mfiles -%doc KEYS LICENSE.resolver.txt NOTICE-resolver.txt +%doc KEYS +%license LICENSE.resolver.txt NOTICE-resolver.txt %{_mandir}/man1/* %{_bindir}/xml-* %files javadoc -f .mfiles-javadoc -%doc LICENSE.resolver.txt NOTICE-resolver.txt +%license LICENSE.resolver.txt NOTICE-resolver.txt %changelog +* Wed Jul 24 2024 Mikolaj Izdebski - 1.2-46 +- Install license files in licensedir instead of docdir + * Sat Jul 20 2024 Fedora Release Engineering - 1.2-45 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 74e65f8161c495672d8442a007d862125c3a046b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Jul 2024 20:53:30 +0200 Subject: [PATCH 06/45] Switch javapackages tests to f41 branch --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index a2cdaba..17c6113 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f40 + ref: f41 execute: how: tmt From e5bb8d88f6e7be4abb64620c248c3f1beb0ab27d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2024 16:33:57 +0200 Subject: [PATCH 07/45] Switch from %setup to %autosetup --- xml-commons-resolver.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 43b64ca..30efa0b 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -33,9 +33,7 @@ Summary: Javadoc for %{name} Javadoc for %{name}. %prep -%setup -q -%patch 0 -p1 -%patch 1 -p1 +%autosetup -p1 -C # remove all binary libs and prebuilt javadocs find . -name "*.jar" -exec rm -f {} \; From 84080c80e4d4801151dfb3f9e58129a9474e5787 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 Aug 2024 22:13:19 +0200 Subject: [PATCH 08/45] Switch to non-numdered patches --- xml-commons-resolver.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 30efa0b..bcd719f 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -13,8 +13,8 @@ Source6: %{name}-resolver.1 Source7: %{name}-xparse.1 Source8: %{name}-xread.1 -Patch0: %{name}-1.2-crosslink.patch -Patch1: %{name}-1.2-osgi.patch +Patch: %{name}-1.2-crosslink.patch +Patch: %{name}-1.2-osgi.patch BuildRequires: javapackages-local BuildRequires: ant From b437b4e1f39bf38576e01efc1ae5e822e5d60a74 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:41:38 +0200 Subject: [PATCH 09/45] Empty commit to bump autorelease From cc0ec4dbe2c5e367cfa78e6af48526ce435ae941 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:41:38 +0200 Subject: [PATCH 10/45] Empty commit to bump autorelease From cbf66c5806aedc664b32fbcd11874c776ff0a3d0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:41:38 +0200 Subject: [PATCH 11/45] Empty commit to bump autorelease From c3a8c4596ceeacac9f0d33820c472954b4119aec Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:41:38 +0200 Subject: [PATCH 12/45] Empty commit to bump autorelease From bf0c8ebe02337dfbb2a5eb01a1bb8f63139af652 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:41:38 +0200 Subject: [PATCH 13/45] Empty commit to bump autorelease From 56e9fa9748c16ca90f78b30f7fd9a4213e0f85c8 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:41:38 +0200 Subject: [PATCH 14/45] Empty commit to bump autorelease From b24a4035cc053103fb2783aa398e70c7969457df Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:41:38 +0200 Subject: [PATCH 15/45] Empty commit to bump autorelease From 0a2415e71cae82cac70e5bba0d89ab7e0098ccf6 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:41:38 +0200 Subject: [PATCH 16/45] Empty commit to bump autorelease From abf6f6752ae26d218e365e23637f3f7df58e6a90 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:41:38 +0200 Subject: [PATCH 17/45] Empty commit to bump autorelease From c3afcd0b75e05bc069c7d7271bb92f41bb123599 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:41:38 +0200 Subject: [PATCH 18/45] Empty commit to bump autorelease From e0e94dba36fd9e79dac608d2510c7bad62a2c8b7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:41:38 +0200 Subject: [PATCH 19/45] Empty commit to bump autorelease From ceeac0f79ab82cb7ef8db816ed00fed3ae41452f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:41:38 +0200 Subject: [PATCH 20/45] Empty commit to bump autorelease From 73168726fb2a4394af3ba30affcf0e1517c0c633 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:41:38 +0200 Subject: [PATCH 21/45] Empty commit to bump autorelease From fb25697adb56e0beecfbea005b16ee332a327a82 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:41:38 +0200 Subject: [PATCH 22/45] Empty commit to bump autorelease From aa260ddde993f6d48e94e9f252521186e6b55262 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:41:38 +0200 Subject: [PATCH 23/45] Empty commit to bump autorelease From 6fa4f11d6db0512ce81b88cbda572137f44d3c05 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:41:38 +0200 Subject: [PATCH 24/45] Empty commit to bump autorelease From 16465997c1e0c8c9da2b003bf9978b715a000476 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:41:38 +0200 Subject: [PATCH 25/45] Empty commit to bump autorelease From 28b13e1aa12034c9cfbd4988da0121828e104b75 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:41:38 +0200 Subject: [PATCH 26/45] Empty commit to bump autorelease From a07462003e3a4761328902ff17784c022e879f49 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:41:38 +0200 Subject: [PATCH 27/45] Empty commit to bump autorelease From aca2cc072709656e6f0ab5bbdd69cd2c99df6029 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:41:38 +0200 Subject: [PATCH 28/45] Empty commit to bump autorelease From 99d9e1f1aeb3a61fc973c23562387dff923dd3a0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:41:38 +0200 Subject: [PATCH 29/45] Empty commit to bump autorelease From 1e62f0c6443ca7baf6fef46e5127df269f3939ad Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:41:38 +0200 Subject: [PATCH 30/45] Empty commit to bump autorelease From a91080394122ef84a1c28e7028f7b6d5df6c0e6b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:45:20 +0200 Subject: [PATCH 31/45] Convert to %autorelease and %autochangelog --- changelog | 229 +++++++++++++++++++++++++++++++++++++ xml-commons-resolver.spec | 232 +------------------------------------- 2 files changed, 231 insertions(+), 230 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..5085d3b --- /dev/null +++ b/changelog @@ -0,0 +1,229 @@ +* Wed Jul 24 2024 Mikolaj Izdebski - 1.2-46 +- Install license files in licensedir instead of docdir + +* Sat Jul 20 2024 Fedora Release Engineering - 1.2-45 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri May 31 2024 Mikolaj Izdebski - 1.2-44 +- Switch to a newer patch macro syntax + +* Tue Feb 27 2024 Jiri Vanek - 1.2-43 +- Rebuilt for java-21-openjdk as system jdk + +* Sat Jan 27 2024 Fedora Release Engineering - 1.2-42 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Sep 01 2023 Mikolaj Izdebski - 1.2-41 +- Convert License tag to SPDX format + +* Sat Jul 22 2023 Fedora Release Engineering - 1.2-40 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 1.2-39 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 1.2-38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 1.2-37 +- Rebuilt for java-17-openjdk as system jdk + +* Sat Jan 22 2022 Fedora Release Engineering - 1.2-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 1.2-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon Jun 28 2021 Mikolaj Izdebski - 1.2-34 +- Convert sources to SHA512 + +* Thu Jan 28 2021 Fedora Release Engineering - 0:1.2-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 0:1.2-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jul 14 2020 Mat Booth - 0:1.2-31 +- Generate 1.8 level bytecode to avoid breaking dependent packages that require + Java 8 + +* Sat Jul 11 2020 Jiri Vanek - 0:1.2-30 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Fri Jan 31 2020 Fedora Release Engineering - 0:1.2-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Nov 05 2019 Mikolaj Izdebski - 1.2-28 +- Mass rebuild for javapackages-tools 201902 + +* Sat Jul 27 2019 Fedora Release Engineering - 0:1.2-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri May 24 2019 Mikolaj Izdebski - 1.2-27 +- Mass rebuild for javapackages-tools 201901 + +* Sun Feb 03 2019 Fedora Release Engineering - 0:1.2-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Wed Aug 01 2018 Severin Gehwolf - 0:1.2-26 +- Add requirement on javapackages-tools since scripts use + java-functions. + +* Sat Jul 14 2018 Fedora Release Engineering - 0:1.2-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 0:1.2-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 0:1.2-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Thu Feb 23 2017 Mikolaj Izdebski - 0:1.2-22 +- Update to current packaging guidelines + +* Thu Feb 16 2017 Mikolaj Izdebski - 0:1.2-21 +- Fix rpm conditional + +* Sat Feb 11 2017 Fedora Release Engineering - 0:1.2-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Feb 05 2016 Fedora Release Engineering - 0:1.2-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 0:1.2-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Fri Jun 13 2014 Alexander Kurtakov 0:1.2-17 +- Fix FTBFS. + +* Sun Jun 08 2014 Fedora Release Engineering - 0:1.2-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Mon Dec 23 2013 Ville Skyttä - 0:1.2-15 +- Use %%jpackage_script to generate scripts. +- Add OSGi metadata to manifest instead of discarding everything else in it. +- Drop dependency on xml-commons-api, add one on java(-headless). +- Crosslink javadocs with Java's. +- Include NOTICE* in docs. +- Update URLs. +- Specfile cleanups. + +* Thu Aug 15 2013 Mat Booth - 0:1.2-14 +- Fix FTBFS rhbz #993143 + +* Sun Aug 04 2013 Fedora Release Engineering - 0:1.2-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Apr 11 2013 Michal Srb - 0:1.2-12 +- Add man pages (Resolves: rhbz#949424) + +* Fri Feb 15 2013 Fedora Release Engineering - 0:1.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Fri Aug 17 2012 Andy Grimm - 0:1.2-10 +- Remove osgi(system.bundle) requirement + +* Sun Jul 22 2012 Fedora Release Engineering - 0:1.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 0:1.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Feb 07 2011 Fedora Release Engineering - 0:1.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Nov 3 2010 Alexander Kurtakov 0:1.2-6 +- Fix merge review comments (bug#226564). + +* Wed Nov 3 2010 Alexander Kurtakov 0:1.2-5 +- Add missing zip BR. +- Remove perl and dos2unix usage. +- Fix license - ASL 2.0 now. + +* Fri Sep 24 2010 Mat Booth 0:1.2-4 +- Forgot to actually install a jar with a name that maven users expect. + +* Sun Sep 19 2010 Mat Booth 0:1.2-3 +- Install a maven pom and depmap. + +* Wed Apr 7 2010 Alexander Kurtakov 0:1.2-2 +- No need to require jaxp_parser_impl now that we require java 1.5 or newer. + +* Fri Mar 5 2010 Alexander Kurtakov 0:1.2-1 +- Update to 1.2. +- Drop gcj_support. + +* Mon Jan 11 2010 Andrew Overholt 0:1.1-4.17 +- Fix Group tags +- Remove '.' at end of Summary +- Add dos2unix BR and fix line endings +- Use upstream tarball + +* Sat Aug 8 2009 Ville Skyttä - 0:1.1-4.16 +- Fix specfile UTF-8 encoding. + +* Mon Jul 27 2009 Fedora Release Engineering - 0:1.1-4.15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Feb 26 2009 Fedora Release Engineering - 0:1.1-3.15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Fri Jan 30 2009 Alexander Kurtakov 0:1.1-2.15 +- Install osgi manifest for eclipse-dtp + +* Fri Sep 05 2008 Deepak Bhole 1.1-2.14 +- Build with IcedTea to escape sinjdoc issues + +* Thu Jul 10 2008 Tom "spot" Callaway - 0:1.1-2.13 +- drop repotag +- fix license tag + +* Mon Feb 18 2008 Fedora Release Engineering - 0:1.1-2jpp.12 +- Autorebuild for GCC 4.3 + +* Thu Aug 10 2006 Deepak Bhole 1.1-1jpp.12 +- Added missing dependencies. + +* Sat Jul 22 2006 Jakub Jelinek - 0:1.1-1jpp_11fc +- Rebuilt + +* Fri Jul 21 2006 Deepak Bhole - 0:1.1-1jpp_10fc +- Added conditional native compilation. + +* Wed Jul 12 2006 Jesse Keating - 0:1.1-1jpp_9fc +- rebuild + +* Mon Mar 6 2006 Jeremy Katz - 0:1.1-1jpp_8fc +- stop scriptlet spew + +* Wed Dec 21 2005 Jesse Keating 0:1.1-1jpp_7fc +- rebuilt again + +* Fri Dec 09 2005 Jesse Keating 0:1.1-1jpp_6fc +- rebuilt + +* Tue Jun 28 2005 Gary Benson 0:1.1-1jpp_5fc +- Remove jarfile from the tarball. + +* Thu Nov 4 2004 Gary Benson 0:1.1-1jpp_4fc +- Build into Fedora. + +* Thu Oct 28 2004 Gary Benson 0:1.1-1jpp_3fc +- Bootstrap into Fedora. + +* Thu Mar 4 2004 Frank Ch. Eigler 0:1.1-1jpp_2rh +- RH vacuuming part II + +* Wed Mar 3 2004 Frank Ch. Eigler 0:1.1-1jpp_1rh +- RH vacuuming + +* Wed Jan 21 2004 David Walluck 0:1.1-1jpp +- 1.1 +- use perl instead of patch +- don't build docs (build fails) + +* Tue May 06 2003 David Walluck 0:1.0-2jpp +- update for JPackage 1.5 + +* Wed Nov 13 2002 Ville Skyttä - 1.0-1jpp +- Follow upstream changes, split out of xml-commons. diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index bcd719f..7c8a368 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,6 +1,6 @@ Name: xml-commons-resolver Version: 1.2 -Release: 46%{?dist} +Release: %autorelease Summary: Resolver subproject of xml-commons License: Apache-2.0 URL: http://xerces.apache.org/xml-commons/components/resolver/ @@ -71,232 +71,4 @@ install -p -m 644 %{SOURCE8} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-xread.1 %license LICENSE.resolver.txt NOTICE-resolver.txt %changelog -* Wed Jul 24 2024 Mikolaj Izdebski - 1.2-46 -- Install license files in licensedir instead of docdir - -* Sat Jul 20 2024 Fedora Release Engineering - 1.2-45 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Fri May 31 2024 Mikolaj Izdebski - 1.2-44 -- Switch to a newer patch macro syntax - -* Tue Feb 27 2024 Jiri Vanek - 1.2-43 -- Rebuilt for java-21-openjdk as system jdk - -* Sat Jan 27 2024 Fedora Release Engineering - 1.2-42 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Sep 01 2023 Mikolaj Izdebski - 1.2-41 -- Convert License tag to SPDX format - -* Sat Jul 22 2023 Fedora Release Engineering - 1.2-40 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 1.2-39 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 1.2-38 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Feb 05 2022 Jiri Vanek - 1.2-37 -- Rebuilt for java-17-openjdk as system jdk - -* Sat Jan 22 2022 Fedora Release Engineering - 1.2-36 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 1.2-35 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon Jun 28 2021 Mikolaj Izdebski - 1.2-34 -- Convert sources to SHA512 - -* Thu Jan 28 2021 Fedora Release Engineering - 0:1.2-33 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 0:1.2-32 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jul 14 2020 Mat Booth - 0:1.2-31 -- Generate 1.8 level bytecode to avoid breaking dependent packages that require - Java 8 - -* Sat Jul 11 2020 Jiri Vanek - 0:1.2-30 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Fri Jan 31 2020 Fedora Release Engineering - 0:1.2-29 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Nov 05 2019 Mikolaj Izdebski - 1.2-28 -- Mass rebuild for javapackages-tools 201902 - -* Sat Jul 27 2019 Fedora Release Engineering - 0:1.2-28 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri May 24 2019 Mikolaj Izdebski - 1.2-27 -- Mass rebuild for javapackages-tools 201901 - -* Sun Feb 03 2019 Fedora Release Engineering - 0:1.2-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Wed Aug 01 2018 Severin Gehwolf - 0:1.2-26 -- Add requirement on javapackages-tools since scripts use - java-functions. - -* Sat Jul 14 2018 Fedora Release Engineering - 0:1.2-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 0:1.2-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 0:1.2-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Thu Feb 23 2017 Mikolaj Izdebski - 0:1.2-22 -- Update to current packaging guidelines - -* Thu Feb 16 2017 Mikolaj Izdebski - 0:1.2-21 -- Fix rpm conditional - -* Sat Feb 11 2017 Fedora Release Engineering - 0:1.2-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering - 0:1.2-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 0:1.2-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri Jun 13 2014 Alexander Kurtakov 0:1.2-17 -- Fix FTBFS. - -* Sun Jun 08 2014 Fedora Release Engineering - 0:1.2-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Mon Dec 23 2013 Ville Skyttä - 0:1.2-15 -- Use %%jpackage_script to generate scripts. -- Add OSGi metadata to manifest instead of discarding everything else in it. -- Drop dependency on xml-commons-api, add one on java(-headless). -- Crosslink javadocs with Java's. -- Include NOTICE* in docs. -- Update URLs. -- Specfile cleanups. - -* Thu Aug 15 2013 Mat Booth - 0:1.2-14 -- Fix FTBFS rhbz #993143 - -* Sun Aug 04 2013 Fedora Release Engineering - 0:1.2-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Apr 11 2013 Michal Srb - 0:1.2-12 -- Add man pages (Resolves: rhbz#949424) - -* Fri Feb 15 2013 Fedora Release Engineering - 0:1.2-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Fri Aug 17 2012 Andy Grimm - 0:1.2-10 -- Remove osgi(system.bundle) requirement - -* Sun Jul 22 2012 Fedora Release Engineering - 0:1.2-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Fedora Release Engineering - 0:1.2-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Feb 07 2011 Fedora Release Engineering - 0:1.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Nov 3 2010 Alexander Kurtakov 0:1.2-6 -- Fix merge review comments (bug#226564). - -* Wed Nov 3 2010 Alexander Kurtakov 0:1.2-5 -- Add missing zip BR. -- Remove perl and dos2unix usage. -- Fix license - ASL 2.0 now. - -* Fri Sep 24 2010 Mat Booth 0:1.2-4 -- Forgot to actually install a jar with a name that maven users expect. - -* Sun Sep 19 2010 Mat Booth 0:1.2-3 -- Install a maven pom and depmap. - -* Wed Apr 7 2010 Alexander Kurtakov 0:1.2-2 -- No need to require jaxp_parser_impl now that we require java 1.5 or newer. - -* Fri Mar 5 2010 Alexander Kurtakov 0:1.2-1 -- Update to 1.2. -- Drop gcj_support. - -* Mon Jan 11 2010 Andrew Overholt 0:1.1-4.17 -- Fix Group tags -- Remove '.' at end of Summary -- Add dos2unix BR and fix line endings -- Use upstream tarball - -* Sat Aug 8 2009 Ville Skyttä - 0:1.1-4.16 -- Fix specfile UTF-8 encoding. - -* Mon Jul 27 2009 Fedora Release Engineering - 0:1.1-4.15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Feb 26 2009 Fedora Release Engineering - 0:1.1-3.15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Fri Jan 30 2009 Alexander Kurtakov 0:1.1-2.15 -- Install osgi manifest for eclipse-dtp - -* Fri Sep 05 2008 Deepak Bhole 1.1-2.14 -- Build with IcedTea to escape sinjdoc issues - -* Thu Jul 10 2008 Tom "spot" Callaway - 0:1.1-2.13 -- drop repotag -- fix license tag - -* Mon Feb 18 2008 Fedora Release Engineering - 0:1.1-2jpp.12 -- Autorebuild for GCC 4.3 - -* Thu Aug 10 2006 Deepak Bhole 1.1-1jpp.12 -- Added missing dependencies. - -* Sat Jul 22 2006 Jakub Jelinek - 0:1.1-1jpp_11fc -- Rebuilt - -* Fri Jul 21 2006 Deepak Bhole - 0:1.1-1jpp_10fc -- Added conditional native compilation. - -* Wed Jul 12 2006 Jesse Keating - 0:1.1-1jpp_9fc -- rebuild - -* Mon Mar 6 2006 Jeremy Katz - 0:1.1-1jpp_8fc -- stop scriptlet spew - -* Wed Dec 21 2005 Jesse Keating 0:1.1-1jpp_7fc -- rebuilt again - -* Fri Dec 09 2005 Jesse Keating 0:1.1-1jpp_6fc -- rebuilt - -* Tue Jun 28 2005 Gary Benson 0:1.1-1jpp_5fc -- Remove jarfile from the tarball. - -* Thu Nov 4 2004 Gary Benson 0:1.1-1jpp_4fc -- Build into Fedora. - -* Thu Oct 28 2004 Gary Benson 0:1.1-1jpp_3fc -- Bootstrap into Fedora. - -* Thu Mar 4 2004 Frank Ch. Eigler 0:1.1-1jpp_2rh -- RH vacuuming part II - -* Wed Mar 3 2004 Frank Ch. Eigler 0:1.1-1jpp_1rh -- RH vacuuming - -* Wed Jan 21 2004 David Walluck 0:1.1-1jpp -- 1.1 -- use perl instead of patch -- don't build docs (build fails) - -* Tue May 06 2003 David Walluck 0:1.0-2jpp -- update for JPackage 1.5 - -* Wed Nov 13 2002 Ville Skyttä - 1.0-1jpp -- Follow upstream changes, split out of xml-commons. +%autochangelog From a8e22a233b0676570b9663032b4e43d736752cf6 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 19 Nov 2024 20:43:57 +0100 Subject: [PATCH 32/45] Replace the buildroot variable with an RPM macro --- xml-commons-resolver.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 7c8a368..feaab0d 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -50,16 +50,16 @@ sed -i 's/\r//' KEYS LICENSE.resolver.txt NOTICE-resolver.txt %mvn_install -J build/apidocs/resolver # Scripts -mkdir -p $RPM_BUILD_ROOT%{_bindir} +mkdir -p %{buildroot}%{_bindir} %jpackage_script org.apache.xml.resolver.apps.resolver "" "" %{name} xml-resolver true %jpackage_script org.apache.xml.resolver.apps.xread "" "" %{name} xml-xread true %jpackage_script org.apache.xml.resolver.apps.xparse "" "" %{name} xml-xparse true # Man pages -install -d -m 755 ${RPM_BUILD_ROOT}%{_mandir}/man1 -install -p -m 644 %{SOURCE6} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-resolver.1 -install -p -m 644 %{SOURCE7} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-xparse.1 -install -p -m 644 %{SOURCE8} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-xread.1 +install -d -m 755 %{buildroot}%{_mandir}/man1 +install -p -m 644 %{SOURCE6} %{buildroot}%{_mandir}/man1/xml-resolver.1 +install -p -m 644 %{SOURCE7} %{buildroot}%{_mandir}/man1/xml-xparse.1 +install -p -m 644 %{SOURCE8} %{buildroot}%{_mandir}/man1/xml-xread.1 %files -f .mfiles %doc KEYS From 7116f3adbf899e2243c96f4927de9ce44123d571 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 28 Nov 2024 07:50:43 +0100 Subject: [PATCH 33/45] Drop explicit requires on javapackages-tools --- plans/javapackages.fmf | 2 +- xml-commons-resolver.spec | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 17c6113..86bfcea 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f41 + ref: f42 execute: how: tmt diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index feaab0d..fede13f 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -19,9 +19,6 @@ Patch: %{name}-1.2-osgi.patch BuildRequires: javapackages-local BuildRequires: ant BuildRequires: apache-parent -# Explicit javapackages-tools requires since scripts use -# /usr/share/java-utils/java-functions -Requires: javapackages-tools %description Resolver subproject of xml-commons. From 6808711215a6a46dbea5846844a1eecb13a5e8e5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 31 Dec 2024 09:59:11 +0100 Subject: [PATCH 34/45] Update javadoc package description [skip changelog] --- xml-commons-resolver.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index fede13f..3a7c629 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -24,10 +24,10 @@ BuildRequires: apache-parent Resolver subproject of xml-commons. %package javadoc -Summary: Javadoc for %{name} +Summary: API documentation for %{name} %description javadoc -Javadoc for %{name}. +API documentation for %{name}. %prep %autosetup -p1 -C From 04a0a468f0c1f73550607cfd11d5f3d4b9585de9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 13 Jan 2025 10:46:45 +0100 Subject: [PATCH 35/45] Switch upstream URL to https --- xml-commons-resolver.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 3a7c629..1693943 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -3,7 +3,7 @@ Version: 1.2 Release: %autorelease Summary: Resolver subproject of xml-commons License: Apache-2.0 -URL: http://xerces.apache.org/xml-commons/components/resolver/ +URL: https://xerces.apache.org/xml-commons/components/resolver/ BuildArch: noarch ExclusiveArch: %{java_arches} noarch From 7e268112f3f3dfec44b7fbb6da4f9dee13642c80 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:00:04 +0000 Subject: [PATCH 36/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 326ace225e7b589b7053df78b1fa026d06a9a155 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 3 Mar 2025 11:57:14 +0100 Subject: [PATCH 37/45] Remove javadoc subpackage --- xml-commons-resolver.spec | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 1693943..5e4552a 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -19,16 +19,12 @@ Patch: %{name}-1.2-osgi.patch BuildRequires: javapackages-local BuildRequires: ant BuildRequires: apache-parent +# TODO Remove in Fedora 46 +Obsoletes: %{name}-javadoc < 1.2-53 %description Resolver subproject of xml-commons. -%package javadoc -Summary: API documentation for %{name} - -%description javadoc -API documentation for %{name}. - %prep %autosetup -p1 -C @@ -40,11 +36,11 @@ sed -i 's/\r//' KEYS LICENSE.resolver.txt NOTICE-resolver.txt %mvn_file : xml-commons-resolver xml-resolver %build -%ant -f resolver.xml jar javadocs -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 +%ant -f resolver.xml jar -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 %mvn_artifact %{SOURCE5} build/resolver.jar %install -%mvn_install -J build/apidocs/resolver +%mvn_install # Scripts mkdir -p %{buildroot}%{_bindir} @@ -64,8 +60,5 @@ install -p -m 644 %{SOURCE8} %{buildroot}%{_mandir}/man1/xml-xread.1 %{_mandir}/man1/* %{_bindir}/xml-* -%files javadoc -f .mfiles-javadoc -%license LICENSE.resolver.txt NOTICE-resolver.txt - %changelog %autochangelog From 4e7c9c11819f1e8d1d88ce8aeedd688a9331d22c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 26 Mar 2025 08:43:19 +0100 Subject: [PATCH 38/45] Switch to javapackages tests from CentOS Stream GitLab --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 86bfcea..e39d47c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -1,7 +1,7 @@ summary: Run javapackages-specific tests discover: how: fmf - url: https://src.fedoraproject.org/tests/javapackages + url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git ref: f42 execute: how: tmt From f789d2b96c5a0d7fb82b96855576755d05d04dc2 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 May 2025 13:35:32 +0200 Subject: [PATCH 39/45] Switch javapackages test plan to f43 ref --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index e39d47c..ae17c0c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git - ref: f42 + ref: f43 execute: how: tmt From e114e075220f3b589ffe1b6422a9c9b034abea48 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 13 Jul 2025 09:22:52 +0200 Subject: [PATCH 40/45] Build with OpenJDK 25 --- xml-commons-resolver.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 5e4552a..acca003 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -16,7 +16,7 @@ Source8: %{name}-xread.1 Patch: %{name}-1.2-crosslink.patch Patch: %{name}-1.2-osgi.patch -BuildRequires: javapackages-local +BuildRequires: javapackages-local-openjdk25 BuildRequires: ant BuildRequires: apache-parent # TODO Remove in Fedora 46 From 69d830c678f8abc789d136f1d999712c30a7d7a4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:55:28 +0000 Subject: [PATCH 41/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From f924e0160e77f7caf2bd69320dbb5a70e5b4daec Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 30 Jul 2025 01:32:00 +0200 Subject: [PATCH 42/45] 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. --- xml-commons-resolver.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index acca003..1b17cd6 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -17,7 +17,7 @@ Patch: %{name}-1.2-crosslink.patch Patch: %{name}-1.2-osgi.patch BuildRequires: javapackages-local-openjdk25 -BuildRequires: ant +BuildRequires: ant-openjdk25 BuildRequires: apache-parent # TODO Remove in Fedora 46 Obsoletes: %{name}-javadoc < 1.2-53 From 20371c3ca2388a54743b52d9db3c61d4cf0debc3 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Thu, 4 Sep 2025 16:38:50 +0200 Subject: [PATCH 43/45] manual bodhi update for jdk25 needed on selected pkgs From 00d95ea022a52832f68afdd842ab774b975491ee Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:45:07 +0000 Subject: [PATCH 44/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 7198db6806d137149912294249b7b6402c802081 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:17:57 +0000 Subject: [PATCH 45/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild