[ghc-rpm-macros] update ghc-deps.sh for rts changes as of ghc-7.7.20130828

[Jens Petersen]

commit a2f7c2b71a0d9a1f7a9791b99dbfe73414857ebd
Author: Jens Petersen <petersen at redhat.com>
Date:   Sat Sep 7 22:08:03 2013 +0900

    update ghc-deps.sh for rts changes as of ghc-7.7.20130828
    
    ghc-7.8 rts now lives in its own subdir

 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 2725cf7..93cc992 100755
--- a/ghc-deps.sh
+++ b/ghc-deps.sh
@@ -36,7 +36,7 @@ files=$(cat)
 #set -x
 
 for i in $files; do
-    LIB_FILE=$(echo $i | grep /libHS | egrep -v "$PKGBASEDIR/libHS")
+    LIB_FILE=$(echo $i | grep /libHS | egrep -v "/libHSrts")
     if [ "$LIB_FILE" ]; then
 	if [ -d "$PKGCONFDIR" ]; then
 	    META=""
@@ -68,7 +68,7 @@ for i in $files; do
 	fi
     elif [ "$MODE" = "--requires" ]; then
 	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%")
+	    BIN_DEPS=$(ldd $i | grep libHS | grep -v libHSrts | sed -e "s%^\\tlibHS\(.*\)-ghc${GHCVERSION}.so => .*%\1%")
 	    if [ -d "$PKGCONFDIR" ]; then
 		PACKAGE_CONF_OPT="--package-conf=$PKGCONFDIR"
 	    fi
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index 2be2ee2..76c391d 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -6,7 +6,7 @@
 #%%global without_hscolour 1
 
 Name:           ghc-rpm-macros
-Version:        1.0.8
+Version:        1.1
 Release:        1%{?dist}
 Summary:        RPM macros for building packages for GHC
 
@@ -90,6 +90,9 @@ EOF
 
 
 %changelog
+* Sat Sep  7 2013 Jens Petersen <petersen at redhat.com> - 1.1-1
+- update ghc-deps.sh to handling ghc-7.8 rts
+
 * Tue Aug 27 2013 Jens Petersen <petersen at redhat.com> - 1.0.8-1
 - drop ghc_docdir in favor of _pkgdocdir
 - no longer version package htmldirs