[xmlrpc3] Build against tomcat v7 apis.

[Alexander Kurtakov]

commit a008d2e284fd3b1162fe78a3faf06e2dabbf45fe
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Fri Mar 23 10:08:39 2012 +0200

    Build against tomcat v7 apis.
    
    - Guideline fixes.

 xmlrpc3.spec |   40 +++++++++++-----------------------------
 1 files changed, 11 insertions(+), 29 deletions(-)
---
diff --git a/xmlrpc3.spec b/xmlrpc3.spec
index 9c68eb7..6e8acb5 100644
--- a/xmlrpc3.spec
+++ b/xmlrpc3.spec
@@ -32,17 +32,13 @@
 
 Name:       xmlrpc3
 Version:    3.1.3
-Release:    7%{?dist}
+Release:    8%{?dist}
 Summary:    Java XML-RPC implementation
 License:    ASL 2.0
 Group:      Development/Libraries
 URL:        http://ws.apache.org/xmlrpc/
 Source0:    http://www.apache.org/dist//ws/xmlrpc/sources/apache-xmlrpc-%{version}-src.tar.bz2
 Source1:    %{name}-jpp-depmap.xml
-# FIXME:  file this upstream
-# The tests pom.xml doesn't include necessary dependencies on junit and
-# servletapi
-Patch0:     %{name}-addjunitandservletapitotestpom.patch
 # Add OSGi MANIFEST information
 Patch1:     %{name}-client-addosgimanifest.patch
 Patch2:     %{name}-common-addosgimanifest.patch
@@ -61,8 +57,7 @@ BuildRequires:  maven-site-plugin
 BuildRequires:  ws-jaxme
 BuildRequires:  ws-commons-util
 BuildRequires:  jpackage-utils >= 0:1.6
-BuildRequires:  servlet25
-BuildRequires:	tomcat6
+BuildRequires:  tomcat-servlet-3.0-api
 BuildRequires:  junit
 BuildRequires:  jakarta-commons-httpclient
 BuildRequires:  apache-commons-logging
@@ -92,8 +87,6 @@ Requires:   ws-jaxme
 Requires:   ws-commons-util
 Requires:   jpackage-utils >= 0:1.6
 Requires:   apache-commons-logging
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
 
 %description common
 %{summary}.
@@ -113,7 +106,7 @@ Summary:    XML-RPC server implementation
 Group:      Development/Libraries
 Requires:   %{name}-client
 Requires:   junit
-Requires:   servlet25
+Requires:   tomcat-servlet-3.0-api
 Obsoletes:  %{name}-server-devel <= %{version}
 
 %description server
@@ -121,9 +114,6 @@ Obsoletes:  %{name}-server-devel <= %{version}
 
 %prep
 %setup -q -n apache-%{mainname}-%{version}-src
-pushd server
-%patch0 -b .sav
-popd
 pushd client
 %patch1 -b .sav
 popd
@@ -134,8 +124,6 @@ popd
 sed -i 's/\r//' LICENSE.txt
 
 %build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
 # ignore test failure because server part needs network
 mvn-rpmbuild \
   -e \
@@ -162,33 +150,25 @@ install -Dm 644 client/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-client
 install -Dm 644 server/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-server.pom
 
 # ... and maven depmaps
-%add_to_maven_depmap org.apache.xmlrpc %{mainname} %{version} JPP %{name}
-%add_to_maven_depmap org.apache.xmlrpc %{mainname}-common %{version} JPP %{name}-common
-%add_to_maven_depmap org.apache.xmlrpc %{mainname}-client %{version} JPP %{name}-client
-%add_to_maven_depmap org.apache.xmlrpc %{mainname}-server %{version} JPP %{name}-server
+%add_maven_depmap JPP-%{name}.pom
+%add_maven_depmap JPP-%{name}-common.pom %{name}-common.jar
+%add_maven_depmap JPP-%{name}-client.pom %{name}-client.jar
+%add_maven_depmap JPP-%{name}-server.pom %{name}-server.jar
 
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-%post common
-%update_maven_depmap
-
-%postun common
-%update_maven_depmap
-
 %pre javadoc
 # workaround rpm bug, can be removed in F-17
 [ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
 rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 
 %files javadoc
-%defattr(-,root,root,-)
 %doc LICENSE.txt
 %{_javadocdir}/*
 
 %files common
-%defattr(-,root,root,-)
 %doc LICENSE.txt
 %{_mavenpomdir}/JPP-%{name}.pom
 %{_mavenpomdir}/JPP-%{name}-common.pom
@@ -196,16 +176,18 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 %{_javadir}/%{name}-common.jar
 
 %files client
-%defattr(-,root,root,-)
 %{_mavenpomdir}/JPP-%{name}-client.pom
 %{_javadir}/%{name}-client.jar
 
 %files server
-%defattr(-,root,root,-)
 %{_mavenpomdir}/JPP-%{name}-server.pom
 %{_javadir}/%{name}-server.jar
 
 %changelog
+* Fri Mar 23 2012 Alexander Kurtakov <akurtako at redhat.com> 3.1.3-8
+- Build against tomcat v7 apis.
+- Guideline fixes.
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.3-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild