diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc index 9d2d1cb..3e72baf 100644 --- a/ghc-rpm-macros.ghc +++ b/ghc-rpm-macros.ghc @@ -61,10 +61,13 @@ install --mode=0644 %{?1}%{!?1:%{pkg_name}}-%{version}.conf $RPM_BUILD_ROOT%{ghc # devel pkg basic requires %ghc_devel_requires Requires(post): ghc = %{ghc_version}\ -Requires(postun): ghc = %{ghc_version} +Requires(postun): ghc = %{ghc_version}\ +%if 0%{!?without_shared:1}\ +Requires: ghc-%{-n:%{-n*}}%{!-n:%{pkg_name}} = %{-v:%{-v*}}%{!-v:%{version}}-%{release}\ +%endif # prof pkg basic requires -%ghc_prof_requires \ +%ghc_prof_requires Requires: ghc-%{-n:%{-n*}}%{!-n:%{pkg_name}}-devel = %{-v:%{-v*}}%{!-v:%{version}}-%{release}\ %{nil} # ghc_lib_package [-n pkgname] [-c cdepslist] [-h pkgdepslist] (-o deprecated no-op) diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 98a9ca7..c3d2269 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -1,5 +1,5 @@ Name: ghc-rpm-macros -Version: 0.10.0 +Version: 0.10.1 Release: 1%{?dist} Summary: Macros for building packages for GHC @@ -53,8 +53,16 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Nov 23 2010 Jens Petersen - 0.10.1-1 +- bring back the explicit n-v-r internal package requires for devel and prof packages + * Mon Nov 22 2010 Jens Petersen - 0.10.0-1 -- turn pkg hash metadata (for ghc-7 builds) +- turn on pkg hash metadata (for ghc-7 builds) +- ghc-deps.sh now requires an extra buildroot/ghcpkgbasedir arg +- automatic internal package deps from prof to devel to base +- rename ghc_requires to ghc_devel_requires +- drop ghc_doc_requires +- ghc_reindex_haddock is deprecated and now a no-op * Thu Sep 30 2010 Jens Petersen - 0.9.1-1 - fix without_shared build so it actually works