diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc index 84feeb9..eab61e5 100644 --- a/ghc-rpm-macros.ghc +++ b/ghc-rpm-macros.ghc @@ -115,6 +115,7 @@ Summary: %{?common_summary}%{!?common_summary:Haskell %{pkgname} library} Group: System Environment/Libraries\ %{?1:Version: %{pkgver}}\ %{-l:License: %{-l*}}\ +%{?ghc_pkg_obsoletes:Obsoletes: %(echo "%{ghc_pkg_obsoletes}" | sed -e "s/\\(ghc-[^, ]*\\)-devel/\\1/g")}\ \ %description -n %{basepkg}\ %{?common_description}%{!?common_description:Haskell %{pkgname} library.}\ diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 4d54ff8..7ed0006 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -1,7 +1,7 @@ %global debug_package %{nil} Name: ghc-rpm-macros -Version: 0.11.11 +Version: 0.11.12 Release: 1%{?dist} Summary: Macros for building packages for GHC @@ -58,6 +58,9 @@ EOF %changelog +* Thu Mar 10 2011 Jens Petersen - 0.11.12-1 +- add ghc_pkg_obsoletes to binlib base lib package too + * Wed Mar 9 2011 Jens Petersen - 0.11.11-1 - add docdir when subpackaging packages too