diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index c1b81ce..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-xmlrpc-3.0-src.tar.gz
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 05ceb16..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: xmlrpc3
-# $Id$
-NAME := xmlrpc3
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..6648e23
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+Merged into xmlprc package.
diff --git a/sources b/sources
deleted file mode 100644
index a725e2c..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-99500a5d04f2eb558716ba3d5a613d14 xmlrpc-3.0-src.tar.gz
diff --git a/xmlrpc3-addjunitandservletapitotestpom.patch b/xmlrpc3-addjunitandservletapitotestpom.patch
deleted file mode 100644
index d1b4945..0000000
--- a/xmlrpc3-addjunitandservletapitotestpom.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- tests/pom.xml 2006-08-30 16:12:43.000000000 -0400
-+++ tests/pom.xml 2007-03-19 14:09:58.000000000 -0400
-@@ -44,5 +44,17 @@
- commons-httpclient
- test
-
-+
-+ javax.servlet
-+ servlet-api
-+ 2.4
-+ provided
-+
-+
-+ junit
-+ junit
-+ 3.8.1
-+ test
-+
-
-
diff --git a/xmlrpc3-client-addosgimanifest.patch b/xmlrpc3-client-addosgimanifest.patch
deleted file mode 100644
index 0db05fa..0000000
--- a/xmlrpc3-client-addosgimanifest.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- pom.xml.orig 2007-09-06 14:09:29.000000000 -0400
-+++ pom.xml 2007-09-06 14:14:25.000000000 -0400
-@@ -11,7 +11,30 @@
- Apache XML-RPC Client Library
-
- src/main/java
--
-+
-+
-+ org.apache.maven.plugins
-+ maven-jar-plugin
-+
-+
-+
-+ 2
-+ %Bundle-Name
-+ plugin
-+ org.apache.xmlrpc
-+ 3.0.0.qualifier
-+ org.apache.xmlrpc.common
-+ org.apache.xmlrpc.client, org.apache.xmlrpc.client.util
-+ javax.xml.bind, javax.xml.namespace, javax.xml.parsers, org.apache.commons.httpclient, org.apache.commons.httpclient.auth, org.apache.commons.httpclient.methods, org.apache.commons.httpclient.params, org.apache.commons.logging, org.apache.ws.commons.serialize, org.apache.ws.commons.util, org.w3c.dom, org.xml.sax, org.xml.sax.helpers
-+ J2SE-1.4, CDC-1.0/Foundation-1.0, J2SE-1.3
-+ dependent
-+ %Bundle-Vendor.0
-+
-+
-+
-+
-+
-+
-
-
- org.apache.xmlrpc
diff --git a/xmlrpc3-common-addosgimanifest.patch b/xmlrpc3-common-addosgimanifest.patch
deleted file mode 100644
index c0cfc0a..0000000
--- a/xmlrpc3-common-addosgimanifest.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- pom.xml.orig 2007-09-06 14:09:36.000000000 -0400
-+++ pom.xml 2007-09-06 14:12:43.000000000 -0400
-@@ -34,6 +34,26 @@
-
-
- -->
-+
-+ org.apache.maven.plugins
-+ maven-jar-plugin
-+
-+
-+
-+ 2
-+ %Bundle-Name
-+ plugin
-+ org.apache.xmlrpc.common
-+ 3.0.0.qualifier
-+ org.apache.xmlrpc, org.apache.xmlrpc.common, org.apache.xmlrpc.jaxb, org.apache.xmlrpc.parser, org.apache.xmlrpc.serializer, org.apache.xmlrpc.util
-+ javax.xml.bind, javax.xml.namespace, javax.xml.parsers, org.apache.commons.httpclient, org.apache.commons.httpclient.auth, org.apache.commons.httpclient.methods, org.apache.commons.httpclient.params, org.apache.commons.logging, org.apache.ws.commons.serialize, org.apache.ws.commons.util, org.w3c.dom, org.xml.sax, org.xml.sax.helpers
-+ J2SE-1.4, CDC-1.0/Foundation-1.0, J2SE-1.3
-+ dependent
-+ %Bundle-Vendor.0
-+
-+
-+
-+
-
-
-
diff --git a/xmlrpc3-jpp-depmap.xml b/xmlrpc3-jpp-depmap.xml
deleted file mode 100644
index d6c858a..0000000
--- a/xmlrpc3-jpp-depmap.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-
- junit
- junit
- 3.8.1
-
-
- JPP
- junit
- 3.8.1
-
-
-
-
- jaxme
- jaxmeapi
- 0.5.1
-
-
- JPP
- jaxme/jaxmeapi
- 0.5.1
-
-
-
-
- org.apache.ws.commons
- ws-commons-util
- 1.0.1
-
-
- JPP
- ws-commons-util
- 1.0.1
-
-
-
-
- javax.servlet
- servlet-api
- 2.4
-
-
- JPP
- tomcat5-servlet-2.4-api
- 2.4
-
-
-
diff --git a/xmlrpc3.spec b/xmlrpc3.spec
deleted file mode 100644
index b221bd5..0000000
--- a/xmlrpc3.spec
+++ /dev/null
@@ -1,341 +0,0 @@
-# Copyright (c) 2000-2005, JPackage roject
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the
-# distribution.
-# 3. Neither the name of the JPackage Project nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-%define mainname xmlrpc
-
-Name: xmlrpc3
-Version: 3.0
-Release: 3.9%{?dist}
-Summary: Java XML-RPC implementation
-License: ASL 2.0
-Group: Development/Libraries
-Url: http://xml.apache.org/%{name}/
-Source0: http://www.apache.org/dist/ws/xmlrpc/sources/xmlrpc-%{version}-src.tar.gz
-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
-
-BuildRequires: dos2unix
-BuildRequires: maven2 >= 2.0.4
-BuildRequires: maven2-plugin-resources
-BuildRequires: maven2-plugin-compiler
-BuildRequires: maven2-plugin-surefire
-BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-install
-BuildRequires: maven2-plugin-javadoc
-BuildRequires: maven2-plugin-eclipse
-BuildRequires: maven2-plugin-assembly
-BuildRequires: maven2-plugin-release
-BuildRequires: maven2-plugin-source
-BuildRequires: ws-jaxme
-BuildRequires: ws-commons-util
-BuildRequires: jpackage-utils >= 0:1.6
-BuildRequires: servletapi5
-BuildRequires: tomcat5
-BuildRequires: junit
-BuildRequires: jakarta-commons-httpclient
-BuildRequires: jakarta-commons-codec >= 1.3
-BuildRequires: jsse
-Requires: jpackage-utils >= 0:1.6
-Requires: servletapi5
-Requires: junit
-Requires: jakarta-commons-httpclient
-Requires: jakarta-commons-codec >= 1.3
-Requires: jsse
-Requires: ws-jaxme
-Requires: ws-commons-util
-
-Buildarch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%description
-Apache XML-RPC is a Java implementation of XML-RPC, a popular protocol
-that uses XML over HTTP to implement remote procedure calls.
-Apache XML-RPC was previously known as Helma XML-RPC. If you have code
-using the Helma library, all you should have to do is change the import
-statements in your code from helma.xmlrpc.* to org.apache.xmlrpc.*.
-
-%package javadoc
-Summary: Javadoc for %{name}
-Group: Development/Libraries
-
-%description javadoc
-Javadoc for %{name}.
-
-%package common
-Summary: Common classes for XML-RPC client and server implementations
-Group: Development/Libraries
-
-%description common
-%{summary}.
-
-%package common-devel
-Summary: Source for common classes of XML-RPC
-Group: Development/Libraries
-Requires: %{name}-common
-
-%description common-devel
-%{summary} client and server implementations.
-
-%package client
-Summary: XML-RPC client implementation
-Group: Development/Libraries
-Requires: %{name}-common
-
-%description client
-%{summary}.
-
-%package client-devel
-Summary: Source for XML-RPC client implementation
-Group: Development/Libraries
-Requires: %{name}-client
-
-%description client-devel
-%{summary}.
-
-%package server
-Summary: XML-RPC server implementation
-Group: Development/Libraries
-Requires: %{name}-common
-
-%description server
-%{summary}.
-
-%package server-devel
-Summary: Source for XML-RPC server implementation
-Group: Development/Libraries
-Requires: %{name}-server
-
-%description server-devel
-%{summary}.
-
-%prep
-%setup -q -n %{mainname}-%{version}
-%patch0
-cp %{SOURCE1} .
-pushd client
-%patch1
-popd
-pushd common
-%patch2
-popd
-
-%build
-dos2unix LICENSE.txt
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-# The java.home is due to java-gcj and libgcj weirdness on 64-bit
-# systems
-mvn-jpp \
- -e \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- -Djava.home=%{_jvmdir}/java/jre \
- -Dmaven2.jpp.depmap.file=%{SOURCE1} \
- -Dmaven.test.failure.ignore=true \
- install javadoc:javadoc
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-# jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 client/target/%{mainname}-client-%{version}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}-client-%{version}.jar
-install -m 644 server/target/%{mainname}-server-%{version}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}-server-%{version}.jar
-install -m 644 common/target/%{mainname}-common-%{version}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}-common-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do \
-ln -sf ${jar} ${jar/-%{version}/}; done)
-
-# sources jars
-install -m 644 client/target/%{mainname}-client-%{version}-sources.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}-client-%{version}-sources.jar
-install -m 644 server/target/%{mainname}-server-%{version}-sources.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}-server-%{version}-sources.jar
-install -m 644 common/target/%{mainname}-common-%{version}-sources.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}-common-%{version}-sources.jar
-
-# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files javadoc
-%defattr(-,root,root,-)
-%{_javadocdir}/*
-
-%files common
-%defattr(-,root,root,-)
-%doc LICENSE.txt
-%{_javadir}/%{name}-common.jar
-%{_javadir}/%{name}-common-%{version}.jar
-
-%files common-devel
-%defattr(-,root,root,-)
-%{_javadir}/%{name}-common-%{version}-sources.jar
-
-%files client
-%defattr(-,root,root,-)
-%{_javadir}/%{name}-client.jar
-%{_javadir}/%{name}-client-%{version}.jar
-
-%files client-devel
-%defattr(-,root,root,-)
-%{_javadir}/%{name}-client-%{version}-sources.jar
-
-%files server
-%defattr(-,root,root,-)
-%{_javadir}/%{name}-server.jar
-%{_javadir}/%{name}-server-%{version}.jar
-
-%files server-devel
-%defattr(0644,root,root,0755)
-%{_javadir}/%{name}-server-%{version}-sources.jar
-
-%changelog
-* Thu Feb 26 2009 Fedora Release Engineering - 3.0-3.9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Fri Oct 31 2008 Alexander Kurtakov 3.0-2.9
-- Fix client osgi manifest - client should require common bundle.
-
-* Wed Oct 22 2008 Alexander Kurtakov 3.0-2.8
-- Drop gcj_support.
-- Fix commons osgi manifest.
-- BR tomcat5.
-
-* Fri Sep 12 2008 Andrew Overholt 3.0-2.7
-- Add ppc64.
-
-* Thu Jul 10 2008 Tom "spot" Callaway 3.0-2.6
-- drop repotag
-- fix license tag
-
-* Wed Mar 19 2008 Andrew Overholt 3.0-2jpp.5
-- Fix server description (rhbz#433699)
-
-* Tue Feb 19 2008 Fedora Release Engineering - 3.0-2jpp.4
-- Autorebuild for GCC 4.3
-
-* Fri Sep 07 2007 Andrew Overholt 3.0-1jpp.4
-- Disable ppc64 (rh#239123).
-
-* Fri Sep 07 2007 Andrew Overholt 3.0-1jpp.3
-- Add OSGi manifests.
-
-* Fri Aug 24 2007 Andrew Overholt 3.0-1jpp.2
-- Rebuild.
-
-* Fri Mar 16 2007 Andrew Overholt 3.0-1jpp.1
-- Create new xmlrpc3 package
-- Use maven to build
-- Shuffle to common, server, and client sub-packages
-- Add -devel sub-packages for -sources jars
-
-* Thu Mar 08 2007 Deepak Bhole 2.0.1-3jpp.2
-- Add javax.net.ssl support to build org.apache.xmlrpc.secure.*
-- Minor spec file cleanup
-
-* Fri Aug 04 2006 Vivek Lakshmanan - 0:2.0.1-3jpp.1
-- Merge with latest from JPP.
-
-* Sat Jul 22 2006 Jakub Jelinek - 0:2.0.1-1jpp_8.2fc
-- Rebuilt
-
-* Wed Jul 12 2006 Jesse Keating - 0:2.0.1-1jpp_8.1fc
-- rebuild
-
-* Wed Mar 8 2006 Rafael Schloming - 0:2.0.1-1jpp_7fc
-- excluded s390 due to eclipse
-
-* Mon Mar 6 2006 Jeremy Katz - 0:2.0.1-1jpp_6fc
-- stop scriptlet spew
-
-* Fri Feb 24 2006 Igor Foox - 0:2.0.1-1jpp_5fc
-- Added post/postun dependency on coreutils.
-
-* Fri Feb 10 2006 Jesse Keating - 0:2.0.1-1jpp_4fc
-- bump again for double-long bug on ppc(64)
-
-* Tue Feb 07 2006 Jesse Keating - 0:2.0.1-1jpp_3fc
-- rebuilt for new gcc4.1 snapshot and glibc changes
-
-* Wed Jan 25 2006 Igor Foox 0:2.0.1-1jpp_2fc
-- ExcludeArch s390x and ppc64
-
-* Wed Jan 18 2006 Andrew Overholt 0:2.0.1-1jpp_2fc
-- Comment out JPackage Distribution and Vendor tags
-
-* Wed Jan 18 2006 Jesse Keating 0:2.0.1-1jpp_2fc
-- bump for test
-
-* Wed Jan 18 2006 Igor Foox 0:2.0.1-1jpp_1fc
-- Update to version 2.0.1
-- Natively compile
-
-* Thu Aug 26 2004 Ralph Apel 0:1.2-0.b1.3jpp
-- Build with ant-1.6.2
-
-* Thu Apr 29 2004 David Walluck 0:1.2-0.b1.2jpp
-- add jar symlinks
-- remove %%buildroot in %%install
-
-* Tue May 06 2003 David Walluck 0:1.2-0.b1.1jpp
-- 1.2-b1
-- update for JPackage 1.5
-
-* Mon Mar 18 2002 Guillaume Rousse 1.1-1jpp
-- 1.1
-- generic servlet support
-- used source release
-- dropped patch
-- added applet jar
-
-* Mon Jan 21 2002 Guillaume Rousse 1.0-3jpp
-- versioned dir for javadoc
-- no dependencies for javadoc package
-- dropped jsse package
-- adaptation to new servlet3 package
-- adaptation to new jsse package
-- section macro
-
-* Fri Dec 7 2001 Guillaume Rousse 1.0-2jpp
-- javadoc into javadoc package
-
-* Sat Nov 3 2001 Guillaume Rousse 1.0-1jpp
-- first JPackage release