[avro] Support for new hadoop

[Marek Goldmann]

commit 447415484c12d9dc539bcf7d44ba126d40e62ca6
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date:   Thu Nov 28 12:34:36 2013 +0100

    Support for new hadoop

 Support-for-hadoop-2.2.0.patch |   25 +++++++++++++++++++++++++
 avro.spec                      |    7 ++++++-
 2 files changed, 31 insertions(+), 1 deletions(-)
---
diff --git a/Support-for-hadoop-2.2.0.patch b/Support-for-hadoop-2.2.0.patch
new file mode 100644
index 0000000..2be53a1
--- /dev/null
+++ b/Support-for-hadoop-2.2.0.patch
@@ -0,0 +1,25 @@
+From b41f86b31b29cd9e47e7cccbdeb8c95d3f513da9 Mon Sep 17 00:00:00 2001
+From: Marek Goldmann <marek.goldmann at gmail.com>
+Date: Thu, 28 Nov 2013 12:07:09 +0100
+Subject: [PATCH] Support for hadoop 2.2.0
+
+---
+ .../src/main/java/org/apache/avro/mapred/tether/TetheredProcess.java    | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lang/java/mapred/src/main/java/org/apache/avro/mapred/tether/TetheredProcess.java b/lang/java/mapred/src/main/java/org/apache/avro/mapred/tether/TetheredProcess.java
+index 40a1056..fac7589 100644
+--- a/lang/java/mapred/src/main/java/org/apache/avro/mapred/tether/TetheredProcess.java
++++ b/lang/java/mapred/src/main/java/org/apache/avro/mapred/tether/TetheredProcess.java
+@@ -154,7 +154,7 @@ class TetheredProcess  {
+     File stdout = TaskLog.getTaskLogFile(taskid, false, TaskLog.LogName.STDOUT);
+     File stderr = TaskLog.getTaskLogFile(taskid, false, TaskLog.LogName.STDERR);
+     long logLength = TaskLog.getTaskLogLength(job);
+-    command = TaskLog.captureOutAndError(command, stdout, stderr, logLength);
++    command = TaskLog.captureOutAndError(null, command, stdout, stderr, logLength, false);
+     stdout.getParentFile().mkdirs();
+     stderr.getParentFile().mkdirs();
+ 
+-- 
+1.8.4.2
+
diff --git a/avro.spec b/avro.spec
index f378c2e..72efc51 100644
--- a/avro.spec
+++ b/avro.spec
@@ -1,6 +1,6 @@
 Name:             avro
 Version:          1.7.5
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          Data serialization system
 Group:            Development/Libraries
 License:          ASL 2.0
@@ -11,6 +11,7 @@ URL:              http://avro.apache.org
 # tar cafJ avro-1.7.5-CLEAN.tar.xz avro-1.7.5
 Source0:          avro-%{version}-CLEAN.tar.xz
 Patch0:           avro-ipc-changes-for-jetty-upgrade.patch
+Patch1:           Support-for-hadoop-2.2.0.patch
 
 BuildArch:        noarch
 
@@ -100,6 +101,7 @@ This package contains the API documentation for %{name}.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 # junit, versions, and no tools or archetypes module
 sed -i "s|<hadoop2.version>2.0.1-alpha</hadoop2.version>|<hadoop2.version>2.0.5-alpha</hadoop2.version>|" lang/java/pom.xml
@@ -158,6 +160,9 @@ sed -i "s|<module>archetypes</module>||" lang/java/pom.xml
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Thu Nov 28 2013 Marek Goldmann <mgoldman at redhat.com> - 1.7.5-2
+- Support for new hadoop
+
 * Mon Oct 14 2013 Peter MacKinnon <pmackinn at redhat.com> - 1.7.5-1
 - Updated to 1.7.5
 - Add mapred (hadoop2), ipc, trevni, thrift, protobuf artifacts