fix ghc-deps.sh generation of prof deps

broken in 2.0.3 - now should correctly glob for installed prof libs
5 years ago · bf725e3e8b
parent f4b0280742
commit bf725e3e8b
2 changed files with 5 additions and 2 deletions
--- 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
                                ;;
--- 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 <petersen@redhat.com> - 2.0.5-1
+- ghc-deps.sh: fix generation of prof deps
+
 * Tue Aug 13 2019 Jens Petersen <petersen@redhat.com> - 2.0.4-1
 - add cabal-tweak-remove-upperbound script