[woden] Update for latest guidelines, rhbz #992879

[mbooth]

commit ced9dc759338222d341c18df1b3cd0a488d07228
Author: Mat Booth <fedora at matbooth.co.uk>
Date:   Wed Aug 14 18:33:28 2013 +0100

    Update for latest guidelines, rhbz #992879

 woden-disable-modules.patch |   27 ------------------
 woden.spec                  |   64 +++++++++++++------------------------------
 2 files changed, 19 insertions(+), 72 deletions(-)
---
diff --git a/woden.spec b/woden.spec
index d61f55a..1270aa9 100644
--- a/woden.spec
+++ b/woden.spec
@@ -2,7 +2,7 @@
 
 Name:           woden
 Version:        1.0
-Release:        0.6.M9%{?dist}
+Release:        0.7.M9%{?dist}
 Summary:        Web Service Description Language (WSDL) validating parser
 
 Group:          Development/Libraries  
@@ -11,27 +11,16 @@ URL:            http://ws.apache.org/woden/
 # svn export https://svn.apache.org/repos/asf/webservices/woden/tags/1.0M9/ woden-1.0M9
 # tar caf woden-1.0M9.tar.xz woden-1.0M9
 Source0:        %{name}-%{oversion}.tar.xz
-# Disable modules whose dependencies are not present in Fedora.  
-Patch0:         %{name}-disable-modules.patch
 BuildArch:      noarch
 
 BuildRequires: java-devel
 BuildRequires: jpackage-utils    
 BuildRequires: maven-local
-BuildRequires: maven-shared
 BuildRequires: XmlSchema
 BuildRequires: apache-commons-logging
 BuildRequires: log4j
 BuildRequires: xerces-j2
 BuildRequires: axiom
-Requires:      java
-Requires:      jpackage-utils
-Requires:      wsdl4j
-Requires:      XmlSchema
-Requires:      apache-commons-logging
-Requires:      log4j
-Requires:      xerces-j2
-Requires:      axiom
 
 %description
 The Woden project is a sub-project of the Apache Web Services Project
@@ -42,57 +31,42 @@ longer term aim of supporting past, present and future versions of WSDL.
 %package javadoc
 Summary:      API documentation for %{name}
 Group:        Documentation
-Requires:     jpackage-utils
 
 %description javadoc
-API documentation for %{name}.
+This package contains the API documentation for %{name}.
 
 %prep
 %setup -q -n %{name}-%{oversion}
-%patch0 -p1
+
+# Disable modules whose dependencies are not present in Fedora.  
+%pom_disable_module woden-tests
+%pom_disable_module woden-tool
+%pom_disable_module woden-converter-maven-plugin
+%pom_disable_module woden-ant
+
+# This test should be excluded on java >= 5
+rm woden-qname/src/test/java/javax/xml/namespace/QNameDeserializeTest.java
 
 %build
-mvn-rpmbuild install javadoc:aggregate
+%mvn_build
 
 # Fix encoding
 iconv -f iso8859-1 -t utf-8 LICENSE > LICENSE.utf8
 mv LICENSE.utf8 LICENSE
 
 %install
-install -d -m 755 %{buildroot}%{_javadir}/%{name}
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-
-# parent POM
-cp pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-parent.pom
-%add_maven_depmap JPP.%{name}-parent.pom
+%mvn_install
 
-# api
-install -m 644 %{name}-api/target/%{name}-api-%{oversion}.jar %{buildroot}%{_javadir}/%{name}/%{name}-api.jar
-cp %{name}-api/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-api.pom
-%add_maven_depmap JPP.%{name}-%{name}-api.pom %{name}/%{name}-api.jar
+%files -f .mfiles
+%doc LICENSE NOTICE README release-notes.html
 
-# impl-commons
-for mod in commons dom om; do
-  install -m 644 %{name}-${mod}/target/%{name}-impl-${mod}-%{oversion}.jar %{buildroot}%{_javadir}/%{name}/%{name}-impl-${mod}.jar
-  cp %{name}-${mod}/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-impl-${mod}.pom
-  %add_maven_depmap JPP.%{name}-%{name}-impl-${mod}.pom %{name}/%{name}-impl-${mod}.jar
-done
-
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-%files
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE NOTICE
-%{_javadir}/%{name}
-%{_mavenpomdir}/JPP*.pom
-%{_mavendepmapfragdir}/%{name}
-
-%files javadoc
-%doc LICENSE
-%{_javadocdir}/%{name}
-
 
 %changelog
+* Wed Aug 14 2013 Mat Booth <fedora at matbooth.co.uk> - 1.0-0.7.M9
+- Update for latest guidelines, rhbz #992879
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-0.6.M9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild