diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc index dacafee..d81f67d 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-%{pkg_name} = %{version}-%{release}\ +Requires: ghc-%{-n:%{-n*}}%{!-n:%{pkg_name}} = %{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-%{pkg_name}-devel = %{version}-%{release} +Requires: ghc-%{-n:%{-n*}}%{!-n:%{pkg_name}}-devel = %{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 2479dcb..90ae020 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -1,5 +1,5 @@ Name: ghc-rpm-macros -Version: 0.5.1 +Version: 0.5.2 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.2-1 +- use -n in ghc_requires and ghc_prof_requires for when no pkg_name + * Mon Jan 11 2010 Jens Petersen - 0.5.1-1 - add ghcdocbasedir - revert ghcdocdir to match upstream ghc