From 524cc2657b6fb604385eec31263df2f2d1234664 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 17 May 2021 08:43:36 +0200 Subject: [PATCH 01/45] Implement bootstrap mode --- jansi.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/jansi.spec b/jansi.spec index cdc9647..f6f9831 100644 --- a/jansi.spec +++ b/jansi.spec @@ -1,3 +1,5 @@ +%bcond_with bootstrap + Name: jansi Version: 2.1.1 Release: 3%{?dist} @@ -11,11 +13,15 @@ Patch0: %{name}-jni.patch BuildRequires: gcc BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) BuildRequires: mvn(org.apache.maven.surefire:surefire-junit-platform) BuildRequires: mvn(org.fusesource:fusesource-pom:pom:) BuildRequires: mvn(org.junit.jupiter:junit-jupiter-engine) +%endif %description Jansi is a small java library that allows you to use ANSI escape sequences From abfd11413a19a7ad05ee89ea12fc75b4cb087b2c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 17 May 2021 15:49:50 +0200 Subject: [PATCH 02/45] Bootstrap build --- jansi.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/jansi.spec b/jansi.spec index f6f9831..80dfea3 100644 --- a/jansi.spec +++ b/jansi.spec @@ -1,8 +1,8 @@ -%bcond_with bootstrap +%bcond_without bootstrap Name: jansi Version: 2.1.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Generate and interpret ANSI escape sequences in Java License: ASL 2.0 @@ -98,6 +98,9 @@ cp -p src/main/native/libjansi.so %{buildroot}%{_libdir}/%{name} %license license.txt %changelog +* Mon May 17 2021 Mikolaj Izdebski - 2.1.1-4 +- Bootstrap build + * Tue Jan 26 2021 Fedora Release Engineering - 2.1.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 3a3016f5823c3efa0296107616ab9be62aa7e0c7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 17 May 2021 18:01:43 +0200 Subject: [PATCH 03/45] Non-bootstrap build --- jansi.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jansi.spec b/jansi.spec index 80dfea3..8d1ebd8 100644 --- a/jansi.spec +++ b/jansi.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: jansi Version: 2.1.1 @@ -100,6 +100,7 @@ cp -p src/main/native/libjansi.so %{buildroot}%{_libdir}/%{name} %changelog * 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 From 3923fa75788679ded7eb8ad65e19bb1a83109470 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 18 Jun 2021 17:33:19 +0200 Subject: [PATCH 04/45] Clean tarball from content with questionable licensing Resolves: rhbz#1973738 --- generate-tarball.sh | 20 ++++++++++++++++++++ jansi.spec | 14 +++++++++++--- sources | 2 +- 3 files changed, 32 insertions(+), 4 deletions(-) create mode 100755 generate-tarball.sh diff --git a/generate-tarball.sh b/generate-tarball.sh new file mode 100755 index 0000000..0d2f36c --- /dev/null +++ b/generate-tarball.sh @@ -0,0 +1,20 @@ +#!/bin/bash +set -e + +name=jansi +version="$(sed -n 's/Version:\s*//p' *.spec)" + +# RETRIEVE +wget "https://github.com/fusesource/jansi/archive/jansi-${version}.tar.gz" -O "${name}-${version}.orig.tar.gz" + +rm -rf tarball-tmp +mkdir tarball-tmp +pushd tarball-tmp +tar xf "../${name}-${version}.orig.tar.gz" + +# CLEAN TARBALL +rm -r */src/main/native/inc_{mac,win}/ + +tar -czf "../${name}-${version}.tar.gz" * +popd +rm -r tarball-tmp "${name}-${version}.orig.tar.gz" diff --git a/jansi.spec b/jansi.spec index 8d1ebd8..199c296 100644 --- a/jansi.spec +++ b/jansi.spec @@ -2,12 +2,16 @@ Name: jansi Version: 2.1.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Generate and interpret ANSI escape sequences in Java - License: ASL 2.0 URL: http://fusesource.github.io/jansi/ -Source0: https://github.com/fusesource/jansi/archive/jansi-%{version}.tar.gz + +# ./generate-tarball.sh +Source0: %{name}-%{version}.tar.gz +# Remove bundled binaries which cannot be easily verified for licensing +Source1: generate-tarball.sh + # Change the location of the native artifact to where Fedora wants it Patch0: %{name}-jni.patch @@ -98,6 +102,10 @@ cp -p src/main/native/libjansi.so %{buildroot}%{_libdir}/%{name} %license license.txt %changelog +* 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 diff --git a/sources b/sources index 8f107e7..a2c0656 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jansi-2.1.1.tar.gz) = ccdb7b13da6715398b0b1d53bb1272ac445774dea7f643882c7df0182e17350b41dd1c782161f5350028209c82ac3588c22ceaaacd4930ec78645230b335bc4a +SHA512 (jansi-2.1.1.tar.gz) = 532b6c959e38fa8a1c3563dcafd78fd6634f96b85976b5c0e32808481e5f73c2323a89ace55e13da0f77ab45678d1e844e967dd0ceac19efb0c587af3257b4da From 179e740a136c957102e2210e987b191673333de0 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 23 Jun 2021 10:02:07 -0600 Subject: [PATCH 05/45] Version 2.3.3 --- .gitignore | 1 + jansi.spec | 10 ++++++---- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 2aebb9a..565aadf 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /jansi-project-1.17.1.tar.gz /jansi-project-1.18.tar.gz /jansi-2.1.1.tar.gz +/jansi-2.3.3.tar.gz diff --git a/jansi.spec b/jansi.spec index 199c296..123fc52 100644 --- a/jansi.spec +++ b/jansi.spec @@ -1,8 +1,8 @@ %bcond_with bootstrap Name: jansi -Version: 2.1.1 -Release: 5%{?dist} +Version: 2.3.3 +Release: 1%{?dist} Summary: Generate and interpret ANSI escape sequences in Java License: ASL 2.0 URL: http://fusesource.github.io/jansi/ @@ -55,8 +55,7 @@ This package contains the API documentation for %{name}. %pom_remove_dep :picocli-codegen # Build for JDK 1.8 at a minimum -%pom_xpath_set "//pom:plugin[pom:artifactId='maven-compiler-plugin']//pom:source" 1.8 -%pom_xpath_set "//pom:plugin[pom:artifactId='maven-compiler-plugin']//pom:target" 1.8 +%pom_xpath_set "//pom:properties/pom:jdkTarget" 1.8 # Remove prebuilt shared objects rm -fr src/main/resources/org/fusesource/jansi/internal @@ -102,6 +101,9 @@ cp -p src/main/native/libjansi.so %{buildroot}%{_libdir}/%{name} %license license.txt %changelog +* 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 diff --git a/sources b/sources index a2c0656..9b9cffa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jansi-2.1.1.tar.gz) = 532b6c959e38fa8a1c3563dcafd78fd6634f96b85976b5c0e32808481e5f73c2323a89ace55e13da0f77ab45678d1e844e967dd0ceac19efb0c587af3257b4da +SHA512 (jansi-2.3.3.tar.gz) = 11a27519c05f762f5a6bb076f7f7eb57b6e1df9984df8039a24294cbbf341adc060cb04e66ebcf7d269842bbe599ec0d17be7b3dadeddbabbbd158895aabe8f7 From 380c21a69007e2e5524092d495d980b7febe1ebb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 08:55:21 +0000 Subject: [PATCH 06/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- jansi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jansi.spec b/jansi.spec index 123fc52..d0b55c2 100644 --- a/jansi.spec +++ b/jansi.spec @@ -2,7 +2,7 @@ Name: jansi Version: 2.3.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Generate and interpret ANSI escape sequences in Java License: ASL 2.0 URL: http://fusesource.github.io/jansi/ @@ -101,6 +101,9 @@ cp -p src/main/native/libjansi.so %{buildroot}%{_libdir}/%{name} %license license.txt %changelog +* 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 From 0333e5e8056fb9201da86e515650da4a951f55ab Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 24 Sep 2021 14:09:45 +0200 Subject: [PATCH 07/45] Install native artifact into a fixed location Related: rhbz#1994935 --- jansi.spec | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/jansi.spec b/jansi.spec index d0b55c2..fb14925 100644 --- a/jansi.spec +++ b/jansi.spec @@ -2,7 +2,7 @@ Name: jansi Version: 2.3.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Generate and interpret ANSI escape sequences in Java License: ASL 2.0 URL: http://fusesource.github.io/jansi/ @@ -66,7 +66,7 @@ ln -s %{java_home}/include/jni.h src/main/native/inc_linux ln -s %{java_home}/include/linux/jni_md.h src/main/native/inc_linux # Set the JNI path -sed -i 's,@LIBDIR@,%{libdir},' \ +sed -i 's,@LIBDIR@,%{_prefix}/lib,' \ src/main/java/org/fusesource/jansi/internal/JansiLoader.java %build @@ -86,8 +86,8 @@ cd - %install # Install the native artifact -mkdir -p %{buildroot}%{_libdir}/%{name} -cp -p src/main/native/libjansi.so %{buildroot}%{_libdir}/%{name} +mkdir -p %{buildroot}%{_prefix}/lib/%{name} +cp -p src/main/native/libjansi.so %{buildroot}%{_prefix}/lib/%{name} # Install the Java artifacts %mvn_install @@ -95,12 +95,16 @@ cp -p src/main/native/libjansi.so %{buildroot}%{_libdir}/%{name} %files -f .mfiles %license license.txt %doc readme.md changelog.md -%{_libdir}/%{name}/ +%{_prefix}/lib/%{name}/ %files javadoc -f .mfiles-javadoc %license license.txt %changelog +* 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 From 3ab61c76e4f0ab35cb244ce0d40d69ccb33e37d7 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 1 Nov 2021 12:17:05 +0100 Subject: [PATCH 08/45] Update to upstream version 2.4.0 Resolves: rhbz#1985388 Related: rhbz#1995022 --- .gitignore | 1 + jansi-jni.patch | 2 +- jansi.spec | 7 +++++-- sources | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 565aadf..a7bbade 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /jansi-project-1.18.tar.gz /jansi-2.1.1.tar.gz /jansi-2.3.3.tar.gz +/jansi-2.4.0.tar.gz diff --git a/jansi-jni.patch b/jansi-jni.patch index e9e106f..ddd9332 100644 --- a/jansi-jni.patch +++ b/jansi-jni.patch @@ -6,7 +6,7 @@ } + } else { + if (loadNativeLibrary(new File("@LIBDIR@/jansi", jansiNativeLibraryName))) { -+ extracted = true; ++ loaded = true; + return; + } } diff --git a/jansi.spec b/jansi.spec index fb14925..1670f31 100644 --- a/jansi.spec +++ b/jansi.spec @@ -1,8 +1,8 @@ %bcond_with bootstrap Name: jansi -Version: 2.3.3 -Release: 3%{?dist} +Version: 2.4.0 +Release: 1%{?dist} Summary: Generate and interpret ANSI escape sequences in Java License: ASL 2.0 URL: http://fusesource.github.io/jansi/ @@ -101,6 +101,9 @@ cp -p src/main/native/libjansi.so %{buildroot}%{_prefix}/lib/%{name} %license license.txt %changelog +* 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 diff --git a/sources b/sources index 9b9cffa..dc3c8ed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jansi-2.3.3.tar.gz) = 11a27519c05f762f5a6bb076f7f7eb57b6e1df9984df8039a24294cbbf341adc060cb04e66ebcf7d269842bbe599ec0d17be7b3dadeddbabbbd158895aabe8f7 +SHA512 (jansi-2.4.0.tar.gz) = b52fbd371acbf98398c3720225f32c826b545cd598fdf0c327c477b416af11af3c78833998823e1e7aa92b91a31e2918d63f4a598618bbe2278c812b94217a12 From 654f5750e9e4ca730efc2d838dece1421e58bba8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 13:38:19 +0000 Subject: [PATCH 09/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- jansi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jansi.spec b/jansi.spec index 1670f31..6c7d570 100644 --- a/jansi.spec +++ b/jansi.spec @@ -2,7 +2,7 @@ Name: jansi Version: 2.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Generate and interpret ANSI escape sequences in Java License: ASL 2.0 URL: http://fusesource.github.io/jansi/ @@ -101,6 +101,9 @@ cp -p src/main/native/libjansi.so %{buildroot}%{_prefix}/lib/%{name} %license license.txt %changelog +* 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 From 9d5d44575d5d7c26092588be7c5e8ce65cde33f6 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 5 Feb 2022 21:15:07 +0100 Subject: [PATCH 10/45] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- jansi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jansi.spec b/jansi.spec index 6c7d570..405e52b 100644 --- a/jansi.spec +++ b/jansi.spec @@ -2,7 +2,7 @@ Name: jansi Version: 2.4.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Generate and interpret ANSI escape sequences in Java License: ASL 2.0 URL: http://fusesource.github.io/jansi/ @@ -101,6 +101,9 @@ cp -p src/main/native/libjansi.so %{buildroot}%{_prefix}/lib/%{name} %license license.txt %changelog +* 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 From adf8249224d549990bd98406d1c4ee3b2d845e39 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 11 May 2022 15:54:57 +0200 Subject: [PATCH 11/45] Onboard package into gating --- .fmf/version | 1 + ci.fmf | 1 + gating.yaml | 8 ++++++++ plans/javapackages.fmf | 7 +++++++ 4 files changed, 17 insertions(+) create mode 100644 .fmf/version create mode 100644 ci.fmf create mode 100644 gating.yaml create mode 100644 plans/javapackages.fmf diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 0000000..c5aa0e0 --- /dev/null +++ b/ci.fmf @@ -0,0 +1 @@ +resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..0d484d7 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,8 @@ +--- !Policy +product_versions: + - fedora-* +decision_contexts: + - bodhi_update_push_testing + - bodhi_update_push_stable +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional} diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf new file mode 100644 index 0000000..def0914 --- /dev/null +++ b/plans/javapackages.fmf @@ -0,0 +1,7 @@ +summary: + Run javapackages-specific tests +discover: + how: fmf + url: https://pagure.io/javapackages-validator-tests +execute: + how: tmt From d6d56580b7e3aa2b1a63ad3c75a53080513bd145 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 12 May 2022 22:34:51 +0200 Subject: [PATCH 12/45] Add ExclusiveArch: %{java_arches} See: https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs --- jansi.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/jansi.spec b/jansi.spec index 405e52b..2b09694 100644 --- a/jansi.spec +++ b/jansi.spec @@ -6,6 +6,7 @@ Release: 3%{?dist} Summary: Generate and interpret ANSI escape sequences in Java License: ASL 2.0 URL: http://fusesource.github.io/jansi/ +ExclusiveArch: %{java_arches} # ./generate-tarball.sh Source0: %{name}-%{version}.tar.gz From 2b29df3b0ccefc1d76334815eb6333bf768371b1 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 14 Jun 2022 08:03:17 +0200 Subject: [PATCH 13/45] Update build-requires in bootstrap mode --- jansi.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jansi.spec b/jansi.spec index 2b09694..0f888f0 100644 --- a/jansi.spec +++ b/jansi.spec @@ -17,10 +17,10 @@ Source1: generate-tarball.sh Patch0: %{name}-jni.patch BuildRequires: gcc -BuildRequires: maven-local %if %{with 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.apache.maven.surefire:surefire-junit-platform) From 0a46fdf2e34c751b91c1b0fe6e6f4fd86bb3096a Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 14 Jul 2022 12:49:48 +0200 Subject: [PATCH 14/45] Make javadoc subpackage noarch --- jansi.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jansi.spec b/jansi.spec index 0f888f0..e809ca1 100644 --- a/jansi.spec +++ b/jansi.spec @@ -2,7 +2,7 @@ Name: jansi Version: 2.4.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Generate and interpret ANSI escape sequences in Java License: ASL 2.0 URL: http://fusesource.github.io/jansi/ @@ -35,6 +35,7 @@ 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} %description javadoc @@ -102,6 +103,9 @@ cp -p src/main/native/libjansi.so %{buildroot}%{_prefix}/lib/%{name} %license license.txt %changelog +* 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 From 3707af180cb1225e843e8aa0505f07a91557babd Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 18 Jul 2022 17:40:03 +0200 Subject: [PATCH 15/45] Ensure CC env variable is set during build --- jansi.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jansi.spec b/jansi.spec index e809ca1..873daf4 100644 --- a/jansi.spec +++ b/jansi.spec @@ -2,7 +2,7 @@ Name: jansi Version: 2.4.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Generate and interpret ANSI escape sequences in Java License: ASL 2.0 URL: http://fusesource.github.io/jansi/ @@ -73,6 +73,7 @@ sed -i 's,@LIBDIR@,%{_prefix}/lib,' \ %build %set_build_flags +CC="${CC:-gcc}" # Build the native artifact CFLAGS="$CFLAGS -I. -I%{java_home}/include -I%{java_home}/include/linux -fPIC -fvisibility=hidden" cd src/main/native @@ -103,6 +104,9 @@ cp -p src/main/native/libjansi.so %{buildroot}%{_prefix}/lib/%{name} %license license.txt %changelog +* 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 From d64396c80d2cc70b97e241122830021001d4361a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 15:04:03 +0000 Subject: [PATCH 16/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- jansi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jansi.spec b/jansi.spec index 873daf4..d0dc4f8 100644 --- a/jansi.spec +++ b/jansi.spec @@ -2,7 +2,7 @@ Name: jansi Version: 2.4.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Generate and interpret ANSI escape sequences in Java License: ASL 2.0 URL: http://fusesource.github.io/jansi/ @@ -104,6 +104,9 @@ cp -p src/main/native/libjansi.so %{buildroot}%{_prefix}/lib/%{name} %license license.txt %changelog +* 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 From d569aacf2d1b71bc646c9e6b5fbd26c17ee5db48 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 25 Aug 2022 07:44:26 +0200 Subject: [PATCH 17/45] Update javapackages test plan --- plans/javapackages.fmf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index def0914..8f6c9cb 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -1,7 +1,7 @@ -summary: - Run javapackages-specific tests +summary: Run javapackages-specific tests discover: - how: fmf - url: https://pagure.io/javapackages-validator-tests + how: fmf + url: https://src.fedoraproject.org/tests/javapackages + ref: f37 execute: - how: tmt + how: tmt From e48f4b0ac171a6ca1c7ab91c9eb88c59ae9f88fc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 13:33:11 +0000 Subject: [PATCH 18/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- jansi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jansi.spec b/jansi.spec index d0dc4f8..17d070a 100644 --- a/jansi.spec +++ b/jansi.spec @@ -2,7 +2,7 @@ Name: jansi Version: 2.4.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Generate and interpret ANSI escape sequences in Java License: ASL 2.0 URL: http://fusesource.github.io/jansi/ @@ -104,6 +104,9 @@ cp -p src/main/native/libjansi.so %{buildroot}%{_prefix}/lib/%{name} %license license.txt %changelog +* 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 From 7d9146f069deb2c31ad5d6973611490d5d16912b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 07:50:02 +0000 Subject: [PATCH 19/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- jansi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jansi.spec b/jansi.spec index 17d070a..3277ec6 100644 --- a/jansi.spec +++ b/jansi.spec @@ -2,7 +2,7 @@ Name: jansi Version: 2.4.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Generate and interpret ANSI escape sequences in Java License: ASL 2.0 URL: http://fusesource.github.io/jansi/ @@ -104,6 +104,9 @@ cp -p src/main/native/libjansi.so %{buildroot}%{_prefix}/lib/%{name} %license license.txt %changelog +* 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 From 6905e35ed0a32f7a5ac896fb5d5d2b7d194e395d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 1 Sep 2023 13:20:33 +0200 Subject: [PATCH 20/45] Convert License tag to SPDX format Related: https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2 --- jansi.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/jansi.spec b/jansi.spec index 3277ec6..d58257d 100644 --- a/jansi.spec +++ b/jansi.spec @@ -2,9 +2,9 @@ Name: jansi Version: 2.4.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Generate and interpret ANSI escape sequences in Java -License: ASL 2.0 +License: Apache-2.0 URL: http://fusesource.github.io/jansi/ ExclusiveArch: %{java_arches} @@ -104,6 +104,9 @@ cp -p src/main/native/libjansi.so %{buildroot}%{_prefix}/lib/%{name} %license license.txt %changelog +* 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 From 8df56efd2644b57541b38d40a720086ccb121907 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 20 Sep 2023 18:07:17 +0200 Subject: [PATCH 21/45] Rebuild to regenerate auto-Requires on java --- jansi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jansi.spec b/jansi.spec index d58257d..1ea68a3 100644 --- a/jansi.spec +++ b/jansi.spec @@ -2,7 +2,7 @@ Name: jansi Version: 2.4.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Generate and interpret ANSI escape sequences in Java License: Apache-2.0 URL: http://fusesource.github.io/jansi/ @@ -104,6 +104,9 @@ cp -p src/main/native/libjansi.so %{buildroot}%{_prefix}/lib/%{name} %license license.txt %changelog +* 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 From e5569eda80eca056517821de9d1f33bd32d4b486 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 26 Oct 2023 07:33:08 +0200 Subject: [PATCH 22/45] 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 bc707505b13f8143db21c82818cc1958f1035d29 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jan 2024 23:28:32 +0000 Subject: [PATCH 23/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- jansi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jansi.spec b/jansi.spec index 1ea68a3..6f4c0a0 100644 --- a/jansi.spec +++ b/jansi.spec @@ -2,7 +2,7 @@ Name: jansi Version: 2.4.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Generate and interpret ANSI escape sequences in Java License: Apache-2.0 URL: http://fusesource.github.io/jansi/ @@ -104,6 +104,9 @@ cp -p src/main/native/libjansi.so %{buildroot}%{_prefix}/lib/%{name} %license license.txt %changelog +* 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 From 0067bcd523e060cd3884f47410ad4b3f463200b6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 23:08:30 +0000 Subject: [PATCH 24/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- jansi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jansi.spec b/jansi.spec index 6f4c0a0..64ae2b3 100644 --- a/jansi.spec +++ b/jansi.spec @@ -2,7 +2,7 @@ Name: jansi Version: 2.4.0 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Generate and interpret ANSI escape sequences in Java License: Apache-2.0 URL: http://fusesource.github.io/jansi/ @@ -104,6 +104,9 @@ cp -p src/main/native/libjansi.so %{buildroot}%{_prefix}/lib/%{name} %license license.txt %changelog +* 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 From be3cca233fef1278ddfe5daa59e4c1a181c3c941 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 1 Feb 2024 09:59:16 +0100 Subject: [PATCH 25/45] Update to upstream version 2.4.1 --- .gitignore | 1 + generate-tarball.sh | 2 +- jansi.spec | 24 +++++++++--------------- sources | 2 +- 4 files changed, 12 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index a7bbade..6dcfd3b 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /jansi-2.1.1.tar.gz /jansi-2.3.3.tar.gz /jansi-2.4.0.tar.gz +/jansi-2.4.1.tar.gz diff --git a/generate-tarball.sh b/generate-tarball.sh index 0d2f36c..5609760 100755 --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -13,7 +13,7 @@ pushd tarball-tmp tar xf "../${name}-${version}.orig.tar.gz" # CLEAN TARBALL -rm -r */src/main/native/inc_{mac,win}/ +rm -r */src/main/resources/org/fusesource/jansi/internal/native/* tar -czf "../${name}-${version}.tar.gz" * popd diff --git a/jansi.spec b/jansi.spec index 64ae2b3..b950882 100644 --- a/jansi.spec +++ b/jansi.spec @@ -1,8 +1,8 @@ %bcond_with bootstrap Name: jansi -Version: 2.4.0 -Release: 12%{?dist} +Version: 2.4.1 +Release: 1%{?dist} Summary: Generate and interpret ANSI escape sequences in Java License: Apache-2.0 URL: http://fusesource.github.io/jansi/ @@ -23,9 +23,10 @@ BuildRequires: javapackages-bootstrap BuildRequires: maven-local BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) -BuildRequires: mvn(org.apache.maven.surefire:surefire-junit-platform) BuildRequires: mvn(org.fusesource:fusesource-pom:pom:) -BuildRequires: mvn(org.junit.jupiter:junit-jupiter-engine) +BuildRequires: mvn(org.junit.jupiter:junit-jupiter) +BuildRequires: mvn(org.junit.jupiter:junit-jupiter-params) +BuildRequires: mvn(org.moditect:moditect-maven-plugin) %endif %description @@ -51,22 +52,12 @@ This package contains the API documentation for %{name}. %pom_remove_plugin :maven-gpg-plugin %pom_remove_plugin :maven-javadoc-plugin %pom_remove_plugin :nexus-staging-maven-plugin +%pom_remove_plugin :spotless-maven-plugin # We don't want GraalVM support in Fedora %pom_remove_plugin :exec-maven-plugin %pom_remove_dep :picocli-codegen -# Build for JDK 1.8 at a minimum -%pom_xpath_set "//pom:properties/pom:jdkTarget" 1.8 - -# Remove prebuilt shared objects -rm -fr src/main/resources/org/fusesource/jansi/internal - -# Unbundle the JNI headers -rm src/main/native/inc_linux/*.h -ln -s %{java_home}/include/jni.h src/main/native/inc_linux -ln -s %{java_home}/include/linux/jni_md.h src/main/native/inc_linux - # Set the JNI path sed -i 's,@LIBDIR@,%{_prefix}/lib,' \ src/main/java/org/fusesource/jansi/internal/JansiLoader.java @@ -104,6 +95,9 @@ cp -p src/main/native/libjansi.so %{buildroot}%{_prefix}/lib/%{name} %license license.txt %changelog +* 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 diff --git a/sources b/sources index dc3c8ed..4195d27 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jansi-2.4.0.tar.gz) = b52fbd371acbf98398c3720225f32c826b545cd598fdf0c327c477b416af11af3c78833998823e1e7aa92b91a31e2918d63f4a598618bbe2278c812b94217a12 +SHA512 (jansi-2.4.1.tar.gz) = 5b3627e18ac6932df034f94e2090c3ec1d713879c61672fc16bd22603da3ddeadf59e9124fea3406c6abb8c90df1b64a2f460ec4f713d142f14261783b34938a From 98de13ab026ed47671202994eb1bc0c125618b4d Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 23 Feb 2024 14:22:26 +0100 Subject: [PATCH 26/45] 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 27/45] 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 28/45] 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 29/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 5baf83f1e77dace752e6a2e54169a6249020c61f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2024 16:32:53 +0200 Subject: [PATCH 30/45] 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 31/45] 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 32/45] 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 33/45] 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 34/45] 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 35/45] 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 36/45] 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 37/45] 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 38/45] 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 39/45] 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 40/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 a6310dfdf86e7314cb91db3c41108dd29e77e99c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 May 2025 13:35:31 +0200 Subject: [PATCH 41/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 1459f708c6deebdaad80c37eeb8d232a00303f8a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 13 Jul 2025 09:22:51 +0200 Subject: [PATCH 42/45] 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 43/45] 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 44/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. From 9479c221f8069bb238c38624e3a56411f73d7d28 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 13 Oct 2025 14:37:58 +0200 Subject: [PATCH 45/45] 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