rpms/ghc-rpm-macros
6
0
Fork 0
Code Issues Pull Requests Releases Activity

fix broken duplicate hash output for haskell-platform binaries when locally installed

Browse Source
This commit is contained in:
Jens Petersen 2012-09-19 20:00:54 +09:00
parent e330117e14
commit a23376405b
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ghc-deps.sh
View File

@ -73,7 +73,7 @@ for i in $files; do
PACKAGE_CONF_OPT="--package-conf=$PKGCONFDIR" PACKAGE_CONF_OPT="--package-conf=$PKGCONFDIR"
fi fi
for p in ${BIN_DEPS}; do 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)" echo "ghc($HASH)"
done done
fi fi

6
ghc-rpm-macros.spec
View File

@ -6,7 +6,7 @@
#%%global without_hscolour 1 #%%global without_hscolour 1
Name: ghc-rpm-macros Name: ghc-rpm-macros
Version: 0.97 Version: 0.97.1
Release: 1%{?dist} Release: 1%{?dist}
Summary: Macros for building packages for GHC Summary: Macros for building packages for GHC
@ -81,6 +81,10 @@ EOF
%changelog %changelog
* Wed Sep 19 2012 Jens Petersen <petersen@redhat.com> - 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 <petersen@redhat.com> - 0.97-1 * Sat Sep 8 2012 Jens Petersen <petersen@redhat.com> - 0.97-1
- ghc-rpm-macros now requires hscolour so packages no longer need to BR it - ghc-rpm-macros now requires hscolour so packages no longer need to BR it
- this can be disabled for bootstrapping by setting without_hscolour - this can be disabled for bootstrapping by setting without_hscolour