[apache-commons-vfs] Build with XMvn

[Michal Srb]

commit d80d2d7e1725571d1b76c1ea694348ce2ab9d1ff
Author: Michal Srb <msrb at redhat.com>
Date:   Fri Jun 28 07:54:39 2013 +0200

    Build with XMvn
    
    - Do not ignore test failures
    - Fix BR

 apache-commons-vfs.spec |  130 ++++++++++++----------------------------------
 1 files changed, 34 insertions(+), 96 deletions(-)
---
diff --git a/apache-commons-vfs.spec b/apache-commons-vfs.spec
index 4d7bb6a..46dc550 100644
--- a/apache-commons-vfs.spec
+++ b/apache-commons-vfs.spec
@@ -2,9 +2,8 @@
 %global short_name commons-%{base_name}
 Name:          apache-commons-vfs
 Version:       2.0
-Release:       6%{?dist}
+Release:       7%{?dist}
 Summary:       Commons Virtual File System
-Group:         Development/Libraries
 License:       ASL 2.0
 Url:           http://commons.apache.org/%{base_name}/
 Source0:       http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
@@ -17,48 +16,21 @@ Source0:       http://www.apache.org/dist/commons/%{base_name}/source/%{short_na
 # remove old vfs stuff
 Patch0:        %{name}-%{version}-build.patch
 
-BuildRequires: java-devel
-BuildRequires: jpackage-utils
-BuildRequires: apache-commons-parent
-
-BuildRequires: maven-local
-BuildRequires: maven-antrun-plugin
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-plugin-bundle
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-site-plugin
-BuildRequires: maven-surefire-plugin
-BuildRequires: maven-surefire-provider-junit4
-
-BuildRequires: ant
-BuildRequires: apache-commons-collections
-BuildRequires: apache-commons-compress
-BuildRequires: apache-commons-logging
-BuildRequires: apache-commons-net
-BuildRequires: jakarta-commons-httpclient
-BuildRequires: javamail
-BuildRequires: jcifs
-BuildRequires: jdom
-BuildRequires: jsch
+BuildRequires:  maven-local
+BuildRequires:  mvn(com.jcraft:jsch)
+BuildRequires:  mvn(commons-collections:commons-collections)
+BuildRequires:  mvn(commons-httpclient:commons-httpclient)
+BuildRequires:  mvn(commons-logging:commons-logging)
+BuildRequires:  mvn(commons-net:commons-net)
+BuildRequires:  mvn(org.apache.ant:ant)
+BuildRequires:  mvn(org.apache.commons:commons-compress)
+BuildRequires:  mvn(org.apache.commons:commons-parent)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-antrun-plugin)
+BuildRequires:  mvn(org.jdom:jdom)
 
 # test deps
-BuildRequires: junit4
-BuildRequires: slf4j
-
-Requires:      apache-commons-collections
-Requires:      apache-commons-compress
-Requires:      apache-commons-logging
-Requires:      apache-commons-net
-Requires:      jakarta-commons-httpclient
-Requires:      javamail
-Requires:      jcifs
-Requires:      jsch
-
-Requires:      java
-Requires:      jpackage-utils
+BuildRequires:  mvn(junit:junit)
+
 BuildArch:     noarch
 Provides:      %{name}2 = %{version}-%{release}
 
@@ -83,29 +55,19 @@ Some of the features of Commons VFS are:
 
 %package ant
 Summary:       Development files for Commons VFS
-Group:         Development/Languages
-Requires:      ant
-Requires:      apache-commons-logging
 Requires:      %{name} = %{version}-%{release}
 
 %description ant
 This package enables support for the Commons VFS ant tasks.
 
 %package examples
-Group:         Development/Libraries
 Summary:       Commons VFS Examples
-Requires:      jdom
-Requires:      jpackage-utils
-Requires:      %{name} = %{version}-%{release}
-Provides:      %{name}2-examples = %{version}-%{release}
 
 %description examples
 VFS is a Virtual File System library - Examples.
 
 %package javadoc
