From cf47bde9b6c8d3230d3ee38ff5f44fefcc8f56a3 Mon Sep 17 00:00:00 2001 From: Michal Domonkos Date: Thu, 11 Feb 2021 17:56:39 +0100 Subject: [PATCH] Drop {fpc,gnat,nim}-srpm-macros deps on RHEL We did this in RHEL-8 [1] so let's not re-introduce the packages in RHEL-9. Previously, we did that by keeping a downstream-only patch - let's just have a conditional here, to make the maintenance simpler. [1] https://bugzilla.redhat.com/show_bug.cgi?id=1588575 --- redhat-rpm-config.spec | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index c8942e8..8c5f460 100644 --- a/redhat-rpm-config.spec +++ b/redhat-rpm-config.spec @@ -6,7 +6,7 @@ Summary: Red Hat specific rpm configuration files Name: redhat-rpm-config -Version: 202 +Version: 203 Release: 1%{?dist} # No version specified. License: GPL+ @@ -94,13 +94,10 @@ Requires: coreutils Requires: efi-srpm-macros Requires: fonts-srpm-macros -Requires: fpc-srpm-macros Requires: ghc-srpm-macros -Requires: gnat-srpm-macros Requires: go-srpm-macros Requires: kernel-srpm-macros Requires: lua-srpm-macros -Requires: nim-srpm-macros Requires: ocaml-srpm-macros Requires: openblas-srpm-macros Requires: perl-srpm-macros @@ -110,6 +107,12 @@ Requires: qt5-srpm-macros Requires: rust-srpm-macros Requires: rpmautospec-rpm-macros +%if ! 0%{?rhel} +Requires: fpc-srpm-macros +Requires: gnat-srpm-macros +Requires: nim-srpm-macros +%endif + Requires: rpm >= 4.11.0 Requires: dwz >= 0.4 Requires: zip @@ -218,6 +221,9 @@ install -p -m 755 -t %{buildroot}%{rrcdir} llvm-lto-elf-check %{_rpmconfigdir}/macros.d/macros.kmp %changelog +* Tue Nov 09 2021 Michal Domonkos - 203-1 +- Drop {fpc,gnat,nim}-srpm-macros dependencies on RHEL + * Wed Nov 03 2021 David Benoit - 202-1 - Add llvm-lto-elf-check script - Resolves: rhbz#2017193