diff --git a/.gitignore b/.gitignore index b7c21d0..d4f0a29 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ commons-math-2.0-src.tar.gz /commons-math3-3.3-src.tar.gz /commons-math3-3.4-src.tar.gz /commons-math3-3.4.1-src.tar.gz +/commons-math3-3.6.1-src.tar.gz diff --git a/apache-commons-math-3.4.1-RHBZ1402145.patch b/apache-commons-math-3.4.1-RHBZ1402145.patch new file mode 100644 index 0000000..656d37e --- /dev/null +++ b/apache-commons-math-3.4.1-RHBZ1402145.patch @@ -0,0 +1,43 @@ +X-Git-Url: https://git1-us-west.apache.org/repos/asf?p=commons-math.git;a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fapache%2Fcommons%2Fmath3%2Fml%2Fneuralnet%2Fsofm%2FKohonenUpdateActionTest.java;h=b209d56b8651eb6e7bbfca10ad9bdb1802fb24f3;hp=334a5a8ebbbd011aa7d10bebbc5478df5f82becc;hb=a9006aa;hpb=838788fd6302d6cc91e1743144e0f14b71e4812e + +diff --git a/src/test/java/org/apache/commons/math3/ml/neuralnet/sofm/KohonenUpdateActionTest.java b/src/test/java/org/apache/commons/math3/ml/neuralnet/sofm/KohonenUpdateActionTest.java +index 334a5a8..b209d56 100644 +--- a/src/test/java/org/apache/commons/math3/ml/neuralnet/sofm/KohonenUpdateActionTest.java ++++ b/src/test/java/org/apache/commons/math3/ml/neuralnet/sofm/KohonenUpdateActionTest.java +@@ -17,18 +17,19 @@ + + package org.apache.commons.math3.ml.neuralnet.sofm; + +-import org.apache.commons.math3.ml.neuralnet.Neuron; +-import org.apache.commons.math3.ml.neuralnet.Network; +-import org.apache.commons.math3.ml.neuralnet.MapUtils; +-import org.apache.commons.math3.ml.neuralnet.UpdateAction; +-import org.apache.commons.math3.ml.neuralnet.OffsetFeatureInitializer; +-import org.apache.commons.math3.ml.neuralnet.FeatureInitializer; +-import org.apache.commons.math3.ml.neuralnet.FeatureInitializerFactory; + import org.apache.commons.math3.ml.distance.DistanceMeasure; + import org.apache.commons.math3.ml.distance.EuclideanDistance; ++import org.apache.commons.math3.ml.neuralnet.FeatureInitializer; ++import org.apache.commons.math3.ml.neuralnet.FeatureInitializerFactory; ++import org.apache.commons.math3.ml.neuralnet.MapUtils; ++import org.apache.commons.math3.ml.neuralnet.Network; ++import org.apache.commons.math3.ml.neuralnet.Neuron; ++import org.apache.commons.math3.ml.neuralnet.OffsetFeatureInitializer; ++import org.apache.commons.math3.ml.neuralnet.UpdateAction; + import org.apache.commons.math3.ml.neuralnet.oned.NeuronString; +-import org.junit.Test; ++import org.apache.commons.math3.util.Precision; + import org.junit.Assert; ++import org.junit.Test; + + /** + * Tests for {@link KohonenUpdateAction} class. +@@ -82,7 +83,7 @@ public class KohonenUpdateActionTest { + + Assert.assertEquals(bestBefore, bestAfter); + // Distance is now zero. +- Assert.assertEquals(0, dist.compute(bestAfter.getFeatures(), features), 0d); ++ Assert.assertEquals(0, dist.compute(bestAfter.getFeatures(), features), Precision.EPSILON); + + for (int i = 0; i < netSize; i++) { + // All distances have decreased. diff --git a/apache-commons-math.spec b/apache-commons-math.spec index 6e2f5e4..bcc8b29 100644 --- a/apache-commons-math.spec +++ b/apache-commons-math.spec @@ -1,23 +1,19 @@ %global short_name commons-math3 Name: apache-commons-math -Version: 3.4.1 -Release: 3%{?dist} +Version: 3.6.1 +Release: 24%{?dist} Summary: Java library of lightweight mathematics and statistics components -Group: Development/Libraries -License: ASL 1.1 and ASL 2.0 and BSD +# Automatically converted from old format: ASL 1.1 and ASL 2.0 and BSD - review is highly recommended. +License: Apache-1.1 AND Apache-2.0 AND LicenseRef-Callaway-BSD URL: http://commons.apache.org/math/ Source0: http://www.apache.org/dist/commons/math/source/%{short_name}-%{version}-src.tar.gz -BuildRequires: java-devel >= 1:1.6.0 -BuildRequires: jpackage-utils -BuildRequires: maven-local - -%if 0%{?fedora} >= 21 -BuildRequires: mvn(org.jacoco:jacoco-maven-plugin) >= 0.7.0 -%endif -Requires: jpackage-utils +BuildRequires: maven-local-openjdk25 +BuildRequires: mvn(junit:junit) +BuildRequires: mvn(org.apache.commons:commons-parent:pom:) BuildArch: noarch +ExclusiveArch: %{java_arches} noarch %description Commons Math is a library of lightweight, self-contained mathematics and @@ -27,30 +23,24 @@ Java programming language or Commons Lang. %package javadoc Summary: Javadoc for %{name} -Group: Documentation %description javadoc This package contains the API documentation for %{name}. %prep -%setup -q -n %{short_name}-%{version}-src +%autosetup -n %{short_name}-%{version}-src -p1 + +# Skip test that fails on Java 11 +sed -i -e '/checkMissingFastMathClasses/i@Ignore' \ +src/test/java/org/apache/commons/math3/util/FastMathTest.java # Compatibility links %mvn_alias "org.apache.commons:%{short_name}" "%{short_name}:%{short_name}" %mvn_file :%{short_name} %{short_name} %{name} -# Disable Jacoco Maven plugin for Fedora releases having jacoco < 0.7.0 -%if 0%{?fedora} < 21 -rm src/site/resources/profile.jacoco -%endif - -# Disable maven-jgit-buildnumber-plugin plugin (not available in Fedora) -%pom_remove_plugin ru.concerteza.buildnumber:maven-jgit-buildnumber-plugin - - %build -%mvn_build +%mvn_build -- -Dcommons.packageId=math3 %install @@ -58,14 +48,113 @@ rm src/site/resources/profile.jacoco %files -f .mfiles -%doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt +%doc NOTICE.txt RELEASE-NOTES.txt +%license LICENSE.txt %files javadoc -f .mfiles-javadoc -%doc LICENSE.txt NOTICE.txt +%doc NOTICE.txt +%license LICENSE.txt %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 3.6.1-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Tue Jul 29 2025 jiri vanek - 3.6.1-23 +- Rebuilt for java-25-openjdk as preffered jdk + +* Wed Jul 23 2025 Fedora Release Engineering - 3.6.1-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Thu Jan 16 2025 Fedora Release Engineering - 3.6.1-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Wed Aug 28 2024 Miroslav Suchý - 3.6.1-20 +- convert license to SPDX + +* Wed Jul 17 2024 Fedora Release Engineering - 3.6.1-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 3.6.1-18 +- Rebuilt for java-21-openjdk as system jdk + +* Wed Jan 31 2024 Mikolaj Izdebski - 3.6.1-17 +- Port to apache-commons-parent 65 + +* Mon Jan 22 2024 Fedora Release Engineering - 3.6.1-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 3.6.1-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Jul 19 2023 Fedora Release Engineering - 3.6.1-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jan 18 2023 Fedora Release Engineering - 3.6.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Jul 20 2022 Fedora Release Engineering - 3.6.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Jul 08 2022 Jiri Vanek - 3.6.1-11 +- Rebuilt for Drop i686 JDKs + +* Sat Feb 05 2022 Jiri Vanek - 3.6.1-10 +- Rebuilt for java-17-openjdk as system jdk + +* Wed Jan 19 2022 Fedora Release Engineering - 3.6.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Jul 27 2021 Mohamed El Morabity - 3.6.1-8 +- Add explicit BuildRequires on JUnit + +* Wed Jul 21 2021 Fedora Release Engineering - 3.6.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 3.6.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 3.6.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu Jul 16 2020 Mat Booth - 3.6.1-4 +- Allow building on JDK 11 + +* Fri Jul 10 2020 Jiri Vanek - 3.6.1-3 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Tue Jan 28 2020 Fedora Release Engineering - 3.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Aug 09 2019 Mohamed El Morabity - 3.6.1-1 +- Update to 3.6.1 + +* Wed Jul 24 2019 Fedora Release Engineering - 3.4.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jan 31 2019 Fedora Release Engineering - 3.4.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jul 12 2018 Fedora Release Engineering - 3.4.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 3.4.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 3.4.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 3.4.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Feb 01 2017 Michael Simacek - 3.4.1-5 +- Remove BR on jacoco + +* Fri Dec 16 2016 Mohamed El Morabity - 3.4.1-4 +- Fix RHBZ #1402145 +- Spec cleanup + * Wed Feb 03 2016 Fedora Release Engineering - 3.4.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index f8bf0f7..50c46f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -01daa3eedd61cfe3315fb0417fc8ac2e commons-math3-3.4.1-src.tar.gz +SHA512 (commons-math3-3.6.1-src.tar.gz) = cd3d4736257999bb1affd0a3d9e86be983c24651e074c9819d85770a37cf1bd3f9a809e426a41036ba3fc10e992f7d164685b964b9cda05b6c9b7a70f62d237b