From 85e4414c43aa203ce7714353f26a8de3e442c548 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@redhat.com>
Date: Thu, 4 Sep 2025 16:13:51 -0400
Subject: [PATCH] RPM: Re-org distro conditionals

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
---
 rpm/skopeo.spec | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/rpm/skopeo.spec b/rpm/skopeo.spec
index 9e0dfd07..40916bbe 100644
--- a/rpm/skopeo.spec
+++ b/rpm/skopeo.spec
@@ -9,21 +9,15 @@
 
 %global gomodulesmode GO111MODULE=on
 
-# No btrfs on RHEL
+# Distro and environment conditionals
 %if %{defined fedora}
+# Fedora conditionals
 %define build_with_btrfs 1
-%endif
-
-%if %{defined rhel}
-%define fips 1
-%endif
-
-# Only used in official koji builds
-# Copr builds set a separate epoch for all environments
-%if %{defined fedora}
 %define conditional_epoch 1
 %else
+# RHEL conditionals
 %define conditional_epoch 2
+%define fips 1
 %endif
 
 # set higher Epoch only for podman-next builds