[maven-invoker] Migrate to XMvn
Michal Srb
msrb at fedoraproject.org
Mon Sep 23 08:25:45 UTC 2013
commit 6ba2733c2ac5b7ce55a5a1f9def79cac39c23d4b
Author: Michal Srb <msrb at redhat.com>
Date: Mon Sep 23 08:49:25 2013 +0200
Migrate to XMvn
maven-invoker.spec | 37 ++++++++-----------------------------
1 files changed, 8 insertions(+), 29 deletions(-)
---
diff --git a/maven-invoker.spec b/maven-invoker.spec
index 95fb7a1..f36644c 100644
--- a/maven-invoker.spec
+++ b/maven-invoker.spec
@@ -1,6 +1,6 @@
Name: maven-invoker
Version: 2.1.1
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Fires a maven build in a clean environment
License: ASL 2.0
URL: http://maven.apache.org/shared/maven-invoker/
@@ -11,16 +11,10 @@ Patch1: %{name}-MSHARED-279.patch
BuildArch: noarch
BuildRequires: java-devel
-BuildRequires: jpackage-utils
BuildRequires: junit
BuildRequires: maven-local
BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-shared
-Requires: java
-Requires: jpackage-utils
-Requires: maven-shared
-Requires: plexus-containers-component-annotations
-Requires: plexus-utils
Obsoletes: maven-shared-invoker < %{version}-%{release}
Provides: maven-shared-invoker = %{version}-%{release}
@@ -37,9 +31,7 @@ InvocationOutputHandlers.
This is a replacement package for maven-shared-invoker
%package javadoc
-Group: Documentation
Summary: Javadoc for %{name}
-Requires: jpackage-utils
%description javadoc
API documentation for %{name}.
@@ -51,35 +43,22 @@ API documentation for %{name}.
%patch1 -p1
%build
-mvn-rpmbuild package javadoc:aggregate -Dmaven.test.failure.ignore
+%mvn_build
%install
-# JAR
-install -Ddm 755 %{buildroot}/%{_javadir}
-install -Dpm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+%mvn_install
-# POM
-install -Ddm 755 %{buildroot}/%{_mavenpomdir}
-install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-
-# JavaDoc
-install -Ddm 755 %{buildroot}/%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-%files
+%files -f .mfiles
%doc LICENSE NOTICE
-%{_javadir}/%{name}.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
-%files javadoc
+%files javadoc -f .mfiles-javadoc
%doc LICENSE NOTICE
-%doc %{_javadocdir}/%{name}
%changelog
+* Mon Sep 23 2013 Michal Srb <msrb at redhat.com> - 2.1.1-8
+- Migrate to XMvn
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.1-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list