From bf725e3e8b0c32fec9670f3bdd6d9b07fd8c2da9 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Aug 27 2019 13:45:37 +0000 Subject: fix ghc-deps.sh generation of prof deps broken in 2.0.3 - now should correctly glob for installed prof libs --- diff --git a/ghc-deps.sh b/ghc-deps.sh index 51916c8..1850c30 100755 --- a/ghc-deps.sh +++ b/ghc-deps.sh @@ -46,7 +46,7 @@ for i in $files; do echo "ghc-prof($d)" ;; *) - if [ -f "$PKGBASEDIR/$pkgver/libHS${d}_p.a" -o -f "/usr/lib*/ghc-*/$pkgver/libHS${d}_p.a" ]; then + if [ -f /usr/lib*/ghc-*/*/libHS${d}_p.a -o -f "$PKGBASEDIR/$pkgver/libHS${d}_p.a" ]; then echo "ghc-prof($d)" fi ;; diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 5c413fb..c42d828 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -10,7 +10,7 @@ #%%global without_hscolour 1 Name: ghc-rpm-macros -Version: 2.0.4 +Version: 2.0.5 Release: 1%{?dist} Summary: RPM macros for building Haskell packages for GHC @@ -206,6 +206,9 @@ EOF %changelog +* Tue Aug 27 2019 Jens Petersen - 2.0.5-1 +- ghc-deps.sh: fix generation of prof deps + * Tue Aug 13 2019 Jens Petersen - 2.0.4-1 - add cabal-tweak-remove-upperbound script