diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 44a49ac..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-commons-lang-2.4-src.tar.gz
diff --git a/Makefile b/Makefile
deleted file mode 100644
index eb27856..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: jakarta-commons-lang
-# $Id$
-NAME := jakarta-commons-lang
-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 $$d/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),)
-# attempt 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/commons-lang-2.4-jpp-depmap.xml b/commons-lang-2.4-jpp-depmap.xml
deleted file mode 100644
index 5cac740..0000000
--- a/commons-lang-2.4-jpp-depmap.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
- junit
- junit
- 3.8.1
-
-
- JPP
- junit
- junit.jar
- 3.8.1
-
-
-
-
- org.apache.maven.plugins
- maven-checkstyle-plugin
- 2.1
-
-
- JPP/maven2/plugins
- checkstyle-plugin
- 2.1-SNAPSHOT
-
-
-
-
- org.codehaus.mojo
- clirr-maven-plugin
- 2.1.1
-
-
-
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..ea7740f
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+This package has been renamed to apache-commons-lang in F14+
diff --git a/jakarta-commons-lang-addosgimanifest.patch b/jakarta-commons-lang-addosgimanifest.patch
deleted file mode 100644
index ce2a43a..0000000
--- a/jakarta-commons-lang-addosgimanifest.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up ./src/conf/MANIFEST.MF.osgi ./src/conf/MANIFEST.MF
---- ./src/conf/MANIFEST.MF.osgi 2008-07-24 16:38:38.000000000 -0400
-+++ ./src/conf/MANIFEST.MF 2008-07-24 16:39:13.000000000 -0400
-@@ -10,3 +10,17 @@ Implementation-Title: Commons Lang
- Implementation-Vendor-Id: org.apache
- X-Compile-Source-JDK: @compile.source@
- X-Compile-Target-JDK: @compile.target@
-+Bundle-RequiredExecutionEnvironment: JRE-1.1
-+Bundle-SymbolicName: org.apache.commons.lang
-+Bundle-ManifestVersion: 2
-+Bundle-Name: %pluginName
-+Bundle-Localization: plugin
-+Bundle-Version: 2.4.0.v200803190541
-+Bundle-Vendor: %providerName
-+Export-Package: org.apache.commons.lang;version="2.4.0",org.apache.com
-+ mons.lang.builder;version="2.4.0",org.apache.commons.lang.enum;versio
-+ n="2.4.0",org.apache.commons.lang.enums;version="2.4.0",org.apache.co
-+ mmons.lang.exception;version="2.4.0",org.apache.commons.lang.math;ver
-+ sion="2.4.0",org.apache.commons.lang.mutable;version="2.4.0",org.apac
-+ he.commons.lang.text;version="2.4.0",org.apache.commons.lang.time;ver
-+ sion="2.4.0"
diff --git a/jakarta-commons-lang-encoding.patch b/jakarta-commons-lang-encoding.patch
deleted file mode 100644
index cf85504..0000000
--- a/jakarta-commons-lang-encoding.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- build.xml.orig 2010-02-03 14:58:15.298861996 -0700
-+++ build.xml 2010-02-03 14:59:24.983618922 -0700
-@@ -62,7 +62,7 @@
-
-
-
--
-+
-
-
-
-@@ -70,7 +70,7 @@
-
-
-
--
-+
-
-
-
-@@ -89,7 +89,7 @@
-
-
-
--
-+
-
-
-
diff --git a/jakarta-commons-lang-notarget.patch b/jakarta-commons-lang-notarget.patch
deleted file mode 100644
index 644f7ff..0000000
--- a/jakarta-commons-lang-notarget.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- build.xml.orig 2008-01-22 22:02:04.000000000 -0500
-+++ build.xml 2008-01-22 22:02:26.000000000 -0500
-@@ -62,7 +62,7 @@
-
-
-
--
-+
-
-
-
-@@ -70,7 +70,7 @@
-
-
-
--
-+
-
-
-
diff --git a/jakarta-commons-lang.spec b/jakarta-commons-lang.spec
deleted file mode 100644
index bf81330..0000000
--- a/jakarta-commons-lang.spec
+++ /dev/null
@@ -1,352 +0,0 @@
-# Copyright (c) 2000-2007, JPackage Project
-# 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 gcj_support 1
-
-# If you don't want to build with maven, and use straight ant instead,
-# give rpmbuild option '--without maven'
-
-%define with_maven 0
-
-%define base_name lang
-%define short_name commons-%{base_name}
-
-Name: jakarta-%{short_name}
-Version: 2.4
-Release: 1%{?dist}
-Epoch: 0
-Summary: Provides a host of helper utilities for the java.lang API
-License: ASL 2.0
-Group: Development/Libraries
-URL: http://commons.apache.org/lang/
-Source0: http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
-Source1: pom-maven2jpp-depcat.xsl
-Source2: pom-maven2jpp-newdepmap.xsl
-Source3: pom-maven2jpp-mapdeps.xsl
-Source4: %{short_name}-%{version}-jpp-depmap.xml
-Patch0: %{name}-notarget.patch
-Patch1: %{name}-addosgimanifest.patch
-Patch2: %{name}-encoding.patch
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%if ! %{gcj_support}
-BuildArch: noarch
-%endif
-BuildRequires: jpackage-utils >= 0:1.7.2
-BuildRequires: ant
-BuildRequires: ant-junit
-BuildRequires: %{__perl}
-%if %{with_maven}
-BuildRequires: maven >= 0:1.1
-BuildRequires: saxon
-BuildRequires: saxon-scripts
-BuildRequires: maven-plugin-changelog
-BuildRequires: maven-plugin-changes
-BuildRequires: maven-plugin-xdoc
-%endif
-Requires(post): jpackage-utils >= 0:1.7.2
-Requires(postun): jpackage-utils >= 0:1.7.2
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
-%description
-The standard Java libraries fail to provide enough methods for
-manipulation of its core classes. The Commons Lang Component provides
-these extra methods.
-The Commons Lang Component provides a host of helper utilities for the
-java.lang API, notably String manipulation methods, basic numerical
-methods, object reflection, creation and serialization, and System
-properties. Additionally it contains an inheritable enum type, an
-exception structure that supports multiple types of nested-Exceptions
-and a series of utilities dedicated to help with building methods, such
-as hashCode, toString and equals.
-
-%package javadoc
-Summary: Javadoc for %{name}
-Group: Documentation
-BuildRequires: java-javadoc
-
-%description javadoc
-Javadoc for %{name}.
-
-%if %{with_maven}
-%package manual
-Summary: Documents for %{name}
-Group: Documentation
-
-%description manual
-%{summary}.
-%endif
-
-%prep
-%setup -q -n %{short_name}-%{version}-src
-%{__perl} -pi -e 's/\r//g' *.txt
-
-%patch0
-%patch1
-%patch2
-
-%build
-%if %{with_maven}
-if [ ! -f %{SOURCE4} ]; then
-export DEPCAT=$(pwd)/%{short_name}-%{version}-depcat.new.xml
-echo '' > $DEPCAT
-echo '' >> $DEPCAT
-for p in $(find . -name project.xml); do
- pushd $(dirname $p)
- /usr/bin/saxon project.xml %{SOURCE1} >> $DEPCAT
- popd
-done
-echo >> $DEPCAT
-echo '' >> $DEPCAT
-/usr/bin/saxon $DEPCAT %{SOURCE2} > %{short_name}-%{version}-depmap.new.xml
-fi
-
-for p in $(find . -name project.xml); do
- pushd $(dirname $p)
- cp project.xml project.xml.orig
- /usr/bin/saxon -o project.xml project.xml.orig %{SOURCE3} map=%{SOURCE4}
- popd
-done
-
-maven \
- -Dmaven.javadoc.source=1.4 \
- -Dmaven.repo.remote=file:/usr/share/maven/repository \
- -Dmaven.home.local=$(pwd)/.maven \
- jar javadoc xdoc:transform
-%else
-
-# FIXME: There are failures with gcj. Ignore them for now.
-%if %{gcj_support}
- %ant \
- -Djunit.jar=$(find-jar junit) \
- -Dfinal.name=%{short_name} \
- -Djdk.javadoc=%{_javadocdir}/java \
- -Dtest.failonerror=false \
- jar javadoc
-%else
- %ant \
- -Djunit.jar=$(find-jar junit) \
- -Dfinal.name=%{short_name} \
- -Djdk.javadoc=%{_javadocdir}/java \
- jar javadoc
-%endif
-# test dist
-%endif
-
-%install
-rm -rf $RPM_BUILD_ROOT
-# jars
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-%if %{with_maven}
-cp -p target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-%else
-cp -p dist/%{short_name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-%endif
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|jakarta-||g"`; done)
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
-
-%if %{with_maven}
-%add_to_maven_depmap %{base_name} %{base_name} %{version} JPP %{name}
-
-# pom
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
-install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
-%endif
-
-# javadoc
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-%if %{with_maven}
-cp -pr target/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-%else
-cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-%endif
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-## manual
-install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-cp -p *.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-%if %{with_maven}
-rm -rf target/docs/apidocs
-install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/site
-cp -pr target/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/site
-%endif
-
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%if %{with_maven}
-%post
-%update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%postun
-%update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-%endif
-
-%files
-%defattr(-,root,root,-)
-%dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/*.txt
-#%doc PROPOSAL.html LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
-%{_javadir}/*
-%if %{with_maven}
-%{_datadir}/maven2/poms/*
-%{_mavendepmapfragdir}
-%endif
-%if %{gcj_support}
-%{_libdir}/gcj/%{name}
-%endif
-
-%files javadoc
-%defattr(-,root,root,-)
-%doc %{_javadocdir}/%{name}-%{version}
-%doc %{_javadocdir}/%{name}
-
-%if %{with_maven}
-%files manual
-%defattr(-,root,root,-)
-%doc %{_docdir}/%{name}-%{version}/site
-%endif
-
-%changelog
-* Wed Feb 3 2010 Jerry James - 0:2.4-1
-- Update to version 2.4.
-- Install the upstream POM.
-- Add -encoding patch.
-
-* Fri Jan 08 2010 Andrew Overholt 0:2.3-4.4
-- Update Source0 URL.
-- Fix Group tags.
-- Add more stuff to %%{with_maven} sections.
-- Fix %%files attrs.
-
-* Fri Jul 24 2009 Fedora Release Engineering - 0:2.3-4.3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Wed Feb 25 2009 Fedora Release Engineering - 0:2.3-3.3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Thu Jul 24 2008 Andrew Overholt 0:2.3-2.3
-- Add OSGi MANIFEST.MF
-
-* Wed Jul 9 2008 Tom "spot" Callaway - 0:2.3-2.2
-- drop repotag
-- fix license tag
-
-* Tue Feb 19 2008 Fedora Release Engineering - 0:2.3-2jpp.1
-- Autorebuild for GCC 4.3
-
-* Tue Jan 22 2008 Permaine Cheung - 0:2.3-1jpp.1
-- Merge with upstream
-
-* Mon Aug 13 2007 Ralph Apel - 0:2.3-1jpp
-- Upgrade to 2.3
-- Build with maven by default
-- Add pom anf depmap frag
-- Make Vendor, Distribution based on macro
-
-* Thu Mar 29 2007 Permaine Cheung - 0:2.1-6jpp.1
-- Merge from upstream and rpmlint cleanup
-
-* Thu Aug 10 2006 Deepak Bhole - 0:2.1-5jpp.1
-- Added missing requirements.
-- Added missing postun section for javadoc.
-
-* Thu Aug 10 2006 Karsten Hopp - 0:2.1-4jpp_3fc
-- Requires(post): coreutils
-
-* Sat Jul 22 2006 Jakub Jelinek - 0:2.1-4jpp_2fc
-- Rebuilt
-
-* Wed Jul 19 2006 Deepak Bhole - 0:2.1-4jpp_1fc
-- Remove name/release/version defines as applicable.
-
-* Mon Jul 17 2006 Deepak Bhole - 0:2.1-3jpp
-- Added conditional native compiling.
-- By jkeating: Patched to not use taget= in build.xml
-
-* Mon Feb 27 2006 Fernando Nasser - 0:2.1-2jpp
-- First JPP 1.7 build
-
-* Sat Aug 20 2005 Ville Skyttä - 0:2.1-1jpp
-- 2.1, javadoc crosslink patch applied upstream.
-- Use the %%ant macro.
-
-* Sun Aug 23 2004 Randy Watler - 0:2.0-2jpp
-- Rebuild with ant-1.6.2
-
-* Sun Oct 12 2003 Ville Skyttä - 0:2.0-1jpp
-- Update to 2.0.
-- Add non-versioned javadocs dir symlink.
-- Crosslink with local J2SE javadocs.
-- Convert specfile to UTF-8.
-
-* Fri Apr 4 2003 Ville Skyttä - 0:1.0.1-3jpp
-- Rebuild for JPackage 1.5.
-
-* Tue Mar 4 2003 Ville Skyttä - 1.0.1-2jpp
-- Repackage to recover from earlier accidental overwrite with older version.
-- No macros in URL and SourceX tags.
-- Remove spurious api/ from installed javadoc path.
-- Spec file cleanups.
-- (from 1.0.1-1jpp) Update to 1.0.1.
-- (from 1.0.1-1jpp) Run JUnit tests when building.
-
-* Thu Feb 27 2003 Henri Gomez 1.0-3jpp
-- fix ASF license and add packager tag
-
-* Mon Oct 07 2002 Henri Gomez 1.0-2jpp
-- missed to include changelog
-
-* Mon Oct 07 2002 Henri Gomez 1.0-1jpp
-- release 1.0
-
-* Tue Aug 20 2002 Henri Gomez 1.0.b1.1-1jpp
-- fist jpp release
diff --git a/pom-maven2jpp-depcat.xsl b/pom-maven2jpp-depcat.xsl
deleted file mode 100644
index 92834cc..0000000
--- a/pom-maven2jpp-depcat.xsl
+++ /dev/null
@@ -1,109 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-ERROR
-
-
-
-
-
-
-
-
-
- JPP
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-ERROR
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-ERROR
-
-
-
-
-
- .jar
- .
-
-
- .jar
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/pom-maven2jpp-mapdeps.xsl b/pom-maven2jpp-mapdeps.xsl
deleted file mode 100644
index 1b0f7b6..0000000
--- a/pom-maven2jpp-mapdeps.xsl
+++ /dev/null
@@ -1,78 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/pom-maven2jpp-newdepmap.xsl b/pom-maven2jpp-newdepmap.xsl
deleted file mode 100644
index 3b8dbfa..0000000
--- a/pom-maven2jpp-newdepmap.xsl
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sources b/sources
deleted file mode 100644
index 4e23560..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-625ff5f2f968dd908bca43c9469d6e6b commons-lang-2.4-src.tar.gz