From 98de13ab026ed47671202994eb1bc0c125618b4d Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 23 Feb 2024 14:22:26 +0100 Subject: [PATCH 01/20] bump of release for for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 We are sorry, we messed a bit, and we have to bump release in this package --- jansi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jansi.spec b/jansi.spec index b950882..2459a12 100644 --- a/jansi.spec +++ b/jansi.spec @@ -2,7 +2,7 @@ Name: jansi Version: 2.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Generate and interpret ANSI escape sequences in Java License: Apache-2.0 URL: http://fusesource.github.io/jansi/ @@ -95,6 +95,9 @@ cp -p src/main/native/libjansi.so %{buildroot}%{_prefix}/lib/%{name} %license license.txt %changelog +* Fri Feb 23 2024 Jiri Vanek - 2.4.1-2 +- bump of release for for java-21-openjdk as system jdk + * Thu Feb 01 2024 Mikolaj Izdebski - 2.4.1-1 - Update to upstream version 2.4.1 From cd8201cf41a5dc25f18b8285f924def578083299 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 15:59:59 +0100 Subject: [PATCH 02/20] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- jansi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jansi.spec b/jansi.spec index 2459a12..2b8481b 100644 --- a/jansi.spec +++ b/jansi.spec @@ -2,7 +2,7 @@ Name: jansi Version: 2.4.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Generate and interpret ANSI escape sequences in Java License: Apache-2.0 URL: http://fusesource.github.io/jansi/ @@ -95,6 +95,9 @@ cp -p src/main/native/libjansi.so %{buildroot}%{_prefix}/lib/%{name} %license license.txt %changelog +* Tue Feb 27 2024 Jiri Vanek - 2.4.1-3 +- Rebuilt for java-21-openjdk as system jdk + * Fri Feb 23 2024 Jiri Vanek - 2.4.1-2 - bump of release for for java-21-openjdk as system jdk From b961e56fd214854f68eecff56b235895929b547d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 10:48:21 +0000 Subject: [PATCH 03/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- jansi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jansi.spec b/jansi.spec index 2b8481b..cae3bbe 100644 --- a/jansi.spec +++ b/jansi.spec @@ -2,7 +2,7 @@ Name: jansi Version: 2.4.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Generate and interpret ANSI escape sequences in Java License: Apache-2.0 URL: http://fusesource.github.io/jansi/ @@ -95,6 +95,9 @@ cp -p src/main/native/libjansi.so %{buildroot}%{_prefix}/lib/%{name} %license license.txt %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 2.4.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Feb 27 2024 Jiri Vanek - 2.4.1-3 - Rebuilt for java-21-openjdk as system jdk From ce46ed4e49579a8c5ec1ac9c97d2841384333793 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Jul 2024 20:53:29 +0200 Subject: [PATCH 04/20] 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 5baf83f1e77dace752e6a2e54169a6249020c61f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2024 16:32:53 +0200 Subject: [PATCH 05/20] Use %autosetup -C --- jansi.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jansi.spec b/jansi.spec index cae3bbe..ca6b739 100644 --- a/jansi.spec +++ b/jansi.spec @@ -43,7 +43,7 @@ Summary: Javadocs for %{name} This package contains the API documentation for %{name}. %prep -%autosetup -n jansi-jansi-%{version} -p1 +%autosetup -p1 -C # We don't need the Fuse JXR skin %pom_xpath_remove "pom:build/pom:extensions" From 796b475f5691da1a9d06f071cbc38f15342af29a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 Aug 2024 22:13:18 +0200 Subject: [PATCH 06/20] Switch to non-numdered patches --- jansi.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jansi.spec b/jansi.spec index ca6b739..57e3c76 100644 --- a/jansi.spec +++ b/jansi.spec @@ -14,7 +14,7 @@ Source0: %{name}-%{version}.tar.gz Source1: generate-tarball.sh # Change the location of the native artifact to where Fedora wants it -Patch0: %{name}-jni.patch +Patch: %{name}-jni.patch BuildRequires: gcc %if %{with bootstrap} From 1d242eee4426ae27861e2a33b21dfbf770049239 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:45:06 +0200 Subject: [PATCH 07/20] Convert to %autorelease and %autochangelog --- changelog | 176 +++++++++++++++++++++++++++++++++++++++++++++++++++ jansi.spec | 180 +---------------------------------------------------- 2 files changed, 178 insertions(+), 178 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..1990d35 --- /dev/null +++ b/changelog @@ -0,0 +1,176 @@ +* Thu Jul 18 2024 Fedora Release Engineering - 2.4.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 2.4.1-3 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 2.4.1-2 +- bump of release for for java-21-openjdk as system jdk + +* Thu Feb 01 2024 Mikolaj Izdebski - 2.4.1-1 +- Update to upstream version 2.4.1 + +* Wed Jan 24 2024 Fedora Release Engineering - 2.4.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jan 20 2024 Fedora Release Engineering - 2.4.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Sep 20 2023 Mikolaj Izdebski - 2.4.0-10 +- Rebuild to regenerate auto-Requires on java + +* Fri Sep 01 2023 Mikolaj Izdebski - 2.4.0-9 +- Convert License tag to SPDX format + +* Thu Jul 20 2023 Fedora Release Engineering - 2.4.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 2.4.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 2.4.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jul 18 2022 Mikolaj Izdebski - 2.4.0-5 +- Ensure CC env variable is set during build + +* Thu Jul 14 2022 Marian Koncek - 2.4.0-4 +- Make javadoc subpackage noarch + +* Sat Feb 05 2022 Jiri Vanek - 2.4.0-3 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 2.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Mon Nov 01 2021 Marian Koncek - 2.4.0-1 +- Update to upstream version 2.4.0 + +* Fri Sep 24 2021 Marian Koncek - 2.3.3-3 +- Install native artifact into a fixed location +- Related: rhbz#1994935 + +* Thu Jul 22 2021 Fedora Release Engineering - 2.3.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jun 23 2021 Jerry James - 2.3.3-1 +- Version 2.3.3 + +* Fri Jun 18 2021 Mikolaj Izdebski - 2.1.1-5 +- Clean tarball from content with questionable licensing +- Resolves: rhbz#1973738 + +* Mon May 17 2021 Mikolaj Izdebski - 2.1.1-4 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 2.1.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Jan 14 2021 Timm Bäder - 2.1.1-2 +- Use standard variables when compiling native artifact + +* Tue Dec 15 2020 Jerry James - 2.1.1-1 +- Version 2.1.1 +- Remove package name from Summary +- Add patch to change the location of the JNI shared object + +* Tue Jul 28 2020 Fedora Release Engineering - 1.18-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 1.18-4 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Wed Jan 29 2020 Fedora Release Engineering - 1.18-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 1.18-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Jun 08 2019 Fabio Valentini - 1.18-1 +- Update to version 1.18. + +* Fri Feb 01 2019 Fedora Release Engineering - 1.17.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 1.17.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jun 05 2018 Michael Simacek - 1.17.1-1 +- Update to upstream version 1.17.1 + +* Mon Feb 26 2018 Michael Simacek - 1.17-1 +- Update to upstream version 1.17 + +* Wed Feb 07 2018 Fedora Release Engineering - 1.16-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1.16-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Wed Jun 14 2017 Michael Simacek - 1.16-1 +- Update to upstream version 1.16 + +* Fri Feb 10 2017 Fedora Release Engineering - 1.11-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Feb 01 2017 Michael Simacek - 1.11-11 +- Remove BR on maven-site-plugin + +* Thu Feb 04 2016 Fedora Release Engineering - 1.11-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 1.11-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Thu May 14 2015 Mikolaj Izdebski - 1.11-8 +- Remove maven-javadoc-plugin execution + +* Tue Jan 27 2015 Mat Booth - 1.11-7 +- Add/remove BRs to fix FTBFS bug + +* Sat Jun 07 2014 Fedora Release Engineering - 1.11-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Mon May 26 2014 Mikolaj Izdebski - 1.11-5 +- Migrate BuildRequires from junit4 to junit + +* Mon May 26 2014 Mikolaj Izdebski - 1.11-4 +- Remove BuildRequires on maven-surefire-provider-junit4 + +* Wed Sep 11 2013 Marek Goldmann - 1.11-3 +- Using xmvn +- Remove the jboss-native deps with classifiers + +* Sat Aug 03 2013 Fedora Release Engineering - 1.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Tue May 21 2013 Marek Goldmann - 1.11-1 +- Upstream release 1.11 RHBZ#962761 +- CVE-2013-2035 HawtJNI: predictable temporary file name leading to local arbitrary code execution RHBZ#962614 + +* Thu Feb 14 2013 Fedora Release Engineering - 1.9-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Feb 06 2013 Java SIG - 1.9-2 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Tue Oct 09 2012 Marek Goldmann - 1.9-1 +- Upstream release 1.9, RHBZ#864490 + +* Thu Jul 19 2012 Fedora Release Engineering - 1.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri May 04 2012 Tomas Radej - 1.6-3 +- Removed maven-license-plugin BR + +* Fri Jan 13 2012 Fedora Release Engineering - 1.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Thu Aug 25 2011 Marek Goldmann 1.6-1 +- Upstream release 1.6 +- Spec file cleanup + +* Fri May 27 2011 Marek Goldmann 1.5-1 +- Initial packaging diff --git a/jansi.spec b/jansi.spec index 57e3c76..ccf3fff 100644 --- a/jansi.spec +++ b/jansi.spec @@ -2,7 +2,7 @@ Name: jansi Version: 2.4.1 -Release: 4%{?dist} +Release: %autorelease Summary: Generate and interpret ANSI escape sequences in Java License: Apache-2.0 URL: http://fusesource.github.io/jansi/ @@ -95,180 +95,4 @@ cp -p src/main/native/libjansi.so %{buildroot}%{_prefix}/lib/%{name} %license license.txt %changelog -* Thu Jul 18 2024 Fedora Release Engineering - 2.4.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Feb 27 2024 Jiri Vanek - 2.4.1-3 -- Rebuilt for java-21-openjdk as system jdk - -* Fri Feb 23 2024 Jiri Vanek - 2.4.1-2 -- bump of release for for java-21-openjdk as system jdk - -* Thu Feb 01 2024 Mikolaj Izdebski - 2.4.1-1 -- Update to upstream version 2.4.1 - -* Wed Jan 24 2024 Fedora Release Engineering - 2.4.0-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jan 20 2024 Fedora Release Engineering - 2.4.0-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Sep 20 2023 Mikolaj Izdebski - 2.4.0-10 -- Rebuild to regenerate auto-Requires on java - -* Fri Sep 01 2023 Mikolaj Izdebski - 2.4.0-9 -- Convert License tag to SPDX format - -* Thu Jul 20 2023 Fedora Release Engineering - 2.4.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jan 19 2023 Fedora Release Engineering - 2.4.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jul 21 2022 Fedora Release Engineering - 2.4.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon Jul 18 2022 Mikolaj Izdebski - 2.4.0-5 -- Ensure CC env variable is set during build - -* Thu Jul 14 2022 Marian Koncek - 2.4.0-4 -- Make javadoc subpackage noarch - -* Sat Feb 05 2022 Jiri Vanek - 2.4.0-3 -- Rebuilt for java-17-openjdk as system jdk - -* Thu Jan 20 2022 Fedora Release Engineering - 2.4.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Mon Nov 01 2021 Marian Koncek - 2.4.0-1 -- Update to upstream version 2.4.0 - -* Fri Sep 24 2021 Marian Koncek - 2.3.3-3 -- Install native artifact into a fixed location -- Related: rhbz#1994935 - -* Thu Jul 22 2021 Fedora Release Engineering - 2.3.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jun 23 2021 Jerry James - 2.3.3-1 -- Version 2.3.3 - -* Fri Jun 18 2021 Mikolaj Izdebski - 2.1.1-5 -- Clean tarball from content with questionable licensing -- Resolves: rhbz#1973738 - -* Mon May 17 2021 Mikolaj Izdebski - 2.1.1-4 -- Bootstrap build -- Non-bootstrap build - -* Tue Jan 26 2021 Fedora Release Engineering - 2.1.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Thu Jan 14 2021 Timm Bäder - 2.1.1-2 -- Use standard variables when compiling native artifact - -* Tue Dec 15 2020 Jerry James - 2.1.1-1 -- Version 2.1.1 -- Remove package name from Summary -- Add patch to change the location of the JNI shared object - -* Tue Jul 28 2020 Fedora Release Engineering - 1.18-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jul 10 2020 Jiri Vanek - 1.18-4 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Wed Jan 29 2020 Fedora Release Engineering - 1.18-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering - 1.18-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sat Jun 08 2019 Fabio Valentini - 1.18-1 -- Update to version 1.18. - -* Fri Feb 01 2019 Fedora Release Engineering - 1.17.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 1.17.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Jun 05 2018 Michael Simacek - 1.17.1-1 -- Update to upstream version 1.17.1 - -* Mon Feb 26 2018 Michael Simacek - 1.17-1 -- Update to upstream version 1.17 - -* Wed Feb 07 2018 Fedora Release Engineering - 1.16-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1.16-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Wed Jun 14 2017 Michael Simacek - 1.16-1 -- Update to upstream version 1.16 - -* Fri Feb 10 2017 Fedora Release Engineering - 1.11-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Feb 01 2017 Michael Simacek - 1.11-11 -- Remove BR on maven-site-plugin - -* Thu Feb 04 2016 Fedora Release Engineering - 1.11-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 1.11-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Thu May 14 2015 Mikolaj Izdebski - 1.11-8 -- Remove maven-javadoc-plugin execution - -* Tue Jan 27 2015 Mat Booth - 1.11-7 -- Add/remove BRs to fix FTBFS bug - -* Sat Jun 07 2014 Fedora Release Engineering - 1.11-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Mon May 26 2014 Mikolaj Izdebski - 1.11-5 -- Migrate BuildRequires from junit4 to junit - -* Mon May 26 2014 Mikolaj Izdebski - 1.11-4 -- Remove BuildRequires on maven-surefire-provider-junit4 - -* Wed Sep 11 2013 Marek Goldmann - 1.11-3 -- Using xmvn -- Remove the jboss-native deps with classifiers - -* Sat Aug 03 2013 Fedora Release Engineering - 1.11-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Tue May 21 2013 Marek Goldmann - 1.11-1 -- Upstream release 1.11 RHBZ#962761 -- CVE-2013-2035 HawtJNI: predictable temporary file name leading to local arbitrary code execution RHBZ#962614 - -* Thu Feb 14 2013 Fedora Release Engineering - 1.9-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Feb 06 2013 Java SIG - 1.9-2 -- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild -- Replace maven BuildRequires with maven-local - -* Tue Oct 09 2012 Marek Goldmann - 1.9-1 -- Upstream release 1.9, RHBZ#864490 - -* Thu Jul 19 2012 Fedora Release Engineering - 1.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri May 04 2012 Tomas Radej - 1.6-3 -- Removed maven-license-plugin BR - -* Fri Jan 13 2012 Fedora Release Engineering - 1.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Thu Aug 25 2011 Marek Goldmann 1.6-1 -- Upstream release 1.6 -- Spec file cleanup - -* Fri May 27 2011 Marek Goldmann 1.5-1 -- Initial packaging - +%autochangelog From aef5336e84286c2d75bb71e73974caf8aede930d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 29 Nov 2024 08:28:38 +0100 Subject: [PATCH 08/20] 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 688cac65542f2a1f423be8e932d59a5a5bf0e8d8 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 30 Dec 2024 16:01:18 +0100 Subject: [PATCH 09/20] Unify spec style with the rest of Java/Maven packages [skip changelog] --- jansi.spec | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/jansi.spec b/jansi.spec index ccf3fff..b046360 100644 --- a/jansi.spec +++ b/jansi.spec @@ -1,32 +1,32 @@ %bcond_with bootstrap -Name: jansi -Version: 2.4.1 -Release: %autorelease -Summary: Generate and interpret ANSI escape sequences in Java -License: Apache-2.0 -URL: http://fusesource.github.io/jansi/ -ExclusiveArch: %{java_arches} +Name: jansi +Version: 2.4.1 +Release: %autorelease +Summary: Generate and interpret ANSI escape sequences in Java +License: Apache-2.0 +URL: http://fusesource.github.io/jansi/ +ExclusiveArch: %{java_arches} # ./generate-tarball.sh -Source0: %{name}-%{version}.tar.gz +Source0: %{name}-%{version}.tar.gz # Remove bundled binaries which cannot be easily verified for licensing -Source1: generate-tarball.sh +Source1: generate-tarball.sh # Change the location of the native artifact to where Fedora wants it -Patch: %{name}-jni.patch +Patch: %{name}-jni.patch -BuildRequires: gcc +BuildRequires: gcc %if %{with bootstrap} -BuildRequires: javapackages-bootstrap +BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local -BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) -BuildRequires: mvn(org.fusesource:fusesource-pom:pom:) -BuildRequires: mvn(org.junit.jupiter:junit-jupiter) -BuildRequires: mvn(org.junit.jupiter:junit-jupiter-params) -BuildRequires: mvn(org.moditect:moditect-maven-plugin) +BuildRequires: maven-local +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) +BuildRequires: mvn(org.fusesource:fusesource-pom:pom:) +BuildRequires: mvn(org.junit.jupiter:junit-jupiter) +BuildRequires: mvn(org.junit.jupiter:junit-jupiter-params) +BuildRequires: mvn(org.moditect:moditect-maven-plugin) %endif %description @@ -36,8 +36,8 @@ which don't support it like Windows and provides graceful degradation for when output is being sent to output devices which cannot support ANSI sequences. %package javadoc -BuildArch: noarch -Summary: Javadocs for %{name} +BuildArch: noarch +Summary: Javadocs for %{name} %description javadoc This package contains the API documentation for %{name}. From 09b63a68c3c91920f47748a5ebf0a0cb1f67821a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 30 Dec 2024 16:40:57 +0100 Subject: [PATCH 10/20] Reorder spec file tags [skip changelog] --- jansi.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jansi.spec b/jansi.spec index b046360..bc5eebe 100644 --- a/jansi.spec +++ b/jansi.spec @@ -36,8 +36,8 @@ which don't support it like Windows and provides graceful degradation for when output is being sent to output devices which cannot support ANSI sequences. %package javadoc -BuildArch: noarch Summary: Javadocs for %{name} +BuildArch: noarch %description javadoc This package contains the API documentation for %{name}. From 79525e6ac6e182fdf107682044af7ac6855268ba Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 31 Dec 2024 09:59:10 +0100 Subject: [PATCH 11/20] Update javadoc package description [skip changelog] --- jansi.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jansi.spec b/jansi.spec index bc5eebe..6a7ab43 100644 --- a/jansi.spec +++ b/jansi.spec @@ -36,11 +36,11 @@ which don't support it like Windows and provides graceful degradation for when output is being sent to output devices which cannot support ANSI sequences. %package javadoc -Summary: Javadocs for %{name} +Summary: API documentation for %{name} BuildArch: noarch %description javadoc -This package contains the API documentation for %{name}. +API documentation for %{name}. %prep %autosetup -p1 -C From 854edd6035484a3bbbafbf4dcb8d12434b157627 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 13 Jan 2025 10:46:45 +0100 Subject: [PATCH 12/20] Switch upstream URL to https --- jansi.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jansi.spec b/jansi.spec index 6a7ab43..2548240 100644 --- a/jansi.spec +++ b/jansi.spec @@ -5,7 +5,7 @@ Version: 2.4.1 Release: %autorelease Summary: Generate and interpret ANSI escape sequences in Java License: Apache-2.0 -URL: http://fusesource.github.io/jansi/ +URL: https://fusesource.github.io/jansi/ ExclusiveArch: %{java_arches} # ./generate-tarball.sh From 7ff14b170a189dea9343d3ffc49f2ec9b2a5eb85 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 07:39:23 +0000 Subject: [PATCH 13/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From f10e033636d192abb2aea9fc738439bedae43b4a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 3 Mar 2025 11:57:13 +0100 Subject: [PATCH 14/20] Remove javadoc subpackage --- jansi.spec | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/jansi.spec b/jansi.spec index 2548240..f03b791 100644 --- a/jansi.spec +++ b/jansi.spec @@ -28,6 +28,8 @@ BuildRequires: mvn(org.junit.jupiter:junit-jupiter) BuildRequires: mvn(org.junit.jupiter:junit-jupiter-params) BuildRequires: mvn(org.moditect:moditect-maven-plugin) %endif +# TODO Remove in Fedora 46 +Obsoletes: %{name}-javadoc < 2.4.1-16 %description Jansi is a small java library that allows you to use ANSI escape sequences @@ -35,13 +37,6 @@ in your Java console applications. It implements ANSI support on platforms which don't support it like Windows and provides graceful degradation for when output is being sent to output devices which cannot support ANSI sequences. -%package javadoc -Summary: API documentation for %{name} -BuildArch: noarch - -%description javadoc -API documentation for %{name}. - %prep %autosetup -p1 -C @@ -76,7 +71,7 @@ $CC $CFLAGS $LDFLAGS -shared -o libjansi.so *.o -lutil cd - # Build the Java artifacts -%mvn_build -- -Dlibrary.jansi.path=$PWD/src/main/native +%mvn_build -j -- -Dlibrary.jansi.path=$PWD/src/main/native %install # Install the native artifact @@ -91,8 +86,5 @@ cp -p src/main/native/libjansi.so %{buildroot}%{_prefix}/lib/%{name} %doc readme.md changelog.md %{_prefix}/lib/%{name}/ -%files javadoc -f .mfiles-javadoc -%license license.txt - %changelog %autochangelog From 88ebdbccc8f2799a46e59db69f0799e95654f462 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 26 Mar 2025 08:43:19 +0100 Subject: [PATCH 15/20] 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 a6310dfdf86e7314cb91db3c41108dd29e77e99c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 May 2025 13:35:31 +0200 Subject: [PATCH 16/20] 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 1459f708c6deebdaad80c37eeb8d232a00303f8a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 13 Jul 2025 09:22:51 +0200 Subject: [PATCH 17/20] Build with OpenJDK 25 --- jansi.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jansi.spec b/jansi.spec index f03b791..250d31d 100644 --- a/jansi.spec +++ b/jansi.spec @@ -20,7 +20,7 @@ BuildRequires: gcc %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) BuildRequires: mvn(org.fusesource:fusesource-pom:pom:) From 3a6b78ed100bf7025d860fd66222dc345103865b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 17:54:22 +0000 Subject: [PATCH 18/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 121c35e67e93f6efd1118b45f7759dd59d529a6a Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 29 Jul 2025 21:12:21 +0200 Subject: [PATCH 19/20] 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. From 9479c221f8069bb238c38624e3a56411f73d7d28 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 13 Oct 2025 14:37:58 +0200 Subject: [PATCH 20/20] Update to upstream version 2.4.2 --- .gitignore | 1 + jansi.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6dcfd3b..0422885 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /jansi-2.3.3.tar.gz /jansi-2.4.0.tar.gz /jansi-2.4.1.tar.gz +/jansi-2.4.2.tar.gz diff --git a/jansi.spec b/jansi.spec index 250d31d..e0ff6c1 100644 --- a/jansi.spec +++ b/jansi.spec @@ -1,7 +1,7 @@ %bcond_with bootstrap Name: jansi -Version: 2.4.1 +Version: 2.4.2 Release: %autorelease Summary: Generate and interpret ANSI escape sequences in Java License: Apache-2.0 diff --git a/sources b/sources index 4195d27..a426a1c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jansi-2.4.1.tar.gz) = 5b3627e18ac6932df034f94e2090c3ec1d713879c61672fc16bd22603da3ddeadf59e9124fea3406c6abb8c90df1b64a2f460ec4f713d142f14261783b34938a +SHA512 (jansi-2.4.2.tar.gz) = a2e1e7d120a474cdaa942d3ea03055b88f5fc5f404af445c422b5d0c365810b824bc529c3c1619e8378541e7138ddb826a92160c945ddbdd8daccf0705437a0f