[ghc-rpm-macros] ghc-deps.sh: look in buildroot package.conf.d for program deps

[Jens Petersen]

commit 1b8536abf13ff2b6293aa96f08c5cf3c765c72ee
Author: Jens Petersen <petersen at redhat.com>
Date:   Fri Jun 8 14:00:43 2012 +0900

    ghc-deps.sh: look in buildroot package.conf.d for program deps

 ghc-deps.sh         |    4 ++--
 ghc-rpm-macros.spec |    5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/ghc-deps.sh b/ghc-deps.sh
index 8685929..a57aceb 100755
--- a/ghc-deps.sh
+++ b/ghc-deps.sh
@@ -16,7 +16,7 @@ GHC_VER=$(basename $PKGBASEDIR | sed -e s/ghc-//)
 if [ ! -x "/usr/bin/ghc-pkg-${GHC_VER}" -a -x "$PKGBASEDIR/ghc-pkg" ]; then
     GHC_PKG="$PKGBASEDIR/ghc-pkg --global-conf=$PKGCONFDIR"
 else
-    GHC_PKG=/usr/bin/ghc-pkg
+    GHC_PKG="/usr/bin/ghc-pkg"
 fi
 
 case $MODE in
@@ -70,7 +70,7 @@ for i in $files; do
 	if file $i | grep -q 'executable, .* dynamically linked'; then
 	    BIN_DEPS=$(ldd $i | grep libHS | grep -v libHSrts | sed -e "s%^\\tlibHS\(.*\)-ghc${GHCVERSION}.so =.*%\1%")
 	    for p in ${BIN_DEPS}; do
-		HASH=$(${GHC_PKG} --global field $p id | sed -e "s/^id: \+//")
+		HASH=$(${GHC_PKG} --global --package-conf=$PKGCONFDIR field $p id | sed -e "s/^id: \+//")
 		echo "ghc($HASH)"
 	    done
 	fi
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index f23cdd3..341ad61 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -3,7 +3,7 @@
 %global macros_file %{_sysconfdir}/rpm/macros.ghc
 
 Name:           ghc-rpm-macros
-Version:        0.95.1
+Version:        0.95.2
 Release:        1%{?dist}
 Summary:        Macros for building packages for GHC
 
@@ -60,6 +60,9 @@ EOF
 
 
 %changelog
+* Fri Jun  8 2012 Jens Petersen <petersen at redhat.com> - 0.95.2-1
+- ghc-deps.sh: look in buildroot package.conf.d for program deps
+
 * Fri Jun  8 2012 Jens Petersen <petersen at redhat.com> - 0.95.1-1
 - add a meta-package option to ghc_devel_package and use in ghc_devel_requires