[axis2] Fixes FTBFS (#992009)

Sun Oct 20 20:53:00 UTC 2013

commit 34190081eaf48a2657c305176c8d109573477aaa
Author: Matt Spaulding <mspaulding06 at gmail.com>
Date:   Sun Oct 20 13:51:57 2013 -0700

    Fixes FTBFS (#992009)
    
    Patch submitted by: gil cattaneo

 axis2.spec |  136 +++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 75 insertions(+), 61 deletions(-)
---

diff --git a/axis2.spec b/axis2.spec
index 43a2c2e..29afaf5 100644
--- a/axis2.spec
+++ b/axis2.spec
@@ -1,24 +1,15 @@
-Name:           axis2
-Version:        1.6.1
-Release:        8%{?dist}
-Summary:        Java-based Web Services / SOAP / WSDL engine
-
-Group:          Development/Libraries
-License:        ASL 2.0
-URL:            http://axis.apache.org/axis2/java/core/
-Source0:        http://mirror.metrocast.net/apache//axis/axis2/java/core/1.6.1/axis2-1.6.1-src.zip
-# Disable modules whose dependencies are not in Fedora.
-Patch0:         %{name}-disable-modules.patch
-# 1) Remove JSR deps which are now built into openjdk
-# 2) Fix javamail dep
-# 3) Remove gmaven code
-Patch1:         %{name}-dep-fixes.patch
+Name:          axis2
+Version:       1.6.1
+Release:       9%{?dist}
+Summary:       Java-based Web Services / SOAP / WSDL engine
+License:       ASL 2.0
+URL:           http://axis.apache.org/axis2/java/core/
+Source0:       http://mirror.metrocast.net/apache//axis/axis2/java/core/1.6.1/axis2-1.6.1-src.zip
 # wrap generated headers with ifndef/define/endif
-Patch2:         %{name}-AXIS2-5349.patch
-BuildArch:      noarch
+Patch0:        %{name}-AXIS2-5349.patch
 
+BuildArch:     noarch
 BuildRequires: java-devel
-BuildRequires: jpackage-utils
 BuildRequires: maven-local
 BuildRequires: maven-shared
 BuildRequires: maven-clean-plugin
@@ -38,21 +29,12 @@ BuildRequires: maven-remote-resources-plugin
 BuildRequires: apache-commons-fileupload
 BuildRequires: tomcat-servlet-3.0-api
 BuildRequires: geronimo-saaj
-Requires:      java
-Requires:      jpackage-utils
-Requires:      XmlSchema
-Requires:      apache-commons-logging
+BuildRequires: maven-plugin-build-helper
+
 Requires:      log4j
 Requires:      xerces-j2
-Requires:      axiom
-Requires:      neethi
-Requires:      jsr-311
-Requires:      woden
 Requires:      javamail
-Requires:      apache-commons-fileupload
 Requires:      tomcat-servlet-3.0-api
-Requires:      geronimo-saaj
-
 
 %description
 Apache Axis2 is a Web Services / SOAP / WSDL engine, the successor
@@ -62,57 +44,89 @@ Axis2/Java and Apache Axis2/C.  This is Axis2/Java.
 
 %package javadoc
 Summary:      API documentation for %{name}
-Group:        Documentation
-Requires:     jpackage-utils
 
 %description javadoc
 API documentation for %{name}.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p0
+
+# Disable modules whose dependencies are not in Fedora.
+%pom_disable_module modules/addressing
+%pom_disable_module modules/fastinfoset
+%pom_disable_module modules/integration
+%pom_disable_module modules/java2wsdl
+%pom_disable_module modules/jibx
+%pom_disable_module modules/json
+%pom_disable_module modules/mex
+%pom_disable_module modules/mtompolicy
+%pom_disable_module modules/mtompolicy-mar
+%pom_disable_module modules/ping
+%pom_disable_module modules/samples/version
+%pom_disable_module modules/soapmonitor/servlet
+%pom_disable_module modules/soapmonitor/module
+%pom_disable_module modules/spring
+%pom_disable_module modules/testutils
+%pom_disable_module modules/tool/axis2-aar-maven-plugin
+%pom_disable_module modules/tool/axis2-ant-plugin
+%pom_disable_module modules/tool/axis2-eclipse-codegen-plugin
+%pom_disable_module modules/tool/axis2-eclipse-service-plugin
+%pom_disable_module modules/tool/axis2-idea-plugin
+%pom_disable_module modules/tool/axis2-java2wsdl-maven-plugin
+%pom_disable_module modules/tool/axis2-mar-maven-plugin
+%pom_disable_module modules/tool/axis2-repo-maven-plugin
+%pom_disable_module modules/tool/axis2-wsdl2code-maven-plugin
+%pom_disable_module modules/webapp
+%pom_disable_module modules/xmlbeans
+%pom_disable_module modules/scripting
+%pom_disable_module modules/jaxbri
+%pom_disable_module modules/metadata
+%pom_disable_module modules/jaxws
+%pom_disable_module modules/jaxws-mar
+%pom_disable_module modules/jaxws-integration
+%pom_disable_module modules/clustering
+%pom_disable_module modules/corba
+%pom_disable_module modules/osgi
+%pom_disable_module modules/transport/local
+%pom_disable_module modules/transport/http
+
+# Remove non standard apidocs final subdir
+%pom_xpath_remove "pom:project/pom:build/pom:pluginManagement/pom:plugins/pom:plugin[pom:artifactId = 'maven-javadoc-plugin' ]/pom:configuration/pom:destDir"
+
+# 1) Remove JSR deps which are now built into openjdk
+# 2) Fix javamail dep
+# 3) Remove gmaven code
+%pom_remove_dep :geronimo-activation_1.1_spec modules/adb
+%pom_remove_dep :geronimo-javamail_1.4_spec modules/java2wsdl
+%pom_add_dep javax.mail:mail modules/java2wsdl
+%pom_remove_plugin :gmaven-plugin modules/java2wsdl
+%pom_remove_dep :geronimo-ws-metadata_2.0_spec modules/kernel
+
+%patch0 -p0
 
 %build
 # Tests currently use an auto-generated ant build xml file which
 # fails due to incorrect setting of JAVA_HOME (to JRE instead of JDK home)
 # I have not yet determined the fix for this.
-mvn-rpmbuild install \
-    -Dmaven.test.skip \
-    -Dproject.build.sourceEncoding=UTF-8 \
-    javadoc:aggregate
+%mvn_build -f -- -Dproject.build.sourceEncoding=UTF-8
 dos2unix NOTICE.txt
 
 %install
-install -d -m 755 %{buildroot}%{_javadir}/%{name}
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-
-# parent POM
-cp modules/parent/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-parent.pom
-%add_maven_depmap JPP.%{name}-parent.pom
+%mvn_install
 
-for mod in resource-bundle adb adb-codegen codegen kernel saaj; do
-  install -m 644 modules/${mod}/target/%{name}-${mod}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}-${mod}.jar
-  cp modules/${mod}/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-${mod}.pom
-  %add_maven_depmap JPP.%{name}-%{name}-${mod}.pom %{name}/%{name}-${mod}.jar
-done
-
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-cp -rp target/site/api/* %{buildroot}%{_javadocdir}/%{name}
-
-%files
+%files -f .mfiles
 %doc LICENSE.txt NOTICE.txt README.txt release-notes.html
-%{_javadir}/%{name}
-%{_mavenpomdir}/JPP*.pom
-%{_mavendepmapfragdir}/%{name}
-
-%files javadoc
-%doc LICENSE.txt
-%{_javadocdir}/%{name}
+%dir %{_javadir}/%{name}
 
+%files javadoc -f .mfiles-javadoc
+%doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Thu Sep 05 2013 gil cattaneo <puntogil at libero.it> 1.6.1-9
+- fix rhbz#992009
+- update to current packaging guidelines
+- use pom macros
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
