From 1f6b86fa4b3d565f60daf35e959cf13e398cf042 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 10 May 2020 21:49:27 +0800 Subject: [PATCH] ghc-deps.sh: ignore internal libraries (#1822444) --- ghc-deps.sh | 2 ++ ghc-rpm-macros.spec | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ghc-deps.sh b/ghc-deps.sh index d84ae79..3a4ecb4 100755 --- a/ghc-deps.sh +++ b/ghc-deps.sh @@ -30,6 +30,7 @@ for i in $files; do ids=$($GHC_PKG field $name $field | sed -e "s/rts//" -e "s/bin-package-db-[^ ]\+//") for d in $ids; do case $d in + *-*-internal) ;; *-*) echo "ghc-devel($d)" ;; *) ;; esac @@ -40,6 +41,7 @@ for i in $files; do ids=$($GHC_PKG field $pkgver $field | sed -e "s/rts//" -e "s/bin-package-db-[^ ]\+//") for d in $ids; do case $d in + *-*-internal) ;; *-*) case $field in id) diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index ef6c559..8580b91 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -10,8 +10,8 @@ #%%global without_hscolour 1 Name: ghc-rpm-macros -Version: 2.0.7 -Release: 2%{?dist} +Version: 2.0.8 +Release: 1%{?dist} Summary: RPM macros for building Haskell packages for GHC License: GPLv3+ @@ -212,6 +212,9 @@ EOF %changelog +* Sun May 10 2020 Jens Petersen - 2.0.8-1 +- ghc-deps.sh: ignore internal libraries (#1822444) + * Fri May 8 2020 Jens Petersen - 2.0.7-2 - obsolete ghc-here (dropped from hledger)