[resteasy/f20] Support for Netty 4 in F21+

[Marek Goldmann]

commit 1b7cd4a9ea0bfa10a1d3f69cdd0a31212c6e1790
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date:   Tue Jan 14 10:43:17 2014 +0100

    Support for Netty 4 in F21+

 resteasy.spec |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/resteasy.spec b/resteasy.spec
index a2ec652..3ba975d 100644
--- a/resteasy.spec
+++ b/resteasy.spec
@@ -3,7 +3,7 @@
 
 Name:       resteasy
 Version:    3.0.6
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    Framework for RESTful Web services and Java applications
 License:    ASL 2.0 and CDDL
 URL:        http://www.jboss.org/resteasy
@@ -117,8 +117,13 @@ This package contains the API documentation for %{name}.
 # HV 4.3
 %pom_disable_module resteasy-hibernatevalidator-provider jaxrs/providers/pom.xml
 
-# Netty 4
+%if 0%{?fedora} > 20
+# Leave Netty 4, disable Netty 3
+%pom_disable_module resteasy-netty jaxrs/server-adapters/pom.xml
+%else
+# Leave Netty 3, disable Netty 4
 %pom_disable_module resteasy-netty4 jaxrs/server-adapters/pom.xml
+%endif
 
 # Replace 2.5 servlet with the jboss-servlet-2.5-api provides
 for m in jaxrs/tjws; do
@@ -171,6 +176,9 @@ done
 %doc jaxrs/License.html
 
 %changelog
+* Tue Jan 14 2014 Marek Goldmann <mgoldman at redhat.com> - 3.0.6-2
+- Support for Netty 4 in Rawhide
+
 * Fri Jan 10 2014 Marek Goldmann <mgoldman at redhat.com> - 3.0.6-1
 - Upstream release 3.0.6.Final