diff --git a/jdk21rounding.patch b/jdk21rounding.patch new file mode 100644 index 0000000..ce4aa18 --- /dev/null +++ b/jdk21rounding.patch @@ -0,0 +1,12 @@ +--- parserng-0.1.9/src/test/java/parser/methods/ext/FloorCeilTests.java ++++ parserng-0.1.9/src/test/java/parser/methods/ext/FloorCeilTests.java +@@ -353,7 +353,7 @@ + void fracPreReqNonStat1() { + MathExpression me; + me = new MathExpression("sin(3/2)"); +- Assertions.assertEquals("0.9974949866040544", me.solve()); ++ Assertions.assertEquals("0.9974949866040544", me.solve()); + } + + @Test + diff --git a/parserng.spec b/parserng.spec index fcbee18..0385756 100644 --- a/parserng.spec +++ b/parserng.spec @@ -2,8 +2,9 @@ Summary: %{nice_name} is a powerful open-source tool that parses and evaluates a %global nice_name ParserNG Name: parserng Version: 0.1.9 -Release: 2%{?dist} -License: ASL 2.0 +Release: 11%{?dist} +# Automatically converted from old format: ASL 2.0 - review is highly recommended. +License: Apache-2.0 URL: https://github.com/gbenroscience/ParserNG # tarred cloned repo without hidden files and without idea iml # usptream do not tag, but uses maven versionining @@ -12,11 +13,12 @@ URL: https://github.com/gbenroscience/ParserNG # git clone https://github.com/gbenroscience/ParserNG && cd ParserNG && git checkout f619fad1fefa21116bab4a0abba2dd0ebe719e45 && tar -cJf parserng-0.1.9.tar.xz * Source0: %{name}-%{version}.tar.xz Source1: parserng +Patch1: jdk21rounding.patch BuildArch: noarch ExclusiveArch: %{java_arches} noarch -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: junit5 BuildRequires: ant-junit5 BuildRequires: junit @@ -26,8 +28,8 @@ BuildRequires: maven-surefire-provider-junit5 BuildRequires: maven-surefire BuildRequires: maven-surefire-plugin BuildRequires: maven-clean-plugin -BuildRequires: java-devel -Requires: java-headless +BuildRequires: java-25-devel +Requires: java-25-headless Provides: ParserNG Provides: parser-ng @@ -46,7 +48,11 @@ This package contains the API documentation for %{name}. %prep %setup -c %{name}-%{version} - +%patch -P1 -p1 +for x in `find | grep pom.xml` ; do + sed "s;.*7.*;8;g" -i $x; + sed "s;.*7.*;8;g" -i $x; +done %build %pom_remove_plugin :maven-jar-plugin @@ -70,6 +76,35 @@ install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/ %license LICENSE %changelog +* Mon Jul 28 2025 jiri vanek - 0.1.9-11 +- Rebuilt for java-25-openjdk as preffered jdk + +* Thu Jul 24 2025 Fedora Release Engineering - 0.1.9-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Fri Jan 17 2025 Fedora Release Engineering - 0.1.9-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Wed Jul 24 2024 Miroslav Suchý - 0.1.9-8 +- convert license to SPDX + +* Thu Jul 18 2024 Fedora Release Engineering - 0.1.9-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 0.1.9-6 +- Rebuilt for java-21-openjdk as system jdk +- fixed source/target +- added patch to cover slightly different rounding on jdk21 + +* Thu Jan 25 2024 Fedora Release Engineering - 0.1.9-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 0.1.9-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 0.1.9-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jan 19 2023 Fedora Release Engineering - 0.1.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild