[sisu-maven-plugin] Build with xmvn

Michal Srb msrb at fedoraproject.org
Wed Jan 16 14:57:13 UTC 2013


commit 698b5b4614e7031291284aa66e214af0fcb711bb
Author: Michal Srb <msrb at redhat.com>
Date:   Wed Jan 16 15:56:26 2013 +0100

    Build with xmvn

 sisu-maven-plugin.spec |   37 ++++++++++---------------------------
 1 files changed, 10 insertions(+), 27 deletions(-)
---
diff --git a/sisu-maven-plugin.spec b/sisu-maven-plugin.spec
index 5b19363..92fdcae 100644
--- a/sisu-maven-plugin.spec
+++ b/sisu-maven-plugin.spec
@@ -2,7 +2,7 @@
 
 Name:           sisu-maven-plugin
 Version:        1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Sisu plugin for Apache Maven
 BuildArch:      noarch
 Group:          Development/Tools
@@ -10,9 +10,8 @@ License:        ASL 2.0 and EPL
 URL:            http://sonatype.github.com/%{name}/
 Source:         https://github.com/sonatype/%{name}/tarball/%{name}-%{version}#/%{name}-%{version}.tar.gz
 
+BuildRequires:  xmvn
 BuildRequires:  java-devel
-BuildRequires:  jpackage-utils
-BuildRequires:  maven
 BuildRequires:  maven-common-artifact-filters
 BuildRequires:  plexus-utils
 BuildRequires:  sisu
@@ -21,12 +20,6 @@ BuildRequires:  sonatype-plugins-parent
 BuildRequires:  junit
 BuildRequires:  maven-surefire-provider-junit4
 
-Requires:       java
-Requires:       jpackage-utils
-Requires:       maven
-Requires:       maven-common-artifact-filters
-Requires:       plexus-utils
-Requires:       sisu
 
 %description
 The Sisu Plugin for Maven provides mojos to generate
@@ -35,7 +28,6 @@ META-INF/sisu/javax.inject.Named index files for the Sisu container.
 %package        javadoc
 Summary:        API documentation for %{name}
 Group:          Documentation
-Requires:       jpackage-utils
 
 %description    javadoc
 This package provides %{summary}.
@@ -44,32 +36,23 @@ This package provides %{summary}.
 %setup -q -n sonatype-%{name}-%{tag}
 
 %build
-mvn-rpmbuild install javadoc:aggregate
+%mvn_file  : %{name}
+%mvn_build
 
 %install
-install -d -m 755 %{buildroot}%{_javadir}
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
+%mvn_install
 
-install -p -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-install -p -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap
-
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-
-%files
+%files -f .mfiles
 %doc LICENSE-ASL.txt LICENSE-EPL.txt README.md
-%{_javadir}/%{name}.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE-ASL.txt LICENSE-EPL.txt
-%doc %{_javadocdir}/%{name}
 
 
 %changelog
+* Wed Jan 16 2013 Michal Srb <msrb at redhat.com> - 1.1-3
+- Build with xmvn
+
 * Wed Aug  8 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.1-2
 - Added parent POM dependency
 


More information about the scm-commits mailing list