From cbf3d70e56a64b03162d0e0c7a08e8016faf80a5 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 1 Apr 2011 16:54:19 +0900 Subject: [PATCH] provides ghc-*-doc still needed for current lib templates --- ghc-rpm-macros.ghc | 1 + ghc-rpm-macros.spec | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc index 1a86d72..28ff7ec 100644 --- a/ghc-rpm-macros.ghc +++ b/ghc-rpm-macros.ghc @@ -162,6 +162,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 < %{version}-%{release}\ +Provides: %{basepkg}-doc = %{version}-%{release}\ \ %description -n %{basepkg}-devel\ %{?common_description}%{!?common_description:Haskell %{pkgname} library.}\ diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 9db505f..a9fcf96 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.13 +Version: 0.11.14 Release: 1%{?dist} Summary: Macros for building packages for GHC @@ -58,10 +58,13 @@ EOF %changelog +* Fri Apr 1 2011 Jens Petersen - 0.11.14-1 +- provides ghc-*-doc still needed for current lib templates + * Mon Mar 28 2011 Jens Petersen - 0.11.13-1 - ghc-deps.sh: check PKGBASEDIR exists to avoid warning for bin package - abort cabal_configure if ghc is not self-bootstrapped -- make ghc_reindex_haddock a safe : no-op +- make ghc_reindex_haddock a safe no-op - no longer provide ghc-*-doc - no longer run ghc_reindex_haddock in ghc-*-devel scripts