From 32ffe2c854c9b1439c880cbf9a7355669a0d4367 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 16 Nov 2009 09:14:11 +0000 Subject: [PATCH] use the latest installed pkg version for %GHCRequires --- ghc-rpm-macros.ghc | 2 +- ghc-rpm-macros.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc index c0c2511..4e23fc6 100644 --- a/ghc-rpm-macros.ghc +++ b/ghc-rpm-macros.ghc @@ -38,4 +38,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-//") +Requires: 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 98915d3..02512a8 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -1,5 +1,5 @@ Name: ghc-rpm-macros -Version: 0.2.2 +Version: 0.2.3 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.3-1 +- use the latest installed pkg version for %%GHCRequires + * Mon Nov 16 2009 Jens Petersen - 0.2.2-1 - add %%GHCRequires for automatically versioned library deps