From 0fbb24d072001b301ae096aa9404bdf6b695f502 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 11 Jan 2010 04:16:46 +0000 Subject: [PATCH] ghc-rpm-macros-0.5.2 fixes broken pkg_name requires for lib packages --- ghc.spec | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/ghc.spec b/ghc.spec index 6c71c30..69e38fb 100644 --- a/ghc.spec +++ b/ghc.spec @@ -26,7 +26,8 @@ Name: ghc # break of haskell-platform-2009.2.0.2 Version: 6.12.1 -Release: 2%{?dist} +# can't be reset as long as there are versioned subpackages +Release: 3%{?dist} Summary: Glasgow Haskell Compilation system # fedora ghc has only been bootstrapped on the following archs: ExclusiveArch: %{ix86} x86_64 ppc alpha @@ -42,7 +43,7 @@ Obsoletes: ghc682, ghc681, haddock09 # introduced for f11 and can be removed for f13: Obsoletes: haddock < %{haddock_version}, ghc-haddock-devel < %{haddock_version} Provides: haddock = %{haddock_version} -BuildRequires: ghc, happy, ghc-rpm-macros >= 0.5.1 +BuildRequires: ghc, happy, ghc-rpm-macros >= 0.5.2 BuildRequires: gmp-devel, ncurses-devel Requires: gcc, gmp-devel %if %{with shared} @@ -296,10 +297,14 @@ ghc-pkg recache %endif %changelog +* Mon Jan 11 2010 Jens Petersen - 6.12.1-3 +- ghc-rpm-macros-0.5.2 fixes broken pkg_name requires for lib packages + * Tue Dec 22 2009 Jens Petersen - 6.12.1-2 -- add subpackages for haskeline, mtl, and terminfo for now with - ghc-6.12.1-no-filter-libs.patch: use ghc_binlibpackage, grep -v and - ghc_gen_filelists to generate the library subpackages (ghc-rpm-macros-0.5.1) +- include haskeline, mtl, and terminfo for now with + ghc-6.12.1-no-filter-libs.patch +- use ghc_binlibpackage, grep -v and ghc_gen_filelists to generate + the library subpackages (ghc-rpm-macros-0.5.1) - always set GhcLibWays (Lorenzo Villani) - use ghcdocbasedir to revert html doc path to upstream's html/ for consistency