From 9e7ffdac88f9607a97dc975cd67f7ee0af403518 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 20 Dec 2021 14:23:29 +0800 Subject: [PATCH] ghc-deps.sh: only exclude unversioned rts.conf - Hadrian's rts.conf is versioned - bin-package-db disappeared in ghc7 This change prevents: nothing provides ghc-9.2.1-devel(ghc-prim-0.8.0-1.0.2) needed by ghc9.2-base-devel-4.16.0.0-2.fc36.x86_64 --- ghc-deps.sh | 2 +- ghc-rpm-macros.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ghc-deps.sh b/ghc-deps.sh index 9a104b0..ffd0d10 100755 --- a/ghc-deps.sh +++ b/ghc-deps.sh @@ -36,7 +36,7 @@ for i in $files; do # exclude rts.conf $PKGCONFDIR/*-*.conf) name=$(grep "^name: " $i | sed -e "s/name: //") - ids=$($GHC_PKG field $name $field | sed -e "s/ rts\b//" -e "s/bin-package-db-[^ ]\+//") + ids=$($GHC_PKG field $name $field | sed -e "s/ rts[^-]//") for d in $ids; do case $d in *-*-internal) ;; diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 04b1109..35205d1 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -7,7 +7,7 @@ %endif Name: ghc-rpm-macros -Version: 2.3.8 +Version: 2.3.9 Release: 1%{?dist} Summary: RPM macros for building Haskell packages for GHC @@ -184,6 +184,9 @@ EOF %changelog +* Mon Dec 20 2021 Jens Petersen - 2.3.9-1 +- ghc-deps.sh: only exclude unversioned rts.conf + * Mon Dec 20 2021 Jens Petersen - 2.3.8-1 - _arch fits Cabal better for ghclibplatform