diff --git a/MANIFEST.MF b/MANIFEST.MF
deleted file mode 100644
index 44edd31..0000000
--- a/MANIFEST.MF
+++ /dev/null
@@ -1,31 +0,0 @@
-Manifest-Version: 1.0
-Archiver-Version: Plexus Archiver
-Created-By: 1.6.0_20 (Sun Microsystems Inc.)
-Built-By: mockbuild
-Build-Jdk: 1.6.0_20
-Implementation-Title: Commons Codec
-Implementation-Vendor: Apache Software Foundation
-Implementation-Vendor-Id: org.apache
-Implementation-Version: 1.4
-Specification-Title: Commons Codec
-Specification-Vendor: Apache Software Foundation
-Specification-Version: 1.4
-X-Compile-Source-JDK: 1.4
-X-Compile-Target-JDK: 1.4
-Export-Package: org.apache.commons.codec;version="1.4",org.apache.comm
- ons.codec.net;version="1.4",org.apache.commons.codec.language;version
- ="1.4",org.apache.commons.codec.digest;version="1.4",org.apache.commo
- ns.codec.binary;version="1.4"
-Tool: Bnd-0.0.363
-Bundle-Name: Commons Codec
-Bundle-Vendor: Apache Software Foundation
-Bundle-Version: 1.4
-Bnd-LastModified: 1297297922505
-Bundle-ManifestVersion: 2
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Bundle-Description: The codec package contains simple encoder and deco
- ders for various formats such as Base64 and Hexadecimal. In addi
- tion to these widely used encoders and decoders, the codec packag
- e also maintains a collection of phonetic encoding utilities.
-Bundle-SymbolicName: org.apache.commons.codec
-Bundle-DocURL: http://commons.apache.org/codec/
diff --git a/apache-commons-codec-build.xml b/apache-commons-codec-build.xml
new file mode 100644
index 0000000..1dc0d96
--- /dev/null
+++ b/apache-commons-codec-build.xml
@@ -0,0 +1,272 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ =================================== WARNING ===================================
+ JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.
+ ===============================================================================
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/apache-commons-codec.spec b/apache-commons-codec.spec
index 826b759..9cac11c 100644
--- a/apache-commons-codec.spec
+++ b/apache-commons-codec.spec
@@ -19,28 +19,27 @@
%define base_name codec
%define short_name commons-%{base_name}
+%bcond_with tests
Name: apache-commons-codec
-Version: 1.10
+Version: 1.11
Release: 0
Summary: Apache Commons Codec Package
License: Apache-2.0
Group: Development/Libraries/Java
URL: http://commons.apache.org/codec/
-Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
-Source4: MANIFEST.MF
+Source0: http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
+Source1: %{name}-build.xml
+# Data in DoubleMetaphoneTest.java originally has an inadmissible license.
+# The author gives MIT in e-mail communication.
+Source100: aspell-mail.txt
# PATCH-FIX-OPENSUSE Avoid spurious timeout in BeiderMorse tests
Patch0: timeout.patch
-BuildRequires: ant >= 1.7
-BuildRequires: ant-junit >= 1.7
+BuildRequires: ant
BuildRequires: apache-commons-parent
+BuildRequires: dos2unix
BuildRequires: fdupes
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local
-BuildRequires: javapackages-tools
-# FIXME: mozilla-nss is necessary in order to use crypto, which is tested via junit tests
-# this should be a dependency of openjdk itself
-BuildRequires: junit
-BuildRequires: mozilla-nss
Requires: apache-commons-parent
Requires: java >= 1.8
Provides: jakarta-%{short_name} = %{version}
@@ -48,6 +47,13 @@ Obsoletes: jakarta-%{short_name} < %{version}
Provides: %{short_name} = %{version}
Obsoletes: %{short_name} < %{version}
BuildArch: noarch
+%if %{with tests}
+BuildRequires: ant-junit >= 1.7
+BuildRequires: apache-commons-lang3
+BuildRequires: hamcrest-core
+BuildRequires: junit
+BuildRequires: mozilla-nss
+%endif
%description
Commons Codec is an attempt to provide definitive implementations of
@@ -55,8 +61,7 @@ commonly used encoders and decoders.
%package javadoc
Summary: Javadoc for %{name}
-Group: Development/Libraries/Java
-Requires: java-javadoc
+Group: Documentation/HTML
Provides: jakarta-%{short_name}-javadoc = %{version}
Obsoletes: jakarta-%{short_name}-javadoc < %{version}
Provides: %{short_name}-javadoc = %{version}
@@ -67,59 +72,51 @@ Javadoc for %{name}.
%prep
%setup -q -n %{short_name}-%{version}-src
+cp %{SOURCE1} build.xml
+cp %{SOURCE100} aspell-mail.txt
%patch0 -p1
#fixes eof encoding
-sed -i 's/\r//' RELEASE-NOTES*.txt LICENSE.txt NOTICE.txt
+dos2unix RELEASE-NOTES*.txt LICENSE.txt NOTICE.txt
%build
-export CLASSPATH=$(build-classpath junit)
-ant -Dbuild.sysclasspath=first \
- -Dant.build.javac.source=8 -Dant.build.javac.target=8 \
- -Dcompile.source=8 -Dcompile.target=8 \
- -Dconf.home=src/conf \
- -Dbuild.home=build \
- -Dsource.home=src/main/java \
- -Dtest.home=src/test/java \
- -Ddist.home=dist \
- -Dcomponent.title=%{short_name} \
- -Dcomponent.version=%{version} \
- -Dfinal.name=%{name}-%{version} \
- -Dextension.name=%{short_name} \
+mkdir -p lib
+%if %{with tests}
+build-jar-repository -s lib junit4 hamcrest/core commons-lang3
+%endif
+ant \
+%if %{without tests}
+ -Dtest.skip=true \
+%endif
+ -Dcompiler.source=1.8 -Dcompiler.target=1.8 \
jar javadoc
%install
# jars
-mkdir -p %{buildroot}%{_javadir}
-jar umf %{SOURCE4} dist/%{name}-%{version}.jar
-cp -p dist/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{short_name}-%{version}.jar
-ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{short_name}.jar
-ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/jakarta-%{short_name}-%{version}.jar
-ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/jakarta-%{short_name}.jar
-
+install -dm 0755 %{buildroot}%{_javadir}
+install -pm 0644 target/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{short_name}.jar
+ln -sf %{short_name}.jar %{buildroot}%{_javadir}/%{name}.jar
+# poms
# Install pom file
install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -p -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
-%add_maven_depmap JPP-%{short_name}.pom %{short_name}.jar -a "%{short_name}:%{short_name}"
-
+install -p -m 644 pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}.pom
+%add_maven_depmap %{short_name}.pom %{short_name}.jar -a "%{short_name}:%{short_name}"
# javadoc
-mkdir -p %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}-%{version}
-%fdupes -s %{buildroot}%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/jakarta-%{short_name}-%{version}
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/jakarta-%{short_name}
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
+install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
+%fdupes -s %{buildroot}%{_javadocdir}
+
+%pre javadoc
+if [ -L %{_javadocdir}/%{name} ]; then
+ rm -f %{_javadocdir}/%{name};
+fi
%files -f .mfiles
-%defattr(0644,root,root,0755)
%license LICENSE.txt
%doc RELEASE-NOTES.txt
-%{_javadir}/*.jar
+%{_javadir}/%{name}.jar
%files javadoc
-%defattr(0644,root,root,0755)
-%{_javadocdir}/*
+%{_javadocdir}/%{name}
%changelog
diff --git a/aspell-mail.txt b/aspell-mail.txt
new file mode 100644
index 0000000..aafca4c
--- /dev/null
+++ b/aspell-mail.txt
@@ -0,0 +1,85 @@
+Return-Path: kevina@misc.kevina.org
+Received: from zmta06.collab.prod.int.phx2.redhat.com (LHLO
+ zmta06.collab.prod.int.phx2.redhat.com) (10.5.81.13) by
+ zmail15.collab.prod.int.phx2.redhat.com with LMTP; Tue, 21 Aug 2012
+ 08:38:00 -0400 (EDT)
+Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25])
+ by zmta06.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id D74A71609E2
+ for ; Tue, 21 Aug 2012 08:37:59 -0400 (EDT)
+Received: from mx1.redhat.com (ext-mx15.extmail.prod.ext.phx2.redhat.com [10.5.110.20])
+ by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q7LCbx5d031748
+ for ; Tue, 21 Aug 2012 08:37:59 -0400
+Received: from misc.kevina.org (misc.kevina.org [96.126.107.114])
+ by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q7LCbwlx024966
+ for ; Tue, 21 Aug 2012 08:37:58 -0400
+Received: by misc.kevina.org (Postfix, from userid 1000)
+ id 576F124ED81; Tue, 21 Aug 2012 08:37:57 -0400 (EDT)
+Date: Tue, 21 Aug 2012 14:37:57 +0200 (CEST)
+From: Kevin Atkinson
+X-X-Sender: kevina@misc.kevina.org
+To: Tomas Radej
+Subject: Re: Aspell results licensing
+In-Reply-To: <20120821095056.266cfca47594ad0e03f332f8@redhat.com>
+Message-ID:
+References: <20120816110627.3b433e1e1a2cfa2a3c29f8e2@redhat.com> <20120821095056.266cfca47594ad0e03f332f8@redhat.com>
+User-Agent: Alpine 2.02 (DEB 1266 2009-07-14)
+MIME-Version: 1.0
+Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
+X-RedHat-Spam-Score: -2.111 (BAYES_00,RP_MATCHES_RCVD)
+X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25
+X-Scanned-By: MIMEDefang 2.68 on 10.5.110.20
+
+
+How's this:
+
+ Copyright 2007 by Kevin Atkinson
+
+ Permission to use, copy, modify, distribute and sell the file
+ batch0.tab (available at http://aspell.net/test/cur/) is hereby
+ granted without fee, provided that the above copyright notice appears
+ in all copies and that both that copyright notice and this permission
+ notice appear in supporting documentation. Kevin Atkinson makes no
+ representations about the suitability of this array for any
+ purpose. It is provided "as is" without express or implied warranty.
+
+2007 since that is the year I belive I last modified the data. Would 2012 be
+better?
+
+On Tue, 21 Aug 2012, Tomas Radej wrote:
+
+> Hi,
+>
+> On Thu, 16 Aug 2012 20:12:27 +0200 (CEST)
+> Kevin Atkinson wrote:
+>
+>> If you are using the results than there shouldn't be a problem regardless of
+>> what copyright I use.
+>
+> It's necessary to say that I'm not a maintainer in that project, I
+> simply package it into Fedora.
+>
+>> If the original data file will some how be distributed
+>> please let me know what your requirements are and I will see about
+>> explicitly
+>> assigning a compatible copyright.
+>
+> While checking the package, I found out that some of the data are
+> actually embedded in the code [1], so yes, your data is actually being
+> distributed. If I may, I would suggest you use either the MIT/X11
+> licence or the 2 or 3 clause BSD licence, as both of these can be
+> combined with both the ASL 2.0 licence and GPL v2+ [2].
+>
+> Thank you, TR
+>
+> [1]
+> http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/language/DoubleMetaphoneTest.java?view=markup
+> ,
+> line 49 onwards
+>
+> [2] http://fedoraproject.org/wiki/Licensing:Main#Good_Licenses
+>
+> --
+> Tomas Radej
+>
+>
+
diff --git a/commons-codec-1.10-src.tar.gz b/commons-codec-1.10-src.tar.gz
deleted file mode 100644
index 19e7ef3..0000000
--- a/commons-codec-1.10-src.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c5e48eacc96b16478ff86c752c113ad6d1eb2991cf895ced431d68e2c17838f1
-size 322874
diff --git a/commons-codec-1.11-src.tar.gz b/commons-codec-1.11-src.tar.gz
new file mode 100644
index 0000000..65650f5
--- /dev/null
+++ b/commons-codec-1.11-src.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b32302f8369677b4fb1dd41b5815577e0f6c1996a22a9ead9e824c1dcc64b817
+size 369538