From bbb099b808673e6519e5df26b9092fdb1ff447e8 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 16 May 2024 17:44:46 +0800 Subject: [PATCH] drop dependency on ghc-srpm-macros for rhel10 Resolves: RHEL-33354 Other changes are just grouping and sorting all the rhel excluded packages --- redhat-rpm-config.spec | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index 8aad9e9..3fa2c01 100644 --- a/redhat-rpm-config.spec +++ b/redhat-rpm-config.spec @@ -93,7 +93,6 @@ Requires: efi-srpm-macros Requires: fonts-srpm-macros # ↓ Provides macros.forge and forge.lua originally shipped by us Requires: forge-srpm-macros -Requires: ghc-srpm-macros Requires: go-srpm-macros # ↓ Provides kmod.attr originally shipped by us Requires: kernel-srpm-macros >= 1.0-12 @@ -103,18 +102,17 @@ Requires: openblas-srpm-macros Requires: perl-srpm-macros # ↓ Has Python BRPs originaly present in redhat-rpm-config Requires: python-srpm-macros >= 3.11-7 -%if ! 0%{?rhel} -Requires: qt5-srpm-macros -%endif Requires: qt6-srpm-macros Requires: rust-srpm-macros Requires: package-notes-srpm-macros Requires: pyproject-srpm-macros %if ! 0%{?rhel} -Requires: fpc-srpm-macros -Requires: gnat-srpm-macros Requires: ansible-srpm-macros +Requires: fpc-srpm-macros +Requires: ghc-srpm-macros +Requires: gnat-srpm-macros +Requires: qt5-srpm-macros Requires: zig-srpm-macros %endif