Build with xmvn

apache-commons-jxpath.spec

@@ -3,7 +3,7 @@
 
 Name:             apache-%{short_name}
 Version:          1.3
-Release:          11%{?dist}
+Release:          12%{?dist}
 Summary:          Simple XPath interpreter
 
 Group:            Development/Libraries
@@ -17,7 +17,7 @@ BuildArch:        noarch
 
 BuildRequires:    java-devel >= 1:1.6.0
 BuildRequires:    jpackage-utils
-BuildRequires:    maven
+BuildRequires:    xmvn >= 0.2.3
 BuildRequires:    maven-antrun-plugin
 BuildRequires:    maven-assembly-plugin
 BuildRequires:    maven-compiler-plugin
@@ -32,13 +32,6 @@ BuildRequires:    servlet25
 BuildRequires:    jsp
 BuildRequires:    el_api
 
-Requires:         java >= 1:1.6.0
-Requires:         jpackage-utils
-Requires:         jdom >= 0:1.0
-Requires:         apache-commons-beanutils
-Requires:         apache-commons-logging
-
-# This should go away with F-17
 Provides:         jakarta-%{short_name} = 0:%{version}-%{release}
 Obsoletes:        jakarta-%{short_name} < 0:%{version}-%{release}
 
@@ -52,7 +45,6 @@ Summary:          API documentation for %{name}
 Group:            Documentation
 Requires:         jpackage-utils
 
-# This should go away with F-17
 Provides:         jakarta-%{short_name}-javadoc = 0:%{version}-%{release}
 Obsoletes:        jakarta-%{short_name}-javadoc < 0:%{version}-%{release}
 
@@ -65,27 +57,12 @@ This package contains the API documentation for %{name}.
 
 %build
 # we are skipping tests because we don't have com.mockrunner in repos yet
-mvn-rpmbuild \
-        -Dmaven.local.depmap.file="%{SOURCE1}" \
-        -Dmaven.test.skip=true \
-        install javadoc:javadoc
-
+%mvn_file  : %{short_name} %{name}
+%mvn_alias : org.apache.commons:%{short_name}
+%mvn_build -f -D "%{SOURCE1}"
 
 %install
-install -Dpm 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-pushd $RPM_BUILD_ROOT%{_javadir}
-    ln -sf %{name}.jar %{short_name}.jar
-popd # come back from javadir
-
-# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-# Install pom
-# pom
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{short_name}.pom
-%add_maven_depmap JPP-%{short_name}.pom %{short_name}.jar -a "org.apache.commons:%{short_name}"
+%mvn_install
 
 %pre javadoc
 # workaround for rpm bug, can be removed in F-20
@@ -93,18 +70,16 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{short_name}.pom
 rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 
 
-%files
+%files -f .mfiles
 %doc LICENSE.txt NOTICE.txt
-%{_javadir}/%{name}.jar
-%{_javadir}/%{short_name}.jar
-%{_mavenpomdir}/JPP-%{short_name}.pom
-%{_mavendepmapfragdir}/%{name}
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE.txt NOTICE.txt
-%{_javadocdir}/%{name}
 
 %changelog
+* Tue Jan 15 2013 Michal Srb <msrb@redhat.com> - 1.3-12
+- Build with xmvn
+
 * Thu Nov 22 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.3-11
 - Install NOTICE file
 - Resolves: rhbz#879556