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

ghc-deps.sh: be careful when filtering out rts (#1873687)

Browse Source
This commit is contained in:
Jens Petersen 2020-08-29 15:37:00 +08:00
parent d1ee98d635
commit 78bda0dce5
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ghc-deps.sh
View File

@ -27,7 +27,7 @@ for i in $files; do
# exclude rts.conf # exclude rts.conf
$pkgconfdir/*-*.conf) $pkgconfdir/*-*.conf)
name=$(grep "^name: " $i | sed -e "s/name: //") name=$(grep "^name: " $i | sed -e "s/name: //")
ids=$($GHC_PKG field $name $field | sed -e "s/rts//" -e "s/bin-package-db-[^ ]\+//") ids=$($GHC_PKG field $name $field | sed -e "s/ rts\b//" -e "s/bin-package-db-[^ ]\+//")
for d in $ids; do for d in $ids; do
case $d in case $d in
*-*-internal) ;; *-*-internal) ;;
@ -38,7 +38,7 @@ for i in $files; do
;; ;;
*/libHS*_p.a) */libHS*_p.a)
pkgver=$(basename $(dirname $i)) pkgver=$(basename $(dirname $i))
ids=$($GHC_PKG field $pkgver $field | sed -e "s/rts//" -e "s/bin-package-db-[^ ]\+//") ids=$($GHC_PKG field $pkgver $field | sed -e "s/ rts\b//" -e "s/bin-package-db-[^ ]\+//")
for d in $ids; do for d in $ids; do
case $d in case $d in
*-*-internal) ;; *-*-internal) ;;

7
ghc-rpm-macros.spec
View File

@ -10,8 +10,8 @@
#%%global without_hscolour 1 #%%global without_hscolour 1
Name: ghc-rpm-macros Name: ghc-rpm-macros
Version: 2.0.13 Version: 2.0.14
Release: 2%{?dist} Release: 1%{?dist}
Summary: RPM macros for building Haskell packages for GHC Summary: RPM macros for building Haskell packages for GHC
License: GPLv3+ License: GPLv3+
@ -218,6 +218,9 @@ EOF
%changelog %changelog
* Sat Aug 29 2020 Jens Petersen <petersen@redhat.com> - 2.0.14-1
- ghc-deps.sh: be careful when filtering out rts (#1873687)
* Wed Aug 26 2020 Jens Petersen <petersen@redhat.com> - 2.0.13-2 * Wed Aug 26 2020 Jens Petersen <petersen@redhat.com> - 2.0.13-2
- obsolete ghc-iwlib (xmobar) - obsolete ghc-iwlib (xmobar)