[jakarta-commons-httpclient] Fix character encoding

[Andy Grimm]

commit 3d888b6dd5ebdb9d6053527dd0906a139fb1be5f
Author: Andy Grimm <agrimm at gmail.com>
Date:   Mon Jan 23 10:07:18 2012 -0500

    Fix character encoding

 jakarta-commons-httpclient-encoding.patch |   34 +++++++++++++++++++++++++++++
 jakarta-commons-httpclient.spec           |   11 +++++++-
 2 files changed, 43 insertions(+), 2 deletions(-)
---
diff --git a/jakarta-commons-httpclient-encoding.patch b/jakarta-commons-httpclient-encoding.patch
new file mode 100644
index 0000000..33fbdf2
--- /dev/null
+++ b/jakarta-commons-httpclient-encoding.patch
@@ -0,0 +1,34 @@
+--- build.xml	2007-08-18 05:02:14.000000000 -0400
++++ build.xml	2012-01-23 09:52:50.405796336 -0500
+@@ -179,6 +179,7 @@
+           description="Compile shareable components">
+     <javac srcdir      ="${source.home}/java"
+            destdir     ="${build.home}/classes"
++           encoding    ="ISO-8859-1"
+            debug       ="${compile.debug}"
+            deprecation ="${compile.deprecation}"
+            optimize    ="${compile.optimize}">
+@@ -186,6 +187,7 @@
+     </javac>
+     <javac srcdir      ="${source.home}/examples"
+            destdir     ="${build.home}/examples"
++           encoding    ="ISO-8859-1"
+            debug       ="${compile.debug}"
+            deprecation ="${compile.deprecation}"
+            optimize    ="${compile.optimize}">
+@@ -197,6 +199,7 @@
+           description="Compile unit test cases">
+     <javac srcdir      ="${test.home}"
+            destdir     ="${build.home}/tests"
++           encoding    ="ISO-8859-1"
+            debug       ="${compile.debug}"
+            deprecation ="${compile.deprecation}"
+            optimize    ="${compile.optimize}">
+@@ -244,6 +244,7 @@
+     <mkdir dir="${dist.home}/docs/api"/>
+     <javadoc sourcepath   ="${source.home}/java"
+              destdir      ="${dist.home}/docs/api"
++             encoding     ="ISO-8859-1"
+              packagenames ="org.apache.commons.*"
+              author       ="true"
+              protected    ="true"
diff --git a/jakarta-commons-httpclient.spec b/jakarta-commons-httpclient.spec
index 99c6289..a14e8de 100644
--- a/jakarta-commons-httpclient.spec
+++ b/jakarta-commons-httpclient.spec
@@ -32,7 +32,7 @@
 
 Name:           jakarta-commons-httpclient
 Version:        3.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Epoch:          1
 Summary: Jakarta Commons HTTPClient implements the client side of HTTP standards
 License:        ASL 2.0
@@ -40,6 +40,7 @@ Source0:        http://archive.apache.org/dist/httpcomponents/commons-httpclient
 Patch0:         %{name}-disablecryptotests.patch
 # Add OSGi MANIFEST.MF bits
 Patch1:         %{name}-addosgimanifest.patch
+Patch2:         %{name}-encoding.patch
 URL:            http://jakarta.apache.org/commons/httpclient/
 Group:          Development/Libraries
 BuildArch:      noarch
@@ -115,6 +116,8 @@ pushd src/conf
 %patch1
 popd
 
+%patch2
+
 # Use javax classes, not com.sun ones
 # assume no filename contains spaces
 pushd src
@@ -130,12 +133,13 @@ popd
 %{__sed} -i 's/\r//' LICENSE.txt
 
 %build
-export CLASSPATH=%(build-classpath commons-codec commons-logging junit)
 ant \
   -Dbuild.sysclasspath=first \
   -Djavadoc.j2sdk.link=%{_javadocdir}/java \
   -Djavadoc.logging.link=%{_javadocdir}/jakarta-commons-logging \
   -Dtest.failonerror=false \
+  -Dlib.dir=%{_javadir} \
+  -Djavac.encoding=UTF-8 \
   dist test
 
 
@@ -180,6 +184,9 @@ ln -s %{_javadocdir}/%{name}-%{version} dist/docs/apidocs
 
 
 %changelog
+* Sun Jan 22 2012 Andy Grimm <agrimm at gmail.com> - 1:3.1-7
+- Fix character encoding
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild