[maven-shared-utils] Build with xmvn

Mikolaj Izdebski mizdebsk at fedoraproject.org
Tue Feb 19 06:28:07 UTC 2013


commit ae33cc0f799dc65fe9df116b27f1176d06ff6ffd
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Tue Feb 19 07:25:03 2013 +0100

    Build with xmvn

 maven-shared-utils.spec |   45 ++++++++++-----------------------------------
 1 files changed, 10 insertions(+), 35 deletions(-)
---
diff --git a/maven-shared-utils.spec b/maven-shared-utils.spec
index 989fdfd..1ead253 100644
--- a/maven-shared-utils.spec
+++ b/maven-shared-utils.spec
@@ -1,6 +1,6 @@
 Name:           maven-shared-utils
 Version:        0.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Maven shared utility classes
 License:        ASL 2.0
 URL:            http://maven.apache.org/shared/maven-shared-utils
@@ -8,18 +8,11 @@ Source0:        http://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{
 
 BuildArch:      noarch
 
+BuildRequires:  maven-local
 BuildRequires:  apache-commons-lang3
 BuildRequires:  apache-rat
-BuildRequires:  java-devel
-BuildRequires:  jpackage-utils
-BuildRequires:  junit
-BuildRequires:  maven-local
+BuildRequires:  maven-shared
 BuildRequires:  maven-shade-plugin
-BuildRequires:  maven-surefire-provider-junit
-Requires:       apache-commons-io
-Requires:       java
-Requires:       jpackage-utils
-Requires:       jsr-305
 
 %description
 This project aims to be a functional replacement for plexus-utils in Maven.
@@ -29,49 +22,31 @@ improvements: lots of methods got cleaned up, generics got added and we dropped
 a lot of unused code.
 
 %package javadoc
-Group:          Documentation
 Summary:        Javadoc for %{name}
-Requires:       jpackage-utils
     
 %description javadoc
 API documentation for %{name}.
 
-
 %prep
 %setup -q
-
 %pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin
 
 %build
-mvn-rpmbuild package javadoc:aggregate
+%mvn_build
 
 %install
-# JAR
-install -Ddm 755 %{buildroot}/%{_javadir}
-install -Dpm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-
-# POM
-install -Ddm 755 %{buildroot}/%{_mavenpomdir}
-install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%mvn_install
 
-# 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
+* Tue Feb 19 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 0.2-4
+- Build with xmvn
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list