From a23376405b2ffdeaaf0cb66628a6af87f7325aa1 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 19 Sep 2012 20:00:54 +0900 Subject: [PATCH] fix broken duplicate hash output for haskell-platform binaries when locally installed --- ghc-deps.sh | 2 +- ghc-rpm-macros.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ghc-deps.sh b/ghc-deps.sh index 69a2d51..761cb5f 100755 --- a/ghc-deps.sh +++ b/ghc-deps.sh @@ -73,7 +73,7 @@ for i in $files; do PACKAGE_CONF_OPT="--package-conf=$PKGCONFDIR" fi for p in ${BIN_DEPS}; do - HASH=$(${GHC_PKG} --global $PACKAGE_CONF_OPT field $p id | sed -e "s/^id: \+//") + HASH=$(${GHC_PKG} --global $PACKAGE_CONF_OPT field $p id | sed -e "s/^id: \+//" | uniq) echo "ghc($HASH)" done fi diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 653ce55..67acbeb 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -6,7 +6,7 @@ #%%global without_hscolour 1 Name: ghc-rpm-macros -Version: 0.97 +Version: 0.97.1 Release: 1%{?dist} Summary: Macros for building packages for GHC @@ -81,6 +81,10 @@ EOF %changelog +* Wed Sep 19 2012 Jens Petersen - 0.97.1-1 +- fix broken duplicate hash output for haskell-platform binaries buildhack + when haskell-platform locally installed + * Sat Sep 8 2012 Jens Petersen - 0.97-1 - ghc-rpm-macros now requires hscolour so packages no longer need to BR it - this can be disabled for bootstrapping by setting without_hscolour