[maven-plugin-cobertura] Update to upstream 2.5.1 version.

[Alexander Kurtakov]

commit 040bac66d510b9c11023ce0c6a9dc4f68bc4b3a7
Author: Alexander Kurtakov <akurtakov at gmail.com>
Date:   Fri Jun 17 05:22:00 2011 +0300

    Update to upstream 2.5.1 version.

 .gitignore                                    |    1 +
 maven-plugin-cobertura-2.3-SiteRenderer.patch |   29 -------------------
 maven-plugin-cobertura.spec                   |   38 ++++++++----------------
 sources                                       |    2 +-
 4 files changed, 15 insertions(+), 55 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index deefcc5..19b4f4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 maven-plugin-cobertura-2.3.tar.bz2
 cobertura-maven-plugin-2.4-source-release.zip
+/cobertura-maven-plugin-2.5.1-source-release.zip
diff --git a/maven-plugin-cobertura.spec b/maven-plugin-cobertura.spec
index 7d6f104..b0faf70 100644
--- a/maven-plugin-cobertura.spec
+++ b/maven-plugin-cobertura.spec
@@ -1,17 +1,17 @@
 Name:       maven-plugin-cobertura
-Version:    2.4
-Release:    2%{?dist}
+Version:    2.5.1
+Release:    1%{?dist}
 Summary:    Plugin providing the features of Cobertura within Maven
 
 Group:      Development/Libraries
 License:    ASL 2.0 and GPLv2 and GPLv2+
 URL:        http://mojo.codehaus.org/cobertura-maven-plugin/
-Source0:    http://repo2.maven.org/maven2/org/codehaus/mojo/cobertura-maven-plugin/2.4/cobertura-maven-plugin-%{version}-source-release.zip
+Source0:    http://repo2.maven.org/maven2/org/codehaus/mojo/cobertura-maven-plugin/%{version}/cobertura-maven-plugin-%{version}-source-release.zip
 # Fix compile with our doxia.
 Patch0:     maven-plugin-cobertura-2.3-SiteRenderer.patch
 BuildArch:  noarch
 
-BuildRequires:  maven2
+BuildRequires:  maven
 BuildRequires:  maven-plugin-plugin
 BuildRequires:  maven-resources-plugin
 BuildRequires:  maven-compiler-plugin
@@ -19,7 +19,7 @@ BuildRequires:  maven-jar-plugin
 BuildRequires:  maven-install-plugin
 BuildRequires:  maven-invoker-plugin
 BuildRequires:  maven-javadoc-plugin
-BuildRequires:  maven-surefire-maven-plugin
+BuildRequires:  maven-surefire-plugin
 BuildRequires:  maven-doxia-sitetools
 BuildRequires:  maven-plugin-testing-harness
 BuildRequires:  maven-plugin-cobertura
@@ -27,7 +27,7 @@ BuildRequires:  gnu-getopt >= 0:1.0.13
 BuildRequires:  cobertura
 BuildRequires:  mojo-parent
 
-Requires:       maven2
+Requires:       maven
 Requires:       cobertura
 Requires:       mojo-parent
 Requires(post): jpackage-utils
@@ -43,7 +43,6 @@ of your Java program are lacking test coverage.
 %package	javadoc
 Summary:    Javadoc for %{name}
 Group:      Documentation
-Requires:   %{name} = %{version}-%{release}
 Requires:   jpackage-utils
 
 %description	javadoc
@@ -51,55 +50,44 @@ This package contains the API documentation for %{name}.
 
 %prep
 %setup -q -n cobertura-maven-plugin-%{version}
-%patch0 -p1
 
 %build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
-mvn-jpp -Dmaven.test.skip=true -Dmaven.repo.local=$MAVEN_REPO_LOCAL package javadoc:javadoc
-
+mvn-rpmbuild -Dmaven.test.failure.ignore=true package javadoc:javadoc
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 # jar
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
 install -p -m 644 target/cobertura-maven-plugin-%{version}.jar \
   $RPM_BUILD_ROOT%{_javadir}/maven-plugin-cobertura.jar
 
 # pom
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
 install -p -m 644 pom.xml \
-  $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-maven-plugin-cobertura.pom
+  $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-maven-plugin-cobertura.pom
 %add_to_maven_depmap org.codehaus.mojo cobertura-maven-plugin %{version} JPP maven-plugin-cobertura
 
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post
 %update_maven_depmap
 
 %postun
 %update_maven_depmap
 
-
 %files
-%defattr(-,root,root,-)
 %{_mavenpomdir}/JPP-%{name}*.pom
-%config(noreplace) %{_mavendepmapfragdir}
+%{_mavendepmapfragdir}
 %{_javadir}/*
 
 %files javadoc
-%defattr(-,root,root,-)
 %{_javadocdir}/%{name}
 
-
 %changelog
+* Fri Jun 17 2011 Alexander Kurtakov <akurtako at redhat.com> 2.5.1-1
+- Update to upstream 2.5.1 version.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 6ff3271..3cf6822 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bd09f32b260b3cd54beb8cc8349b63a2  cobertura-maven-plugin-2.4-source-release.zip
+87f2565071b7ad8df60175fb663e0809  cobertura-maven-plugin-2.5.1-source-release.zip