diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc index 13879bf..379b132 100644 --- a/ghc-rpm-macros.ghc +++ b/ghc-rpm-macros.ghc @@ -197,6 +197,7 @@ Group: Development/Libraries\ %{?ghc_pkg_obsoletes:Obsoletes: %{ghc_pkg_obsoletes}}\ %{?ghc_pkg_obsoletes:Obsoletes: %(echo "%{ghc_pkg_obsoletes}" | sed -e "s/\\(ghc-[^, ]*\\)-devel/\\1-doc/g")}\ Obsoletes: %{basepkg}-doc < %{pkgver}-%{release}\ +Provides: %{basepkg}-doc = %{pkgver}-%{release}\ Obsoletes: %{basepkg}-prof < %{pkgver}-%{release}\ %if %{undefined without_prof}\ Provides: %{basepkg}-prof = %{pkgver}-%{release}\ diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 2d215f7..5d5be7c 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -3,7 +3,7 @@ %global macros_file %{_sysconfdir}/rpm/macros.ghc Name: ghc-rpm-macros -Version: 0.95.5.1 +Version: 0.95.6 Release: 1%{?dist} Summary: Macros for building packages for GHC @@ -64,6 +64,9 @@ EOF %changelog +* Mon Jun 25 2012 Jens Petersen - 0.95.6-1 +- provide doc from devel a little longer to silence rpmlint + * Fri Jun 22 2012 Jens Petersen - 0.95.5.1-1 - cabal-tweak-dep-ver: be careful only to match complete dep name and do not match beyond ","