-Group:         Documentation
 Summary:       Javadoc for %{name}
-Requires:      jpackage-utils
 
 %description javadoc
 This package contains javadoc for %{name}.
@@ -121,67 +83,43 @@ sed -i 's|"webdav",||' core/src/test/java/org/apache/commons/vfs2/util/Delegatin
 
 sed -i "s|<module>dist</module>|<!--module>dist</module-->|" pom.xml
 
-%build
+# not really needed
+%pom_remove_plugin :maven-checkstyle-plugin
 
-mvn-rpmbuild -Dmaven.test.failure.ignore=true install javadoc:aggregate
+%mvn_alias :commons-vfs2 "org.apache.commons:%{short_name}" "%{short_name}:%{short_name}"
+%mvn_alias :commons-vfs2-examples "org.apache.commons:%{short_name}-examples" "%{short_name}:%{short_name}-examples"
 
-%install
+# main package wins parent POM
+%mvn_package ":commons-vfs2-project" commons-vfs2
 
-mkdir -p %{buildroot}%{_javadir}
-install -m 644 core/target/%{short_name}2-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-install -m 644 examples/target/%{short_name}2-examples-%{version}.jar %{buildroot}%{_javadir}/%{name}-examples.jar
-
-(
-  cd %{buildroot}%{_javadir}
-  ln -s %{name}.jar %{short_name}.jar
-  ln -s %{name}-examples.jar %{short_name}-examples.jar
-  ln -s %{name}.jar %{name}2.jar
-  ln -s %{name}-examples.jar %{name}2-examples.jar
-  ln -s %{name}.jar %{short_name}2.jar
-  ln -s %{name}-examples.jar %{short_name}2-examples.jar
-)
-
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}-project.pom
-%add_maven_depmap JPP-%{short_name}-project.pom
-install -pm 644 core/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
-%add_maven_depmap JPP-%{short_name}.pom %{short_name}.jar -a "org.apache.commons:%{short_name},%{short_name}:%{short_name}"
-install -pm 644 examples/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}-examples.pom
-%add_maven_depmap -f examples JPP-%{short_name}-examples.pom %{short_name}-examples.jar -a "org.apache.commons:%{short_name}-examples,%{short_name}:%{short_name}-examples"
-
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
+%build
+%mvn_build -s
+
+%install
+%mvn_install
 
 mkdir -p %{buildroot}%{_sysconfdir}/ant.d
 echo "ant commons-logging %{short_name}" > %{short_name}
 install -p -m 644 %{short_name} %{buildroot}%{_sysconfdir}/ant.d/%{short_name}
 
-%files
-%{_javadir}/%{name}.jar
-%{_javadir}/%{name}2.jar
-%{_javadir}/%{short_name}.jar
-%{_javadir}/%{short_name}2.jar
-%{_mavenpomdir}/JPP-%{short_name}.pom
-%{_mavenpomdir}/JPP-%{short_name}-project.pom
-%{_mavendepmapfragdir}/%{name}
+
+%files -f .mfiles-commons-vfs2
 %doc LICENSE.txt NOTICE.txt README.txt RELEASE-NOTES.txt
 
-%files examples
-%{_javadir}/%{name}-examples.jar
-%{_javadir}/%{name}2-examples.jar
-%{_javadir}/%{short_name}-examples.jar
-%{_javadir}/%{short_name}2-examples.jar
-%{_mavenpomdir}/JPP-%{short_name}-examples.pom
-%{_mavendepmapfragdir}/%{name}-examples
+%files examples -f .mfiles-commons-vfs2-examples
 
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE.txt NOTICE.txt
 
 %files ant
 %config %{_sysconfdir}/ant.d/%{short_name}
 
 %changelog
+* Thu Jun 27 2013 Michal Srb <msrb at redhat.com> - 2.0-7
+- Build with XMvn
+- Do not ignore test failures
+- Fix BR
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild