From b88834456296cff511c75d65a6e8a527ed6c29ad Mon Sep 17 00:00:00 2001
From: Jeff Johnston <jjohnstn@redhat.com>
Date: Jun 30 2020 18:42:54 +0000
Subject: add BR for Java 1.8.0 and set macro which can later be set to Java 11


---

diff --git a/netty.spec b/netty.spec
index 1f29cb8..85575c9 100644
--- a/netty.spec
+++ b/netty.spec
@@ -2,12 +2,13 @@
 %global debug_package %{nil}
 %global namedreltag .Final
 %global namedversion %{version}%{?namedreltag}
+%global java_version 1.8.0
 
-%bcond_with     jp_minimal
+%bcond_without  jp_minimal
 
 Name:           netty
 Version:        4.1.13
-Release:        15%{?dist}
+Release:        16%{?dist}
 Summary:        An asynchronous event-driven network application framework and tools for Java
 License:        ASL 2.0
 URL:            https://netty.io/
@@ -36,6 +37,7 @@ BuildRequires:  mvn(org.codehaus.mojo:exec-maven-plugin)
 BuildRequires:  mvn(org.fusesource.hawtjni:maven-hawtjni-plugin)
 BuildRequires:  mvn(org.jctools:jctools-core)
 BuildRequires:  mvn(org.slf4j:slf4j-api)
+BuildRequires:  java-%{java_version}-openjdk-devel
 %if %{without jp_minimal}
 BuildRequires:  mvn(com.fasterxml:aalto-xml)
 BuildRequires:  mvn(com.github.jponge:lzma-java)
@@ -195,7 +197,7 @@ sed -i 's|taskdef|taskdef classpathref="maven.plugin.classpath"|' all/pom.xml
 %build
 # Ensure we get the jit on arm
 %ifarch %{arm}
-export JAVA_HOME=$(ls -d %{_jvmdir}/java-1.8.0-openjdk-aarch32*)
+export JAVA_HOME=$(ls -d %{_jvmdir}/java-%{java_version}-openjdk-aarch32*)
 %else
 export JAVA_HOME=%{_jvmdir}/java
 %endif
@@ -215,6 +217,9 @@ export CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS"
 %license LICENSE.txt NOTICE.txt
 
 %changelog
+* Tue Jun 30 2020 Jeff Johnston <jjohnstn@redhat.com> - 4.1.13-16
+- add BR for Java 1.8.0 and set macro which can later be set to Java 11
+
 * Fri Mar 27 2020 Mat Booth <mat.booth@redhat.com> - 4.1.13-15
 - Disable JIT'd builds on arm 32 temporarily due to segfault in JDK, see bug
   1818078