Update to 2.2

This commit is contained in:
Mohamed El Morabity 2011-03-10 16:07:29 +01:00
commit f42901476b
4 changed files with 20 additions and 15 deletions

1
.gitignore vendored
View file

@ -1,2 +1,3 @@
commons-math-2.0-src.tar.gz
/commons-math-2.1-src.tar.gz
/commons-math-2.2-src.tar.gz

View file

@ -1,13 +1,14 @@
--- pom.xml 2010-10-22 03:37:42.930470377 +0200
+++ pom.xml 2010-10-22 03:38:07.199469768 +0200
@@ -269,17 +269,6 @@
diff -up commons-math-2.2-src/pom.xml.orig commons-math-2.2-src/pom.xml
--- commons-math-2.2-src/pom.xml.orig 2011-02-26 19:14:36.000000000 +0100
+++ commons-math-2.2-src/pom.xml 2011-03-10 15:05:36.988244002 +0100
@@ -280,17 +280,6 @@
</descriptors>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>clirr-maven-plugin</artifactId>
- <version>2.2.2</version>
- <version>2.3</version>
- <executions>
- <execution>
- <goals>
@ -16,18 +17,18 @@
- </executions>
- </plugin>
</plugins>
</build>
<reporting>
@@ -324,14 +313,6 @@
<resources>
<resource>
@@ -350,14 +339,6 @@
<headerFile>${basedir}/license-header.txt</headerFile>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>clirr-maven-plugin</artifactId>
- <version>2.2.2</version>
- <version>2.2.3</version>
- <configuration>
- <minSeverity>info</minSeverity>
- <minSeverity>${minSeverity}</minSeverity>
- </configuration>
- </plugin>
</plugins>

View file

@ -2,15 +2,15 @@
%global short_name commons-%{base_name}
Name: apache-%{short_name}
Version: 2.1
Release: 4%{?dist}
Version: 2.2
Release: 1%{?dist}
Summary: Java library of lightweight mathematics and statistics components
Group: Development/Libraries
License: ASL 1.1 and ASL 2.0 and BSD
URL: http://commons.apache.org/%{base_name}/
Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
Patch0: %{short_name}-remove-clirr-from-pom.patch
Patch0: %{name}-2.2-remove_clirr_from_pom.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: java-devel >= 1:1.6.0
@ -26,7 +26,7 @@ BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
BuildRequires: maven-plugin-bundle
BuildRequires: maven-resources-plugin
#Should be replaced by maven-surefire-plugin after f15 branch
# Should be replaced by maven-surefire-plugin after f15 branch
BuildRequires: maven-surefire-maven-plugin
BuildRequires: maven-surefire-provider-junit4
Requires: java >= 1:1.6.0
@ -52,7 +52,7 @@ This package contains the API documentation for %{name}.
%prep
%setup -q -n %{short_name}-%{version}-src
%patch0 -p0
%patch0 -p1 -b .remove_clirr_from_pom
%build
@ -113,6 +113,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%changelog
* Thu Mar 10 2011 Mohamed El Morabity <melmorabity@fedoraproject.org> - 2.2-1
- Update to 2.2
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

View file

@ -1 +1 @@
5e7f431d77e87888c79f74b0d5a603f0 commons-math-2.1-src.tar.gz
6261d7991154c992477b32b8f3bea18b commons-math-2.2-src.tar.gz