From 06c2f3e887de05381368822e841c56593a31e764 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 1 Sep 2023 13:34:35 +0200 Subject: [PATCH 01/24] Convert License tag to SPDX format Related: https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2 --- xz-java.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xz-java.spec b/xz-java.spec index 9c4d462..9f3eeb7 100644 --- a/xz-java.spec +++ b/xz-java.spec @@ -2,9 +2,9 @@ Name: xz-java Version: 1.9 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Java implementation of XZ data compression -License: Public Domain +License: LicenseRef-Fedora-Public-Domain URL: http://tukaani.org/xz/java.html BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -57,6 +57,9 @@ mkdir -p extdoc && touch extdoc/package-list %license COPYING %changelog +* Fri Sep 01 2023 Mikolaj Izdebski - 1.9-7 +- Convert License tag to SPDX format + * Sat Jul 22 2023 Fedora Release Engineering - 1.9-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From be7ac0d065b0848005c74731f07fb5e857753b64 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 26 Oct 2023 07:33:08 +0200 Subject: [PATCH 02/24] Update javapackages test plan to f40 --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 8f6c9cb..a2cdaba 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: f37 + ref: f40 execute: how: tmt From 4471be615b180d927a9bfb132437f0d3a19cf7ff Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 10:35:20 +0000 Subject: [PATCH 03/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- xz-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xz-java.spec b/xz-java.spec index 9f3eeb7..8821b3b 100644 --- a/xz-java.spec +++ b/xz-java.spec @@ -2,7 +2,7 @@ Name: xz-java Version: 1.9 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Java implementation of XZ data compression License: LicenseRef-Fedora-Public-Domain URL: http://tukaani.org/xz/java.html @@ -57,6 +57,9 @@ mkdir -p extdoc && touch extdoc/package-list %license COPYING %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 1.9-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Sep 01 2023 Mikolaj Izdebski - 1.9-7 - Convert License tag to SPDX format From bff3133e921dee9ce22d05604fb121d9a545f802 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 21 Feb 2024 10:48:16 +0100 Subject: [PATCH 04/24] Set OpenJDK version to 8 --- xz-java.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/xz-java.spec b/xz-java.spec index 8821b3b..10a44e1 100644 --- a/xz-java.spec +++ b/xz-java.spec @@ -2,14 +2,14 @@ Name: xz-java Version: 1.9 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Java implementation of XZ data compression License: LicenseRef-Fedora-Public-Domain -URL: http://tukaani.org/xz/java.html +URL: https://tukaani.org/xz/java.html BuildArch: noarch ExclusiveArch: %{java_arches} noarch -Source0: http://tukaani.org/xz/xz-java-%{version}.zip +Source0: https://tukaani.org/xz/xz-java-%{version}.zip %if %{with bootstrap} BuildRequires: javapackages-bootstrap @@ -42,7 +42,7 @@ This package contains the API documentation for %{name}. # package-list from oracle.com. Create a dummy package-list to prevent that. mkdir -p extdoc && touch extdoc/package-list -%ant maven +%ant -Dsourcever=8 maven %install %mvn_artifact build/maven/xz-%{version}.pom build/jar/xz.jar @@ -57,6 +57,9 @@ mkdir -p extdoc && touch extdoc/package-list %license COPYING %changelog +* Wed Feb 21 2024 Marian Koncek - 1.9-9 +- Set OpenJDK version to 8 + * Sat Jan 27 2024 Fedora Release Engineering - 1.9-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 444e283ee048b408566f6d5f1e8c62291189359f Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 18:38:49 +0100 Subject: [PATCH 05/24] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- xz-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xz-java.spec b/xz-java.spec index 10a44e1..cdabf2f 100644 --- a/xz-java.spec +++ b/xz-java.spec @@ -2,7 +2,7 @@ Name: xz-java Version: 1.9 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Java implementation of XZ data compression License: LicenseRef-Fedora-Public-Domain URL: https://tukaani.org/xz/java.html @@ -57,6 +57,9 @@ mkdir -p extdoc && touch extdoc/package-list %license COPYING %changelog +* Tue Feb 27 2024 Jiri Vanek - 1.9-10 +- Rebuilt for java-21-openjdk as system jdk + * Wed Feb 21 2024 Marian Koncek - 1.9-9 - Set OpenJDK version to 8 From 500ef4be415afc01e500ba2fece9c6b762068625 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:36:34 +0000 Subject: [PATCH 06/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- xz-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xz-java.spec b/xz-java.spec index cdabf2f..1232146 100644 --- a/xz-java.spec +++ b/xz-java.spec @@ -2,7 +2,7 @@ Name: xz-java Version: 1.9 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Java implementation of XZ data compression License: LicenseRef-Fedora-Public-Domain URL: https://tukaani.org/xz/java.html @@ -57,6 +57,9 @@ mkdir -p extdoc && touch extdoc/package-list %license COPYING %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 1.9-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Feb 27 2024 Jiri Vanek - 1.9-10 - Rebuilt for java-21-openjdk as system jdk From 4d8d76b16b4d5f7959b606cfb21706fbe24640e7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Jul 2024 20:53:30 +0200 Subject: [PATCH 07/24] 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 063b5dea664c8949b490259479faaf0d0eae1332 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2024 16:33:57 +0200 Subject: [PATCH 08/24] Switch from %setup to %autosetup --- xz-java.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xz-java.spec b/xz-java.spec index 1232146..db27802 100644 --- a/xz-java.spec +++ b/xz-java.spec @@ -33,7 +33,7 @@ Summary: Javadocs for %{name} This package contains the API documentation for %{name}. %prep -%setup -q -c %{name}-%{version} +%autosetup -p1 -c %mvn_file : %{name} xz From 11c3831dd2eac3ca82fc868f187ba2becdc07902 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:45:21 +0200 Subject: [PATCH 09/24] Convert to %autorelease and %autochangelog --- changelog | 144 +++++++++++++++++++++++++++++++++++++++++++++++++ xz-java.spec | 147 +-------------------------------------------------- 2 files changed, 146 insertions(+), 145 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..55ea11e --- /dev/null +++ b/changelog @@ -0,0 +1,144 @@ +* Sat Jul 20 2024 Fedora Release Engineering - 1.9-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 1.9-10 +- Rebuilt for java-21-openjdk as system jdk + +* Wed Feb 21 2024 Marian Koncek - 1.9-9 +- Set OpenJDK version to 8 + +* Sat Jan 27 2024 Fedora Release Engineering - 1.9-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Sep 01 2023 Mikolaj Izdebski - 1.9-7 +- Convert License tag to SPDX format + +* Sat Jul 22 2023 Fedora Release Engineering - 1.9-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 1.9-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 1.9-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 1.9-3 +- Rebuilt for java-17-openjdk as system jdk + +* Sat Jan 22 2022 Fedora Release Engineering - 1.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 1.8-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 1.8-11 +- Bootstrap build +- Non-bootstrap build + +* Thu Apr 22 2021 Nicolas De Amicis - 1.9-11 +- Rebuild for new version 1.9 + +* Thu Jan 28 2021 Fedora Release Engineering - 1.8-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 1.8-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sat Jul 11 2020 Jiri Vanek - 1.8-8 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Fri Jun 19 2020 Mat Booth - 1.8-7 +- Allow building against Java 11 + +* Fri Jan 31 2020 Fedora Release Engineering - 1.8-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Nov 05 2019 Mikolaj Izdebski - 1.8-4 +- Mass rebuild for javapackages-tools 201902 + +* Sat Jul 27 2019 Fedora Release Engineering - 1.8-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri May 24 2019 Mikolaj Izdebski - 1.8-3 +- Mass rebuild for javapackages-tools 201901 + +* Sun Feb 03 2019 Fedora Release Engineering - 1.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 1.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 1.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Fri Jan 05 2018 Michael Simacek - 1.8-1 +- Update to upstream version 1.8 + +* Tue Jan 2 2018 Mikolaj Izdebski - 1.7-1 +- Update to upstream version 1.7 + +* Mon Nov 27 2017 Mikolaj Izdebski - 1.6-5 +- Make use of %%license macro + +* Thu Jul 27 2017 Fedora Release Engineering - 1.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Tue Mar 21 2017 Michael Simacek - 1.6-3 +- Install with XMvn + +* Sat Feb 11 2017 Fedora Release Engineering - 1.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Nov 28 2016 Mikolaj Izdebski - 1.6-1 +- Update to upstream version 1.6 + +* Fri Feb 05 2016 Fedora Release Engineering - 1.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 1.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 1.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Wed May 21 2014 Mikolaj Izdebski - 1.5-2 +- Use .mfiles generated during build + +* Mon Mar 10 2014 Mikolaj Izdebski - 1.5-1 +- Update to upstream version 1.5 + +* Tue Mar 04 2014 Stanislav Ochotnicky - 1.4-2 +- Use Requires: java-headless rebuild (#1067528) + +* Mon Sep 23 2013 Mikolaj Izdebski - 1.4-1 +- Update to upstream version 1.4 + +* Sun Aug 04 2013 Fedora Release Engineering - 1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Tue May 14 2013 Mikolaj Izdebski - 1.3-1 +- Update to upstream version 1.3 + +* Tue Jan 29 2013 Mikolaj Izdebski - 1.2-1 +- Update to upstream version 1.2 + +* Thu Jan 3 2013 Krzysztof Daniel 1.1-2 +- Add patch for OSGi Manifest. + +* Fri Aug 17 2012 Mikolaj Izdebski - 1.1-1 +- Update to upstream version 1.1 + +* Sun Jul 22 2012 Fedora Release Engineering - 1.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Jun 21 2012 Mikolaj Izdebski - 1.0-3 +- Install xz.jar symlink + +* Thu Apr 5 2012 Mikolaj Izdebski 1.0-2 +- Fix issues found during package review +- Include missing COPYING files. +- Add missing RPM group. +- Comment on touching package-list. + +* Wed Apr 4 2012 Mikolaj Izdebski 1.0-1 +- Initial packaging. diff --git a/xz-java.spec b/xz-java.spec index db27802..dda2b2c 100644 --- a/xz-java.spec +++ b/xz-java.spec @@ -2,7 +2,7 @@ Name: xz-java Version: 1.9 -Release: 11%{?dist} +Release: %autorelease Summary: Java implementation of XZ data compression License: LicenseRef-Fedora-Public-Domain URL: https://tukaani.org/xz/java.html @@ -57,147 +57,4 @@ mkdir -p extdoc && touch extdoc/package-list %license COPYING %changelog -* Sat Jul 20 2024 Fedora Release Engineering - 1.9-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Feb 27 2024 Jiri Vanek - 1.9-10 -- Rebuilt for java-21-openjdk as system jdk - -* Wed Feb 21 2024 Marian Koncek - 1.9-9 -- Set OpenJDK version to 8 - -* Sat Jan 27 2024 Fedora Release Engineering - 1.9-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Sep 01 2023 Mikolaj Izdebski - 1.9-7 -- Convert License tag to SPDX format - -* Sat Jul 22 2023 Fedora Release Engineering - 1.9-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 1.9-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 1.9-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Feb 05 2022 Jiri Vanek - 1.9-3 -- Rebuilt for java-17-openjdk as system jdk - -* Sat Jan 22 2022 Fedora Release Engineering - 1.9-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 1.8-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon May 17 2021 Mikolaj Izdebski - 1.8-11 -- Bootstrap build -- Non-bootstrap build - -* Thu Apr 22 2021 Nicolas De Amicis - 1.9-11 -- Rebuild for new version 1.9 - -* Thu Jan 28 2021 Fedora Release Engineering - 1.8-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 1.8-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Sat Jul 11 2020 Jiri Vanek - 1.8-8 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Fri Jun 19 2020 Mat Booth - 1.8-7 -- Allow building against Java 11 - -* Fri Jan 31 2020 Fedora Release Engineering - 1.8-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Nov 05 2019 Mikolaj Izdebski - 1.8-4 -- Mass rebuild for javapackages-tools 201902 - -* Sat Jul 27 2019 Fedora Release Engineering - 1.8-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri May 24 2019 Mikolaj Izdebski - 1.8-3 -- Mass rebuild for javapackages-tools 201901 - -* Sun Feb 03 2019 Fedora Release Engineering - 1.8-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 1.8-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 1.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Fri Jan 05 2018 Michael Simacek - 1.8-1 -- Update to upstream version 1.8 - -* Tue Jan 2 2018 Mikolaj Izdebski - 1.7-1 -- Update to upstream version 1.7 - -* Mon Nov 27 2017 Mikolaj Izdebski - 1.6-5 -- Make use of %%license macro - -* Thu Jul 27 2017 Fedora Release Engineering - 1.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Tue Mar 21 2017 Michael Simacek - 1.6-3 -- Install with XMvn - -* Sat Feb 11 2017 Fedora Release Engineering - 1.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Nov 28 2016 Mikolaj Izdebski - 1.6-1 -- Update to upstream version 1.6 - -* Fri Feb 05 2016 Fedora Release Engineering - 1.5-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 1.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 1.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Wed May 21 2014 Mikolaj Izdebski - 1.5-2 -- Use .mfiles generated during build - -* Mon Mar 10 2014 Mikolaj Izdebski - 1.5-1 -- Update to upstream version 1.5 - -* Tue Mar 04 2014 Stanislav Ochotnicky - 1.4-2 -- Use Requires: java-headless rebuild (#1067528) - -* Mon Sep 23 2013 Mikolaj Izdebski - 1.4-1 -- Update to upstream version 1.4 - -* Sun Aug 04 2013 Fedora Release Engineering - 1.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Tue May 14 2013 Mikolaj Izdebski - 1.3-1 -- Update to upstream version 1.3 - -* Tue Jan 29 2013 Mikolaj Izdebski - 1.2-1 -- Update to upstream version 1.2 - -* Thu Jan 3 2013 Krzysztof Daniel 1.1-2 -- Add patch for OSGi Manifest. - -* Fri Aug 17 2012 Mikolaj Izdebski - 1.1-1 -- Update to upstream version 1.1 - -* Sun Jul 22 2012 Fedora Release Engineering - 1.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Jun 21 2012 Mikolaj Izdebski - 1.0-3 -- Install xz.jar symlink - -* Thu Apr 5 2012 Mikolaj Izdebski 1.0-2 -- Fix issues found during package review -- Include missing COPYING files. -- Add missing RPM group. -- Comment on touching package-list. - -* Wed Apr 4 2012 Mikolaj Izdebski 1.0-1 -- Initial packaging. +%autochangelog From 704f05c8ea48d624955e88cf17c7df7e191f515d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 29 Nov 2024 08:28:39 +0100 Subject: [PATCH 10/24] Update javapackages test plan to f42 --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From a66d6f15cbafc086ded78f8ba7c887c3aa050daf Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2024 16:33:57 +0200 Subject: [PATCH 11/24] Use %autosetup -C --- xz-java.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xz-java.spec b/xz-java.spec index dda2b2c..56166eb 100644 --- a/xz-java.spec +++ b/xz-java.spec @@ -33,7 +33,7 @@ Summary: Javadocs for %{name} This package contains the API documentation for %{name}. %prep -%autosetup -p1 -c +%autosetup -p1 -C %mvn_file : %{name} xz From 6db96b6ed68c2eddf70f4cfc3da7d53c3f391a2a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 31 Dec 2024 09:59:11 +0100 Subject: [PATCH 12/24] Update javadoc package description [skip changelog] --- xz-java.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xz-java.spec b/xz-java.spec index 56166eb..e2dde50 100644 --- a/xz-java.spec +++ b/xz-java.spec @@ -27,10 +27,10 @@ decompression with limited random access support, raw streams (no .xz headers) for advanced users, including LZMA2 with preset dictionary. %package javadoc -Summary: Javadocs for %{name} +Summary: API documentation for %{name} %description javadoc -This package contains the API documentation for %{name}. +API documentation for %{name}. %prep %autosetup -p1 -C From e0c051497ea37a75a68858747fd4ae1b9689ec37 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:27:47 +0000 Subject: [PATCH 13/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 242f3191a23758f32303a69dd6863f334ebb5832 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 3 Mar 2025 11:57:14 +0100 Subject: [PATCH 14/24] Remove javadoc subpackage --- xz-java.spec | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/xz-java.spec b/xz-java.spec index e2dde50..4a0ccf2 100644 --- a/xz-java.spec +++ b/xz-java.spec @@ -17,6 +17,8 @@ BuildRequires: javapackages-bootstrap BuildRequires: javapackages-local BuildRequires: ant %endif +# TODO Remove in Fedora 46 +Obsoletes: %{name}-javadoc < 1.9-25 %description A complete implementation of XZ data compression in Java. @@ -26,12 +28,6 @@ single-threaded streamed compression and decompression, single-threaded decompression with limited random access support, raw streams (no .xz headers) for advanced users, including LZMA2 with preset dictionary. -%package javadoc -Summary: API documentation for %{name} - -%description javadoc -API documentation for %{name}. - %prep %autosetup -p1 -C @@ -47,14 +43,11 @@ mkdir -p extdoc && touch extdoc/package-list %install %mvn_artifact build/maven/xz-%{version}.pom build/jar/xz.jar -%mvn_install -J build/doc +%mvn_install %files -f .mfiles %doc README THANKS %license COPYING -%files javadoc -f .mfiles-javadoc -%license COPYING - %changelog %autochangelog From 7f9383bc5afc9ec4b3b7a80a37052fa46e11f821 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 26 Mar 2025 08:43:19 +0100 Subject: [PATCH 15/24] 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 47ef662d9ee32f8298287f01a027b22e638b5cba Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 May 2025 13:35:32 +0200 Subject: [PATCH 16/24] 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 493152534974d5c37d99406804a23fc860d203e7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 13 Jul 2025 09:22:52 +0200 Subject: [PATCH 17/24] Build with OpenJDK 25 --- xz-java.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xz-java.spec b/xz-java.spec index 4a0ccf2..9910e94 100644 --- a/xz-java.spec +++ b/xz-java.spec @@ -14,7 +14,7 @@ Source0: https://tukaani.org/xz/xz-java-%{version}.zip %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: javapackages-local +BuildRequires: javapackages-local-openjdk25 BuildRequires: ant %endif # TODO Remove in Fedora 46 From 0ec61441f4423297fcfdada12d4c94155773ef92 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 21:09:19 +0000 Subject: [PATCH 18/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 6bb90472cb0b966ee817da9858835a1549d2bb83 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 30 Jul 2025 01:36:25 +0200 Subject: [PATCH 19/24] 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. --- xz-java.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xz-java.spec b/xz-java.spec index 9910e94..18def98 100644 --- a/xz-java.spec +++ b/xz-java.spec @@ -15,7 +15,7 @@ Source0: https://tukaani.org/xz/xz-java-%{version}.zip BuildRequires: javapackages-bootstrap %else BuildRequires: javapackages-local-openjdk25 -BuildRequires: ant +BuildRequires: ant-openjdk25 %endif # TODO Remove in Fedora 46 Obsoletes: %{name}-javadoc < 1.9-25 From 19c9ac7426d0328ef12f94ba31e0fa69510e67e1 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Thu, 4 Sep 2025 17:00:05 +0200 Subject: [PATCH 20/24] manual bodhi update for jdk25 needed on selected pkgs From 6e41aaba08d7c5e981bf0db0c59e751e5bd28647 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:59:02 +0000 Subject: [PATCH 21/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From d434f529b8bb1f9e849fed15b6899a2aa46d0d18 Mon Sep 17 00:00:00 2001 From: Jacek Migacz Date: Mon, 9 Mar 2026 15:10:29 +0000 Subject: [PATCH 22/24] Update to upstream version 1.12 --- .gitignore | 1 + sources | 2 +- xz-java.spec | 19 ++++++++++++++++--- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index aedbbd8..a2e8691 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /xz-java-1.7.zip /xz-java-1.8.zip /xz-java-1.9.zip +/xz-java-1.12.zip diff --git a/sources b/sources index 535d643..83cfb86 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xz-java-1.9.zip) = 743f81ac715d7ac2760af8cee4c62d8fbeef156c0d3e0e85e4605ae08d6a71d1e6f6675e0558e7906a92d5fb3ca1feab9db015a1d42b5df73de2dec770a339cb +SHA512 (xz-java-1.12.zip) = ea6b6fa8b7021a3e8caa9b750156078182fcde1c4c9926740fea51827facba8227d3d2fe6c95de7a4e9ce9cda531f4706d9a582a04155ac2eaac36c5f51c8bf7 diff --git a/xz-java.spec b/xz-java.spec index 18def98..c951bf0 100644 --- a/xz-java.spec +++ b/xz-java.spec @@ -1,7 +1,7 @@ %bcond_with bootstrap Name: xz-java -Version: 1.9 +Version: 1.12 Release: %autorelease Summary: Java implementation of XZ data compression License: LicenseRef-Fedora-Public-Domain @@ -31,6 +31,19 @@ for advanced users, including LZMA2 with preset dictionary. %prep %autosetup -p1 -C +# Strip modern Ant namespace attributes for bootstrap compatibility. +# javapackages-bootstrap uses an older Ant that doesn't support ant:if/ant:unless. +# TODO Drop after javapackages-bootstrap > 1.27 is released +sed -i 's/xmlns:if="ant:if"//g' build.xml +sed -i 's/xmlns:unless="ant:unless"//g' build.xml +sed -i 's/\sif:true="[^"]*"//g' build.xml +sed -i 's/\sunless:true="[^"]*"//g' build.xml +sed -i 's/\sif:set="[^"]*"//g' build.xml +sed -i 's/\sunless:set="[^"]*"//g' build.xml +sed -i 's/\smodificationtime="[^"]*"//g' build.xml +sed -i 's/if:true="[^"]*"//g' build.xml +sed -i 's/unless:true="[^"]*"//g' build.xml + %mvn_file : %{name} xz %build @@ -38,7 +51,7 @@ for advanced users, including LZMA2 with preset dictionary. # package-list from oracle.com. Create a dummy package-list to prevent that. mkdir -p extdoc && touch extdoc/package-list -%ant -Dsourcever=8 maven +%ant -Dsourcever=8 -Dsourcever9=9 maven %install %mvn_artifact build/maven/xz-%{version}.pom build/jar/xz.jar @@ -46,7 +59,7 @@ mkdir -p extdoc && touch extdoc/package-list %mvn_install %files -f .mfiles -%doc README THANKS +%doc README.md THANKS.md %license COPYING %changelog From 31ce7fadbf80ec2e1d9c746d1b5a72dd553f719e Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 6 May 2026 14:55:02 +0200 Subject: [PATCH 23/24] Drop unneeded build patch --- xz-java.spec | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/xz-java.spec b/xz-java.spec index c951bf0..cba9d4b 100644 --- a/xz-java.spec +++ b/xz-java.spec @@ -31,19 +31,6 @@ for advanced users, including LZMA2 with preset dictionary. %prep %autosetup -p1 -C -# Strip modern Ant namespace attributes for bootstrap compatibility. -# javapackages-bootstrap uses an older Ant that doesn't support ant:if/ant:unless. -# TODO Drop after javapackages-bootstrap > 1.27 is released -sed -i 's/xmlns:if="ant:if"//g' build.xml -sed -i 's/xmlns:unless="ant:unless"//g' build.xml -sed -i 's/\sif:true="[^"]*"//g' build.xml -sed -i 's/\sunless:true="[^"]*"//g' build.xml -sed -i 's/\sif:set="[^"]*"//g' build.xml -sed -i 's/\sunless:set="[^"]*"//g' build.xml -sed -i 's/\smodificationtime="[^"]*"//g' build.xml -sed -i 's/if:true="[^"]*"//g' build.xml -sed -i 's/unless:true="[^"]*"//g' build.xml - %mvn_file : %{name} xz %build From 8c3ea8c99531baeab1d5a57487498cb7725f50f8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:31:31 +0000 Subject: [PATCH 24/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild