[apache-commons-csv] Build with xmvn

[Michal Srb]

commit ff5bdf3e703786afa961b97253f0137c95b6bf82
Author: Michal Srb <msrb at redhat.com>
Date:   Tue Jan 15 14:21:07 2013 +0100

    Build with xmvn
    
    - Spec file cleanup

 apache-commons-csv.spec |   50 +++++++++++-----------------------------------
 1 files changed, 12 insertions(+), 38 deletions(-)
---
diff --git a/apache-commons-csv.spec b/apache-commons-csv.spec
index 8797768..d5d7da0 100644
--- a/apache-commons-csv.spec
+++ b/apache-commons-csv.spec
@@ -3,7 +3,7 @@
 
 Name:             apache-%{short_name}
 Version:          1.0
-Release:          0.3.svn1071189%{?dist}
+Release:          0.4.svn1071189%{?dist}
 Summary:          Utilities to assist with handling of CSV files
 License:          ASL 2.0
 Group:            Development/Libraries
@@ -13,17 +13,13 @@ URL:              http://commons.apache.org/sandbox/%{base_name}
 Source0:          %{name}-%{version}.tar.xz
 BuildArch:        noarch
 
+BuildRequires:    xmvn >= 0.2.1
 BuildRequires:    java-devel >= 1:1.6.0
 BuildRequires:    jpackage-utils
 BuildRequires:    junit4
-BuildRequires:    maven
 BuildRequires:    maven-surefire-provider-junit4
 BuildRequires:    apache-commons-parent
 
-Requires:         java >= 1:1.6.0
-Requires:         jpackage-utils
-Requires(post):   jpackage-utils
-Requires(postun): jpackage-utils
 
 %description
 Commons CSV was started to unify a common and simple interface for
@@ -44,46 +40,24 @@ sed -i 's/\r//' *.txt
 sed -i 's:commons-sandbox-parent:commons-parent:' pom.xml
 
 %build
-mvn-rpmbuild install javadoc:javadoc
+%mvn_file  : %{short_name} %{name}
+%mvn_alias : %{short_name}:%{short_name}
+%mvn_build
 
 %install
-# jars
-install -d -m 755 %{buildroot}%{_javadir}
-install -p -m 644 target/%{short_name}-%{version}-SNAPSHOT.jar %{buildroot}%{_javadir}/%{name}.jar
-ln -sf %{name}.jar %{buildroot}%{_javadir}/%{short_name}.jar
-
-# pom
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
-%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name}
-
-# following line is only for backwards compatibility. New packages
-# should use proper groupid org.apache.commons
-%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name}
-
-# javadoc
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
+%mvn_install
 
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
-%files
-%defattr(-,root,root,-)
+%files -f .mfiles
 %doc LICENSE.txt NOTICE.txt
-%{_javadir}/*.jar
-%{_mavenpomdir}/JPP-%{short_name}.pom
-%{_mavendepmapfragdir}/*
 
-%files javadoc
-%defattr(-,root,root,-)
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE.txt NOTICE.txt
-%doc %{_javadocdir}/%{name}
 
 %changelog
+* Tue Jan 15 2013 Michal Srb <msrb at redhat.com> - 1.0-0.4.svn1071189
+- Build with xmvn
+- Spec file cleanup
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-0.3.svn1071189
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild