From 78bda0dce526795284ef1644e7d0dd6e0b3511dc Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Sat, 29 Aug 2020 15:37:00 +0800
Subject: [PATCH] ghc-deps.sh: be careful when filtering out rts (#1873687)

---
 ghc-deps.sh         | 4 ++--
 ghc-rpm-macros.spec | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ghc-deps.sh b/ghc-deps.sh
index 3a4ecb4..265614e 100755
--- a/ghc-deps.sh
+++ b/ghc-deps.sh
@@ -27,7 +27,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//" -e "s/bin-package-db-[^ ]\+//")
+            ids=$($GHC_PKG field $name $field | sed -e "s/ rts\b//" -e "s/bin-package-db-[^ ]\+//")
             for d in $ids; do
                 case $d in
                     *-*-internal) ;;
@@ -38,7 +38,7 @@ for i in $files; do
             ;;
         */libHS*_p.a)
             pkgver=$(basename $(dirname $i))
-            ids=$($GHC_PKG field $pkgver $field | sed -e "s/rts//" -e "s/bin-package-db-[^ ]\+//")
+            ids=$($GHC_PKG field $pkgver $field | sed -e "s/ rts\b//" -e "s/bin-package-db-[^ ]\+//")
             for d in $ids; do
                 case $d in
                     *-*-internal) ;;
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index 050cb40..22ae612 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.13
-Release:        2%{?dist}
+Version:        2.0.14
+Release:        1%{?dist}
 Summary:        RPM macros for building Haskell packages for GHC
 
 License:        GPLv3+
@@ -218,6 +218,9 @@ EOF
 
 
 %changelog
+* Sat Aug 29 2020 Jens Petersen <petersen@redhat.com> - 2.0.14-1
+- ghc-deps.sh: be careful when filtering out rts (#1873687)
+
 * Wed Aug 26 2020 Jens Petersen <petersen@redhat.com> - 2.0.13-2
 - obsolete ghc-iwlib (xmobar)