Build with xmvn

- Spec file cleanup

apache-commons-daemon.spec

@@ -4,7 +4,7 @@
 
 Name:           apache-%{short_name}
 Version:        1.0.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Defines API to support an alternative invocation mechanism
 License:        ASL 2.0
 Group:          Applications/System
@@ -14,15 +14,13 @@ Patch0:         0001-execve-path-warning.patch
 Patch1:         apache-commons-daemon-JAVA_OS.patch
 Patch2:         apache-commons-daemon-s390x.patch
 Patch3:         apache-commons-daemon-ppc64.patch
+BuildRequires:  xmvn >= 0.2.3
 BuildRequires:  java-devel >= 1:1.6.0
 BuildRequires:  jpackage-utils
-BuildRequires:  maven
 BuildRequires:  apache-commons-parent
 BuildRequires:  maven-surefire-provider-junit
 BuildRequires:  xmlto
 
-Requires:         java >= 1:1.6.0
-Requires:         jpackage-utils
 
 Provides:       jakarta-%{short_name} = 1:%{version}-%{release}
 Obsoletes:      jakarta-%{short_name} <= 1:1.0.1
@@ -53,6 +51,7 @@ Group:          Documentation
 Requires:       jpackage-utils
 BuildArch:      noarch
 
+Provides:       jakarta-%{short_name}-javadoc = 1:%{version}-%{release}
 Obsoletes:      jakarta-%{short_name}-javadoc <= 1:1.0.1
 
 %description    javadoc
@@ -85,43 +84,22 @@ make %{?_smp_mflags}
 popd
 
 # build jars
-mvn-rpmbuild install javadoc:javadoc
-
+%mvn_file  : %{short_name} %{name}
+%mvn_alias : org.apache.commons:%{short_name}
+%mvn_build
 
 
 %install
-
 # install native jsvc
 install -Dpm 755 src/native/unix/jsvc $RPM_BUILD_ROOT%{_bindir}/jsvc
 install -Dpm 644 src/native/unix/jsvc.1 $RPM_BUILD_ROOT%{_mandir}/man1/jsvc.1
 
-# jars
-install -Dpm 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-ln -sf %{name}.jar %{buildroot}%{_javadir}/%{short_name}.jar
+%mvn_install
 
 
-# pom
-install -Dpm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "org.apache.commons:%{short_name}"
-
-
-# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%pre javadoc
-# workaround for rpm bug, can be removed in F-17
-[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
-rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-
-
-%files
+%files -f .mfiles
 %doc LICENSE.txt PROPOSAL.html NOTICE.txt RELEASE-NOTES.txt src/samples
 %doc src/docs/*
-%{_javadir}/%{name}.jar
-%{_javadir}/%{short_name}.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
 
 
 %files jsvc
@@ -130,12 +108,15 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 %{_mandir}/man1/jsvc.1*
 
 
-%files javadoc
-%doc %{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE.txt
 
 
 %changelog
+* Tue Jan 15 2013 Michal Srb <msrb@redhat.com> - 1.0.11-2
+- Build with xmvn
+- Spec file cleanup
+
 * Tue Dec 11 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.0.11-1
 - Update to upstream version 1.0.11