From 640d44dbc640cd79d1130e5c65ed174c42171934 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 10 Feb 2020 18:51:58 +0800 Subject: [PATCH] ghc-deps.sh: fix prof deps for subpackages --- ghc-deps.sh | 2 +- ghc-rpm-macros.spec | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ghc-deps.sh b/ghc-deps.sh index 1850c30..d84ae79 100755 --- a/ghc-deps.sh +++ b/ghc-deps.sh @@ -46,7 +46,7 @@ for i in $files; do echo "ghc-prof($d)" ;; *) - if [ -f /usr/lib*/ghc-*/*/libHS${d}_p.a -o -f "$PKGBASEDIR/$pkgver/libHS${d}_p.a" ]; then + if [ -f /usr/lib*/ghc-*/*/libHS${d}_p.a -o -f $PKGBASEDIR/*/libHS${d}_p.a ]; then echo "ghc-prof($d)" fi ;; diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 0adb87a..daf895b 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -10,8 +10,8 @@ #%%global without_hscolour 1 Name: ghc-rpm-macros -Version: 2.0.5 -Release: 5%{?dist} +Version: 2.0.6 +Release: 1%{?dist} Summary: RPM macros for building Haskell packages for GHC License: GPLv3+ @@ -207,6 +207,9 @@ EOF %changelog +* Mon Feb 10 2020 Jens Petersen - 2.0.6-1 +- ghc-deps.sh: fix prof deps for subpackages + * Tue Jan 28 2020 Fedora Release Engineering - 2.0.5-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild @@ -1271,4 +1274,3 @@ EOF * Mon May 4 2009 Yaakov M. Nemoy - 0.1-1 - creation of package -