petersen pushed to ghc-rpm-macros (f22). "version ghc-pkg in %ghc_pkg_recache (..more)"

notifications at fedoraproject.org notifications at fedoraproject.org
Mon Mar 30 03:43:37 UTC 2015


>From d1251119aa404eae99c6b88237047c44dce90a1a Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen at fedoraproject.org>
Date: Sun, 8 Mar 2015 14:41:30 +0900
Subject: version ghc-pkg in %ghc_pkg_recache

this will work for ghc784 where ghc_override is defined but not ghc784-PKG

diff --git a/macros.ghc b/macros.ghc
index 88d0450..01eb1f3 100644
--- a/macros.ghc
+++ b/macros.ghc
@@ -168,7 +168,7 @@ done\
 %endif\
 %{nil}
 
-%ghc_pkg_recache %{_bindir}/ghc-pkg recache --no-user-package-db || :
+%ghc_pkg_recache %{_bindir}/ghc-pkg-%{ghc_version} recache --no-user-package-db || :
 
 # - without_hscolour, without_testsuite, and ghc_bootstrapping
 #   need to be set locally in the spec file
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/ghc-rpm-macros.git/commit/?h=f22&id=d1251119aa404eae99c6b88237047c44dce90a1a


More information about the scm-commits mailing list