[axiom] Fix FTBFS (#992007) and add NOTICE

[madsa]

commit 821f30b5a90a28d289795cc60c7ac8b6813bdd5c
Author: Matt Spaulding <mspaulding06 at gmail.com>
Date:   Sun Oct 20 14:37:45 2013 -0700

    Fix FTBFS (#992007) and add NOTICE

 axiom.spec |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)
---
diff --git a/axiom.spec b/axiom.spec
index ec78328..0d3e601 100644
--- a/axiom.spec
+++ b/axiom.spec
@@ -1,6 +1,6 @@
 Name:           axiom
 Version:        1.2.12
-Release:        6%{?dist}
+Release:        7%{?dist}
 Epoch:          0
 Summary:        Axis Object Model
 License:        ASL 2.0
@@ -15,10 +15,11 @@ Source0:        %{name}-%{version}.tar.xz
 # 3) Remove maven plugins not present in Fedora, which do not impact the build process
 # 4) Remove modules which require additional dependencies not yet in Fedora
 Patch0:         axiom-build-fixes.patch
-BuildRequires:  jpackage-utils
 BuildRequires:  ant
 BuildRequires:  junit
 BuildRequires:  maven-local
+BuildRequires:  maven-install-plugin
+BuildRequires:  maven-plugin-build-helper
 BuildRequires:  apache-rat-plugin
 BuildRequires:  bea-stax-api
 BuildRequires:  javamail
@@ -36,7 +37,6 @@ Requires:       apache-commons-logging
 Requires:       jaxen
 Requires:       woodstox-core
 Requires:       xerces-j2
-Requires:       jpackage-utils
 BuildArch:      noarch
 
 %description
@@ -58,11 +58,13 @@ Requires:       jpackage-utils
 rm -rf modules/axiom-jaxen-testsuite/src/main/
 
 # fix eol
-%{__perl} -pi -e 's/\r$//g' README.txt NOTICE.txt RELEASE-NOTE.txt
+%{__perl} -pi -e 's/\r$//g' README.txt NOTICE RELEASE-NOTE.txt
+
+%pom_remove_dep :axiom-testutils modules/axiom-api
 
 %build
 # Skipping tests for now due to many extra deps
-mvn-rpmbuild -Dmaven.test.skip install
+%mvn_build -f
 
 %install
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/axiom
@@ -90,14 +92,20 @@ cp -rp target/apidocs $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 %files
 %doc *.txt
+%doc NOTICE
 %{_javadir}/axiom/*.jar
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 
 %files javadoc
+%doc NOTICE
 %{_javadocdir}/%{name}
 
 %changelog
+* Sun Oct 20 2013 Matt Spaulding <mspaulding06 at gmail.com> - 0:1.2.12-7
+- Fix FTBFS (#992007)
+- Fixed NOTICE.txt name (should be NOTICE) and added to javadoc package
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.2.12-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild