From 50d79a7be109a17f0f725b7bea2292c4b54b5293 Mon Sep 17 00:00:00 2001
From: Christopher Tubbs <ctubbsii@apache.org>
Date: Fri, 16 Oct 2015 17:49:25 -0400
Subject: [PATCH] Rollback changes for netty 3.9.3 for f21 only

---
 zookeeper-3.4.6-ivy-build.patch | 3 +--
 zookeeper.spec                  | 5 ++++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/zookeeper-3.4.6-ivy-build.patch b/zookeeper-3.4.6-ivy-build.patch
index bc96443..2280067 100644
--- a/zookeeper-3.4.6-ivy-build.patch
+++ b/zookeeper-3.4.6-ivy-build.patch
@@ -37,8 +37,7 @@ index 561832a..93176d5 100644
 +    <dependency org="log4j" name="log4j" rev="1.2.17" transitive="false" conf="default"/>
 +    <dependency org="jline" name="jline" rev="1.0" transitive="false" conf="default"/>
  
--    <dependency org="io.netty" name="netty" conf="default" rev="3.7.0.Final">
-+    <dependency org="io.netty" name="netty" conf="default" rev="3.9.3.Final">
+     <dependency org="io.netty" name="netty" conf="default" rev="3.7.0.Final">
        <artifact name="netty" type="jar" conf="default"/>
      </dependency>
  
diff --git a/zookeeper.spec b/zookeeper.spec
index 21c6232..94032e1 100644
--- a/zookeeper.spec
+++ b/zookeeper.spec
@@ -5,7 +5,7 @@
 
 Name:          zookeeper
 Version:       3.4.6
-Release:       9%{?dist}
+Release:       10%{?dist}
 Summary:       A high-performance coordination service for distributed applications
 License:       ASL 2.0 and BSD
 URL:           http://zookeeper.apache.org/
@@ -300,6 +300,9 @@ getent passwd zookeeper >/dev/null || \
 %doc LICENSE.txt NOTICE.txt src/contrib/zkpython/README
 
 %changelog
+* Fri Oct 16 2015 Christopher Tubbs <ctubbsii-fedora@apache.org> - 3.4.6-10
+- Rollback changes for netty 3.9.3 for f21 only
+
 * Fri Oct 16 2015 Christopher Tubbs <ctubbsii-fedora@apache.org> - 3.4.6-9
 - Update zkEnv.sh CLASSPATH to fix bz#1261458