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

ghc-deps.sh: only exclude unversioned rts.conf

Browse Source 
- Hadrian's rts.conf is versioned
- bin-package-db disappeared in ghc7

This change prevents:
nothing provides ghc-9.2.1-devel(ghc-prim-0.8.0-1.0.2) needed by ghc9.2-base-devel-4.16.0.0-2.fc36.x86_64
This commit is contained in:
Jens Petersen 2021-12-20 14:23:29 +08:00
parent 400c117550
commit 9e7ffdac88
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ghc-deps.sh
View File

@ -36,7 +36,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\b//" -e "s/bin-package-db-[^ ]\+//") ids=$($GHC_PKG field $name $field | sed -e "s/ rts[^-]//")
for d in $ids; do for d in $ids; do
case $d in case $d in
*-*-internal) ;; *-*-internal) ;;

5
ghc-rpm-macros.spec
View File

@ -7,7 +7,7 @@
%endif %endif
Name: ghc-rpm-macros Name: ghc-rpm-macros
Version: 2.3.8 Version: 2.3.9
Release: 1%{?dist} Release: 1%{?dist}
Summary: RPM macros for building Haskell packages for GHC Summary: RPM macros for building Haskell packages for GHC
@ -184,6 +184,9 @@ EOF
%changelog %changelog
* Mon Dec 20 2021 Jens Petersen <petersen@redhat.com> - 2.3.9-1
- ghc-deps.sh: only exclude unversioned rts.conf
* Mon Dec 20 2021 Jens Petersen <petersen@redhat.com> - 2.3.8-1 * Mon Dec 20 2021 Jens Petersen <petersen@redhat.com> - 2.3.8-1
- _arch fits Cabal better for ghclibplatform - _arch fits Cabal better for ghclibplatform