commit 1a0935f6f071b72c18ab4d1884c7e1af5e79a578
Author: Michal Srb <msrb(a)redhat.com>
Date: Mon Mar 25 10:23:24 2013 +0100
Build with xmvn
cobertura-maven-plugin.spec | 37 ++++++++-----------------------------
1 files changed, 8 insertions(+), 29 deletions(-)
---
diff --git a/cobertura-maven-plugin.spec b/cobertura-maven-plugin.spec
index 6952378..c8152db 100644
--- a/cobertura-maven-plugin.spec
+++ b/cobertura-maven-plugin.spec
@@ -1,6 +1,6 @@
Name: cobertura-maven-plugin
Version: 2.5.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Plugin providing the features of Cobertura within Maven
Group: Development/Libraries
@@ -24,11 +24,6 @@ BuildRequires: gnu-getopt >= 0:1.0.13
BuildRequires: cobertura
BuildRequires: mojo-parent
-Requires: maven
-Requires: cobertura
-Requires: mojo-parent
-Requires: jpackage-utils
-
Provides: maven-plugin-cobertura = %{version}-%{release}
Obsoletes: maven-plugin-cobertura < 2.5.2-1
@@ -42,7 +37,6 @@ which parts of your Java program are lacking test coverage.
%package javadoc
Summary: Javadoc for %{name}
Group: Documentation
-Requires: jpackage-utils
%description javadoc
This package contains the API documentation for %{name}.
@@ -59,36 +53,21 @@ find . -name *.class -delete
%build
# tests are disabled because of missing dependencies
-mvn-rpmbuild -Dmaven.test.skip=true package javadoc:aggregate
+%mvn_build -f
%install
-# jar
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -p -m 644 target/%{name}-%{version}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-
-# pom
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -p -m 644 pom.xml \
- $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
-
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
+%mvn_install
-# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%files
+%files -f .mfiles
%doc LICENSE
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
-%{_javadir}/*
-%files javadoc
+%files javadoc -f .mfiles-javadoc
%doc LICENSE
-%{_javadocdir}/%{name}
%changelog
+* Mon Mar 25 2013 Michal Srb <msrb(a)redhat.com> - 2.5.2-3
+- Build with xmvn
+
* Thu Feb 28 2013 Michal Srb <msrb(a)redhat.com> - 2.5.2-2
- Missing R: jpackage-utils