From d049cdcea6755adac16056ea46aa21df3eb0d3fa Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Mon, 11 Sep 2017 19:52:00 -0700 Subject: [PATCH] Cleanup spec file conditionals --- java-1.8.0-openjdk.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index d18eaf6..33c09cf 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -1138,7 +1138,7 @@ BuildRequires: xorg-x11-proto-devel BuildRequires: zip # Use OpenJDK 7 where available (on RHEL) to avoid # having to use the rhel-7.x-java-unsafe-candidate hack -%if 0%{?rhel} <= 7 +%if ! 0%{?fedora} && 0%{?rhel} <= 7 BuildRequires: java-1.7.0-openjdk-devel %else BuildRequires: java-1.8.0-openjdk-devel @@ -1499,7 +1499,7 @@ sh %{SOURCE12} %patch539 # RHEL-only patches -%if 0%{?rhel} <= 7 +%if ! 0%{?fedora} && 0%{?rhel} <= 7 %patch534 %endif