From c7866e02120af820ffc228683011bf65c5d9ba57 Mon Sep 17 00:00:00 2001
From: Swapnil Kulkarni <coolsvap@gmail.com>
Date: Wed, 11 Mar 2015 14:54:42 +0000
Subject: [PATCH] Added groovy18 dependency

---
 clog                                                  |  2 --
 ...ty-3.6.6-Final.patch => hadoop-netty-3-Final.patch |  4 ++--
 hadoop.spec                                           | 11 +++++++++--
 3 files changed, 11 insertions(+), 6 deletions(-)
 delete mode 100644 clog
 rename hadoop-netty-3.6.6-Final.patch => hadoop-netty-3-Final.patch (93%)

diff --git a/clog b/clog
deleted file mode 100644
index 6176445..0000000
--- a/clog
+++ /dev/null
@@ -1,2 +0,0 @@
-Added groovy18 dependency
-
diff --git a/hadoop-netty-3.6.6-Final.patch b/hadoop-netty-3-Final.patch
similarity index 93%
rename from hadoop-netty-3.6.6-Final.patch
rename to hadoop-netty-3-Final.patch
index b5e9bfa..7980e21 100644
--- a/hadoop-netty-3.6.6-Final.patch
+++ b/hadoop-netty-3-Final.patch
@@ -12,7 +12,7 @@ index 9b267fe..0ce916d 100644
          <groupId>org.jboss.netty</groupId>
          <artifactId>netty</artifactId>
 -        <version>3.2.4.Final</version>
-+        <version>3.6.6.Final</version>
++        <version>3.9.3.Final</version>
        </dependency>
      </dependencies>
    </dependencyManagement>
@@ -25,7 +25,7 @@ index b315e2b..a9da3aa 100644
          <groupId>io.netty</groupId>
          <artifactId>netty</artifactId>
 -        <version>3.6.2.Final</version>
-+        <version>3.6.6.Final</version>
++        <version>3.9.3.Final</version>
        </dependency>
  
        <dependency>
diff --git a/hadoop.spec b/hadoop.spec
index 262f127..b89e3ce 100644
--- a/hadoop.spec
+++ b/hadoop.spec
@@ -23,7 +23,7 @@
 
 Name:   hadoop
 Version: 2.4.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: A software platform for processing vast amounts of data
 # The BSD license file is missing
 # https://issues.apache.org/jira/browse/HADOOP-9849
@@ -60,7 +60,7 @@ Patch5: %{name}-dlopen-libjvm.patch
 # Update to Guava 17.0
 Patch7: %{name}-guava.patch
 # Update to Netty 3.6.6-Final
-Patch8: %{name}-netty-3.6.6-Final.patch
+Patch8: %{name}-netty-3-Final.patch
 # Remove problematic issues with tools.jar
 Patch9: %{name}-tools.jar.patch
 # Workaround for bz1012059
@@ -139,6 +139,7 @@ BuildRequires: jsr-311
 BuildRequires: junit
 BuildRequires: jzlib
 BuildRequires: leveldbjni
+BuildRequires:  groovy18
 %if 0%{?fedora} < 21
 BuildRequires: log4j
 %else
@@ -1124,6 +1125,12 @@ fi
 %attr(6050,root,yarn) %{_bindir}/container-executor
 
 %changelog
+* Wed Mar 11 2015 Swapnil Kulkarni <coolsvap@gmail.com> 2.4.1-7
+- Added groovy18 dependency
+
+* Sun Feb 15 2015 Peter Robinson <pbrobinson@fedoraproject.org> 2.4.1-7
+- Update netty3 patch for 3.9.3
+
 * Mon Oct 27 2014 Robert Rati <rrati@redhat> - 2.4.1-6
 - Changed commons-httpclient BR/R to jakarta-commons-httpclient
 - Changed commons-codec BR to apache-commons-codec