From b8f63cfff065c52cca73a3a8a2cd80bc5d96a59e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 16 Nov 2009 09:56:31 +0000 Subject: [PATCH] change GHCRequires to ghc_pkg_ver --- ghc-rpm-macros.ghc | 3 +-- ghc-rpm-macros.spec | 5 ++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc index 4e23fc6..181d59a 100644 --- a/ghc-rpm-macros.ghc +++ b/ghc-rpm-macros.ghc @@ -37,5 +37,4 @@ echo '%{ghcdocdir}' >> %1-doc.files \ %ghc_version %(ghc --numeric-version) -%GHCRequires() \ -Requires: ghc-%1-%2 = %(ghc-pkg list --global --simple-output %1|sed -e "s/.*%1-//") +%ghc_pkg_ver() ghc-%1-%2 = %(ghc-pkg list --global --simple-output %1|sed -e "s/.*%1-//") diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 02512a8..26f2525 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -1,5 +1,5 @@ Name: ghc-rpm-macros -Version: 0.2.3 +Version: 0.2.4 Release: 1%{?dist} Summary: Macros for building packages for GHC @@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Nov 16 2009 Jens Petersen - 0.2.4-1 +- change GHCRequires to ghc_pkg_ver + * Mon Nov 16 2009 Jens Petersen - 0.2.3-1 - use the latest installed pkg version for %%GHCRequires