commit 2dc28156e9994c71cb5cfb2797b1a088a358ab06
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Fri Dec 17 12:16:32 2010 +0200
Update to 2.4.
Adapt to current guidelines.
.gitignore | 1 +
maven-plugin-cobertura.spec | 44 ++++++++++++++++++++----------------------
sources | 2 +-
3 files changed, 23 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 788db93..deefcc5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
maven-plugin-cobertura-2.3.tar.bz2
+cobertura-maven-plugin-2.4-source-release.zip
diff --git a/maven-plugin-cobertura.spec b/maven-plugin-cobertura.spec
index f391995..24a2bb3 100644
--- a/maven-plugin-cobertura.spec
+++ b/maven-plugin-cobertura.spec
@@ -1,38 +1,35 @@
Name: maven-plugin-cobertura
-Version: 2.3
-Release: 3%{?dist}
+Version: 2.4
+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/
-# The source tarball has been generated from upstream VCS:
-# svn export
https://svn.codehaus.org/mojo/tags/cobertura-maven-plugin-%{version}
-# %{name}-%{version}
-# tar cjvf %{name}-%{version}.tar.bz2} %{name}-%{version}
-# (exported revision 10628)
-Source0: %{name}-%{version}.tar.bz2
+Source0:
http://repo2.maven.org/maven2/org/codehaus/mojo/cobertura-maven-plugin/2....
# Fix compile with our doxia.
Patch0: maven-plugin-cobertura-2.3-SiteRenderer.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: maven2
-BuildRequires: maven2-plugin-plugin
-BuildRequires: maven2-plugin-resources
-BuildRequires: maven2-plugin-compiler
-BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-install
-BuildRequires: maven2-plugin-javadoc
+BuildRequires: maven-plugin-plugin
+BuildRequires: maven-resources-plugin
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-invoker-plugin
+BuildRequires: maven-javadoc-plugin
BuildRequires: maven-surefire-maven-plugin
BuildRequires: maven-doxia-sitetools
-BuildRequires: maven-shared-plugin-testing-harness
+BuildRequires: maven-plugin-testing-harness
+BuildRequires: maven-plugin-cobertura
BuildRequires: gnu-getopt >= 0:1.0.13
-BuildRequires: tomcat5
BuildRequires: cobertura
+BuildRequires: mojo-parent
Requires: maven2
Requires: cobertura
+Requires: mojo-parent
Requires(post): jpackage-utils
Requires(postun): jpackage-utils
@@ -53,14 +50,14 @@ Requires: jpackage-utils
This package contains the API documentation for %{name}.
%prep
-%setup -q
+%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 install
javadoc:javadoc
+mvn-jpp -Dmaven.test.skip=true -Dmaven.repo.local=$MAVEN_REPO_LOCAL package
javadoc:javadoc
%install
@@ -69,10 +66,7 @@ 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-%{version}.jar
-pushd $RPM_BUILD_ROOT%{_javadir}
-ln -s maven-plugin-cobertura-%{version}.jar maven-plugin-cobertura.jar
-popd
+ $RPM_BUILD_ROOT%{_javadir}/maven-plugin-cobertura.jar
# pom
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
@@ -106,6 +100,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Dec 17 2010 Alexander Kurtakov <akurtako(a)redhat.com> 2.4-1
+- Update to 2.4.
+- Adapt to current guidelines.
+
* Thu Sep 10 2009 Alexander Kurtakov <akurtako(a)redhat.com> 2.3-3
- Fix license and changelog.
- Add comment for patch.
diff --git a/sources b/sources
index 93bcf25..6ff3271 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e7d10ff9e251f8c618be65cdfc52cca3 maven-plugin-cobertura-2.3.tar.bz2
+bd09f32b260b3cd54beb8cc8349b63a2 cobertura-maven-plugin-2.4-source-release.zip