[apache-scout] fix rhbz#991978, build fix for apache juddi >= 3.1.5

[Marek Goldmann]

commit ef353ee026b2a6ac85dabf8a3fbdd41cd7abfc85
Author: gil <puntogil at libero.it>
Date:   Thu Aug 8 04:01:16 2013 +0200

    fix rhbz#991978, build fix for apache juddi >= 3.1.5

 apache-scout.spec |  110 +++++++++++++++++++++++++++--------------------------
 1 files changed, 56 insertions(+), 54 deletions(-)
---
diff --git a/apache-scout.spec b/apache-scout.spec
index b218fea..5acee85 100644
--- a/apache-scout.spec
+++ b/apache-scout.spec
@@ -1,46 +1,41 @@
 Name:             apache-scout
 Version:          1.2.6
-Release:          7%{?dist}
+Release:          8%{?dist}
 Summary:          JSR 93 (JAXR) implementation
-Group:            Development/Libraries
 License:          ASL 2.0
 URL:              http://juddi.apache.org/scout
-
 # svn export http://svn.apache.org/repos/asf/juddi/scout/tags/scout-1.2.6/ apache-scout
 # tar cafJ apache-scout-1.2.6.tar.xz apache-scout
 Source0:          %{name}-%{version}.tar.xz
 
-Patch0:           0001-Change-guid-aid-of-deps.patch
-
 BuildArch:        noarch
 
-BuildRequires:    jpackage-utils
 BuildRequires:    java-devel
 BuildRequires:    maven-local
-BuildRequires:    maven-compiler-plugin
-BuildRequires:    maven-install-plugin
-BuildRequires:    maven-jar-plugin
-BuildRequires:    maven-javadoc-plugin
-BuildRequires:    maven-surefire-provider-junit
-BuildRequires:    axis
-BuildRequires:    apache-juddi
-BuildRequires:    geronimo-jaxrpc
-BuildRequires:    jboss-jaxr-1.0-api
-BuildRequires:    jboss-jaxb-2.2-api
+
 BuildRequires:    axis
-BuildRequires:    aspectjweaver
-BuildRequires:    wsdl4j
+BuildRequires:    mvn(axis:axis)
+BuildRequires:    mvn(org.apache.geronimo.specs:geronimo-jaxrpc_1.1_spec)
+BuildRequires:    mvn(org.apache.juddi:juddi-client)
+BuildRequires:    mvn(org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.2_spec)
+BuildRequires:    mvn(org.jboss.spec.javax.xml.registry:jboss-jaxr-api_1.0_spec)
 BuildRequires:    geronimo-parent-poms
+BuildRequires:    mvn(org.aspectj:aspectjweaver)
+BuildRequires:    wsdl4j
+
 
-Requires:         axis
-Requires:         apache-juddi
-Requires:         jpackage-utils
-Requires:         java
-Requires:         geronimo-jaxrpc
-Requires:         jboss-jaxr-1.0-api
-Requires:         jboss-jaxb-2.2-api
-Requires:         aspectjweaver
-Requires:         wsdl4j
+%if 0
+# test deps
+BuildRequires:    mvn(axis:axis-jaxrpc)
+BuildRequires:    mvn(axis:axis-saaj)
+BuildRequires:    mvn(commons-discovery:commons-discovery)
+BuildRequires:    mvn(junit:junit)
+BuildRequires:    mvn(log4j:log4j)
+BuildRequires:    mvn(org.apache.derby:derby)
+BuildRequires:    mvn(org.apache.juddi:juddi:2.0.1)
+BuildRequires:    mvn(org.aspectj:aspectjrt)
+BuildRequires:    mvn(org.aspectj:aspectjweaver)
+%endif
 
 %description
 Apache Scout is an implementation of the JSR 93 Java API For XML Registries
@@ -48,9 +43,7 @@ Apache Scout is an implementation of the JSR 93 Java API For XML Registries
 Apache jUDDI) in a standard way.
 
 %package javadoc
-Summary:          Javadocs for %{name}
-Group:            Documentation
-Requires:         jpackage-utils
+Summary:          Javadoc for %{name}
 
 %description javadoc
 This package contains the API documentation for %{name}.
@@ -58,40 +51,49 @@ This package contains the API documentation for %{name}.
 %prep
 %setup -q -n %{name}
 
-%patch0 -p1
+%pom_remove_dep :geronimo-activation_1.1_spec
+%pom_remove_dep :geronimo-jaxb_2.1_spec
+%pom_add_dep org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.2_spec:1.0.4.Final
+%pom_remove_dep :geronimo-jaxr_1.0_spec
+%pom_add_dep org.jboss.spec.javax.xml.registry:jboss-jaxr-api_1.0_spec:1.0.2.Final
+%pom_remove_dep :geronimo-stax-api_1.0_spec
+%pom_add_dep org.codehaus.woodstox:stax2-api:3.1.1
 
-%build
-# Skipped because of many test resources not packaged
-mvn-rpmbuild -Dproject.build.sourceEncoding=UTF-8 -Dmaven.test.skip=true package javadoc:aggregate
+# fedora aspectjweaver package provides aspectjrt
+%pom_remove_dep org.aspectj:aspectjrt
+%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:artifactId = 'aspectjweaver' ]/pom:groupId" org.aspectj
 
-%install
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+sed -i 's/\r//' README
 
-# JAR
-install -pm 644 target/scout-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+# build fix for apache juddi 3.1.5
+sed -i "s|UDDIClerkManager|UDDIClient|" \
+ src/main/java/org/apache/ws/scout/registry/ConnectionImpl.java
 
-# POM
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+%build
 
-# DEPMAP
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
+%mvn_file :scout %{name}
+# Skipped because of many test resources not packaged
+%mvn_build -f -- -Dproject.build.sourceEncoding=UTF-8
 
-# APIDOCS
-cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+%install
+%mvn_install
 
-%files
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%{_javadir}/*
-%doc LICENSE README NOTICE
+%files -f .mfiles
+%doc LICENSE NOTICE README
 
-%files javadoc
-%{_javadocdir}/%{name}
-%doc LICENSE
+%files javadoc -f .mfiles-javadoc
+%doc LICENSE NOTICE
 
 %changelog
+* Thu Aug 08 2013 gil cattaneo <puntogil at libero.it> 1.2.6-8
+- fix rhbz#991978
+- build fix for apache juddi >= 3.1.5
+- switch to XMvn
+- resolve some rpmlint problems
+- install NOTICE file in javadoc sub package
+- use pom macros
+- minor changes to adapt to current guideline
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.6-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild