diff --git a/apache-commons-math-3.4.1-RHBZ1402145.patch b/apache-commons-math-3.4.1-RHBZ1402145.patch deleted file mode 100644 index 656d37e..0000000 --- a/apache-commons-math-3.4.1-RHBZ1402145.patch +++ /dev/null @@ -1,43 +0,0 @@ -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 2a3b0ae..3e6c2ef 100644 --- a/apache-commons-math.spec +++ b/apache-commons-math.spec @@ -1,15 +1,14 @@ %global short_name commons-math3 Name: apache-commons-math -Version: 3.4.1 -Release: 2 +Version: 3.6.1 +Release: 1 Summary: Java library of lightweight mathematics and statistics components License: Apache-1.1 and Apache-2.0 and BSD-3-Clause URL: http://commons.apache.org/math/ Source0: http://archive.apache.org/dist/commons/math/source/%{short_name}-%{version}-src.tar.gz -Patch1: %{name}-3.4.1-RHBZ1402145.patch BuildArch: noarch BuildRequires: java-devel >= 1:1.6.0 jpackage-utils maven-local -BuildRequires: mvn(org.apache.commons:commons-parent:pom:) +BuildRequires: mvn(org.apache.commons:commons-parent:pom:) mvn(junit:junit) Requires: jpackage-utils %description Commons Math is a library of lightweight, self-contained mathematics and @@ -23,12 +22,13 @@ This package contains the API documentation for %{name}. %prep %autosetup -n %{short_name}-%{version}-src -p1 +sed -i -e '/checkMissingFastMathClasses/i@Ignore' \ +src/test/java/org/apache/commons/math3/util/FastMathTest.java %mvn_alias "org.apache.commons:%{short_name}" "%{short_name}:%{short_name}" %mvn_file :%{short_name} %{short_name} %{name} -%pom_remove_plugin ru.concerteza.buildnumber:maven-jgit-buildnumber-plugin %build -%mvn_build +%mvn_build -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 %install %mvn_install @@ -40,6 +40,9 @@ This package contains the API documentation for %{name}. %doc LICENSE.txt NOTICE.txt %changelog +* Wed Jul 20 2022 liyanan - 3.6.1-1 +- Update to 3.6.1 + * Mon May 09 2022 chenchen - 3.4.1-2 - License compliance rectification diff --git a/commons-math3-3.4.1-src.tar.gz b/commons-math3-3.4.1-src.tar.gz deleted file mode 100644 index ee5a8aa..0000000 Binary files a/commons-math3-3.4.1-src.tar.gz and /dev/null differ diff --git a/commons-math3-3.6.1-src.tar.gz b/commons-math3-3.6.1-src.tar.gz new file mode 100644 index 0000000..c725618 Binary files /dev/null and b/commons-math3-3.6.1-src.tar.gz differ