[opensaml-java-xmltooling] Using xmvn

[Marek Goldmann]

commit 332e27428fb37ebe2c09fb49a0aa1b33b6bc6e03
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date:   Wed Aug 7 09:16:18 2013 +0200

    Using xmvn

 opensaml-java-xmltooling.spec |   51 ++++++++---------------------------------
 1 files changed, 10 insertions(+), 41 deletions(-)
---
diff --git a/opensaml-java-xmltooling.spec b/opensaml-java-xmltooling.spec
index 924ee0c..bcd786a 100644
--- a/opensaml-java-xmltooling.spec
+++ b/opensaml-java-xmltooling.spec
@@ -1,6 +1,6 @@
 Name:          opensaml-java-xmltooling
 Version:       1.3.4
-Release:       6%{?dist}
+Release:       7%{?dist}
 Summary:       Java XMLTooling library
 License:       ASL 2.0 and W3C
 Group:         Development/Libraries
@@ -36,19 +36,7 @@ BuildRequires: xerces-j2
 BuildRequires: xalan-j2
 BuildRequires: xml-commons-apis
 BuildRequires: opensaml-java-parent
-
-Requires:      java
-Requires:      jpackage-utils
-Requires:      jcip-annotations
-Requires:      slf4j
-Requires:      bouncycastle
-Requires:      xml-security
-Requires:      not-yet-commons-ssl
-Requires:      apache-commons-codec
-Requires:      joda-time
-Requires:      xerces-j2
-Requires:      xalan-j2
-Requires:      xml-commons-apis
+BuildRequires: xmlunit
 
 %description
 Java XMLTooling is a low-level library that may be used to construct libraries
@@ -57,7 +45,6 @@ that allow developers to work with XML in a Java beans manner.
 %package javadoc
 Summary:       Javadocs for %{name}
 Group:         Documentation
-Requires:      jpackage-utils
 
 %description javadoc
 This package contains the API documentation for %{name}.
@@ -76,40 +63,22 @@ sed -i "s|bcprov-jdk15|bcprov-jdk16|" pom.xml
 
 %build
 # Certificate related tests fail: Tests run: 803, Failures: 24, Errors: 0, Skipped: 0
-mvn-rpmbuild \
-  -Dproject.build.sourceEncoding=UTF-8 \
-  -Dmaven.test.skip=true \
-  package javadoc:aggregate
+%mvn_build -f
 
 %install
+%mvn_install
 
-install -d -m 755 %{buildroot}%{_javadir}
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-
-# jar
-install -pm 644 target/xmltooling-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-
-# pom
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-
-# depmap
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-# javadoc
-cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-%files
+%files -f .mfiles
 %doc doc
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%{_javadir}/*
+%dir %{_javadir}/%{name}
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc doc
-%{_javadocdir}/%{name}
 
 %changelog
+* Wed Aug 07 2013 Marek Goldmann <mgoldman at redhat.com> - 1.3.4-7
+- Using xmvn
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.4-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild