From d007836b70bafa8b301f559dfa962dfde99148fd Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 16 Nov 2009 12:27:56 +0000 Subject: [PATCH] make ghc_pkg_ver only return pkg version --- 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 181d59a..8b37b8d 100644 --- a/ghc-rpm-macros.ghc +++ b/ghc-rpm-macros.ghc @@ -37,4 +37,4 @@ echo '%{ghcdocdir}' >> %1-doc.files \ %ghc_version %(ghc --numeric-version) -%ghc_pkg_ver() ghc-%1-%2 = %(ghc-pkg list --global --simple-output %1|sed -e "s/.*%1-//") +%ghc_pkg_ver() %(ghc-pkg list --global --simple-output %1|sed -e "s/.*%1-//") diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 26f2525..061cbb4 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -1,5 +1,5 @@ Name: ghc-rpm-macros -Version: 0.2.4 +Version: 0.2.5 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.5-1 +- make ghc_pkg_ver only return pkg version + * Mon Nov 16 2009 Jens Petersen - 0.2.4-1 - change GHCRequires to ghc_pkg_ver