From d6b19f840253a6937a1c83a35dc2a5334ebff8bd Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jun 04 2015 07:10:38 +0000
Subject: import thermostat1-netty-3.6.3-70.4.el7


---

diff --git a/SPECS/netty.spec b/SPECS/netty.spec
index e7e5977..4ec5e3a 100644
--- a/SPECS/netty.spec
+++ b/SPECS/netty.spec
@@ -1,6 +1,9 @@
 %{?scl:%scl_package netty}
 %{!?scl:%global pkg_name %{name}}
 
+# Use java common's requires/provides generator
+%{?java_common_find_provides_and_requires}
+
 # Exclude generation of osgi() style provides, since they are not
 # SCL-namespaced and may conflict with base RHEL packages.
 # See: https://bugzilla.redhat.com/show_bug.cgi?id=1045449
@@ -12,7 +15,7 @@ Version:        3.6.3
 # 60.X where X is an increasing int. 60 for rhel-6. We use
 # 70.X for rhel-7. For some reason we cannot rely on the
 # dist tag.
-Release:        70.1%{?dist}
+Release:        70.4%{?dist}
 Summary:        An asynchronous event-driven network application framework and tools for Java
 
 Group:          Development/Libraries
@@ -24,24 +27,28 @@ Patch1:         %{pkg_name}-fix-marshaller-logger.patch
 
 BuildArch:      noarch
 
-BuildRequires:  maven-local
-BuildRequires:  maven-antrun-plugin
-BuildRequires:  maven-assembly-plugin
-BuildRequires:  maven-compiler-plugin
-BuildRequires:  maven-enforcer-plugin
-BuildRequires:  maven-javadoc-plugin
-BuildRequires:  maven-plugin-bundle
-BuildRequires:  maven-resources-plugin
-BuildRequires:  maven-source-plugin
-BuildRequires:  maven-surefire-plugin
-BuildRequires:  ant-contrib
-
-BuildRequires:  felix-osgi-compendium
-BuildRequires:  felix-osgi-core
+BuildRequires:  %{?scl_prefix_java_common}maven-local
+BuildRequires:  %{?scl_prefix_maven}maven-antrun-plugin
+# maven-antrun-plugin has ant-contrib as dependency, but fails
+# to have this BR for it. We work around it by requiring it
+# manually.
+BuildRequires:  %{?scl_prefix_maven}ant-contrib
+BuildRequires:  %{?scl_prefix_maven}maven-assembly-plugin
+BuildRequires:  %{?scl_prefix_maven}maven-compiler-plugin
+BuildRequires:  %{?scl_prefix_maven}maven-enforcer-plugin
+BuildRequires:  %{?scl_prefix_maven}maven-javadoc-plugin
+BuildRequires:  %{?scl_prefix_maven}maven-plugin-bundle
+BuildRequires:  %{?scl_prefix_maven}maven-resources-plugin
+BuildRequires:  %{?scl_prefix_maven}maven-source-plugin
+BuildRequires:  %{?scl_prefix_maven}maven-surefire-plugin
+BuildRequires:  %{?scl_prefix_java_common}ant
+
+BuildRequires:  %{?scl_prefix_maven}felix-osgi-compendium
+BuildRequires:  %{?scl_prefix_maven}felix-osgi-core
 BuildRequires:  %{?scl_prefix}protobuf-java
-BuildRequires:  slf4j
-BuildRequires:  sonatype-oss-parent
-BuildRequires:  tomcat-servlet-3.0-api
+BuildRequires:  %{?scl_prefix_java_common}slf4j
+BuildRequires:  %{?scl_prefix_maven}sonatype-oss-parent
+BuildRequires:  %{?scl_prefix_java_common}tomcat-servlet-3.0-api
 %{?scl:Requires: %scl_runtime}
 
 %description
@@ -68,7 +75,7 @@ Group:     Documentation
 %{summary}.
 
 %prep
-%{?scl:scl enable %{scl} - << "EOF"}
+%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"}
 %setup -q -n %{pkg_name}-%{version}.Final
 # just to be sure, but not used anyway
 rm -rf jar doc license
@@ -99,7 +106,7 @@ sed -i s/org.jboss.netty.util.internal.jzlib/com.jcraft.jzlib/ \
 %{?scl:EOF}
 
 %build
-%{?scl:scl enable %{scl} - << "EOF"}
+%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"}
 %mvn_alias : org.jboss.netty:
 %mvn_file  : %{pkg_name}
 # skipping tests because we don't have easymockclassextension
@@ -107,7 +114,7 @@ sed -i s/org.jboss.netty.util.internal.jzlib/com.jcraft.jzlib/ \
 %{?scl:EOF}
 
 %install
-%{?scl:scl enable %{scl} - << "EOF"}
+%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"}
 %mvn_install
 %{?scl:EOF}
 
@@ -118,6 +125,17 @@ sed -i s/org.jboss.netty.util.internal.jzlib/com.jcraft.jzlib/ \
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Mon Jan 19 2015 Severin Gehwolf <sgehwolf@redhat.com> - 3.6.3-70.4
+- Manually require maven30-ant-contrib since maven-antrun-plugin
+  needs it.
+
+* Mon Jan 19 2015 Severin Gehwolf <sgehwolf@redhat.com> - 3.6.3-70.3
+- Use java common's BRs since they are no longer in maven's collection.
+
+* Fri Dec 19 2014 Severin Gehwolf <sgehwolf@redhat.com> - 3.6.3-70.2
+- Build using maven collection.
+- Use java common's provides/requires generators.
+
 * Mon Jun 23 2014 Severin Gehwolf <sgehwolf@redhat.com> - 3.6.3-70.1
 - Add requires for thermostat1-runtime package.