From 6498d60aa3b28be87bfa8ced3e892e0c1b6a049a Mon Sep 17 00:00:00 2001 From: Mohamed El Morabity Date: Mon, 5 Jan 2015 14:17:01 +0100 Subject: [PATCH 1/2] Update to 3.4 --- .gitignore | 1 + apache-commons-math.spec | 16 +++++++++++++--- sources | 2 +- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 256582e..274ac31 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ commons-math-2.0-src.tar.gz /commons-math3-3.1.1-src.tar.gz /commons-math3-3.2-src.tar.gz /commons-math3-3.3-src.tar.gz +/commons-math3-3.4-src.tar.gz diff --git a/apache-commons-math.spec b/apache-commons-math.spec index d8cb707..603d6a5 100644 --- a/apache-commons-math.spec +++ b/apache-commons-math.spec @@ -1,7 +1,7 @@ %global short_name commons-math3 Name: apache-commons-math -Version: 3.3 +Version: 3.4 Release: 1%{?dist} Summary: Java library of lightweight mathematics and statistics components Group: Development/Libraries @@ -12,6 +12,9 @@ Source0: http://www.apache.org/dist/commons/math/source/%{short_name}-% 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 BuildArch: noarch @@ -36,9 +39,13 @@ This package contains the API documentation for %{name}. %mvn_alias "org.apache.commons:%{short_name}" "%{short_name}:%{short_name}" %mvn_file :%{short_name} %{short_name} %{name} -# Disable Jacoco Maven plugin until a suitable version is available in Fedora -# (0.7.0) +# 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 @@ -58,6 +65,9 @@ rm src/site/resources/profile.jacoco %changelog +* Mon Jan 05 2015 Mohamed El Morabity - 3.4-1 +- Update to 3.4 + * Fri Jun 13 2014 Mohamed El Morabity - 3.3-1 - Update to 3.3 - Drop apache-commons-math-3.2-RHBZ1084441.patch (fixed in 3.3) diff --git a/sources b/sources index 79288f3..1393006 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b8156da5ce35c4c963aecfdad919950a commons-math3-3.3-src.tar.gz +5d8d61a4531f9c5f78f44349e5abe935 commons-math3-3.4-src.tar.gz From 73eef1ecdb9afe7e9461bc8013fa9f33d7c9e1db Mon Sep 17 00:00:00 2001 From: Mohamed El Morabity Date: Tue, 13 Jan 2015 11:18:15 +0100 Subject: [PATCH 2/2] Update to 3.4.1 --- .gitignore | 1 + apache-commons-math.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 274ac31..b7c21d0 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ commons-math-2.0-src.tar.gz /commons-math3-3.2-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 diff --git a/apache-commons-math.spec b/apache-commons-math.spec index 603d6a5..f8a4521 100644 --- a/apache-commons-math.spec +++ b/apache-commons-math.spec @@ -1,7 +1,7 @@ %global short_name commons-math3 Name: apache-commons-math -Version: 3.4 +Version: 3.4.1 Release: 1%{?dist} Summary: Java library of lightweight mathematics and statistics components Group: Development/Libraries @@ -12,6 +12,7 @@ Source0: http://www.apache.org/dist/commons/math/source/%{short_name}-% 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 @@ -65,6 +66,9 @@ rm src/site/resources/profile.jacoco %changelog +* Tue Jan 13 2015 Mohamed El Morabity - 3.4.1-1 +- Update to 3.4.1 + * Mon Jan 05 2015 Mohamed El Morabity - 3.4-1 - Update to 3.4 diff --git a/sources b/sources index 1393006..f8bf0f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5d8d61a4531f9c5f78f44349e5abe935 commons-math3-3.4-src.tar.gz +01daa3eedd61cfe3315fb0417fc8ac2e commons-math3-3.4.1-src.tar.gz