From a0bbde907a1a300ad1c89215059ec8711d730030 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 11 Jan 2010 06:51:22 +0000 Subject: [PATCH] use -v in ghc_requires and ghc_prof_requires for version --- ghc-rpm-macros.ghc | 4 ++-- ghc-rpm-macros.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc index 44f8e9e..29081fb 100644 --- a/ghc-rpm-macros.ghc +++ b/ghc-rpm-macros.ghc @@ -51,7 +51,7 @@ install --mode=0644 %{pkg_name}-%{version}.conf $RPM_BUILD_ROOT%{_libdir}/ghc-%{ Requires(post): ghc = %{ghc_version}\ Requires(postun): ghc = %{ghc_version}\ %if %{with shared}\ -Requires: ghc-%{-n:%{-n*}}%{!-n:%{pkg_name}} = %{version}-%{release}\ +Requires: ghc-%{-n:%{-n*}}%{!-n:%{pkg_name}} = %{-v:%{-v*}}%{!-v:%{version}}-%{release}\ %endif %ghc_doc_requires Requires: ghc-doc = %{ghc_version}\ @@ -59,7 +59,7 @@ Requires(post): ghc-doc = %{ghc_version}\ Requires(postun): ghc-doc = %{ghc_version} %ghc_prof_requires Requires: ghc-prof = %{ghc_version}\ -Requires: ghc-%{-n:%{-n*}}%{!-n:%{pkg_name}}-devel = %{version}-%{release} +Requires: ghc-%{-n:%{-n*}}%{!-n:%{pkg_name}}-devel = %{-v:%{-v*}}%{!-v:%{version}}-%{release} %ghc_lib_package(n:c:h:)\ %define ghc_pkg_name %{-n:ghc-%{-n*}}%{!-n:ghc-%{pkg_name}}\ diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index dbf7f50..95cb088 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -1,5 +1,5 @@ Name: ghc-rpm-macros -Version: 0.5.3 +Version: 0.5.4 Release: 1%{?dist} Summary: Macros for building packages for GHC @@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jan 11 2010 Jens Petersen - 0.5.4-1 +- use -v in ghc_requires and ghc_prof_requires for version + * Mon Jan 11 2010 Jens Petersen - 0.5.3-1 - drop "Library for" from base lib summary