From c12a20f95011903fbc62afdbc38241aa8418ce9a Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 2 Mar 2006 08:40:15 +0000 Subject: [PATCH] - buildrequire libX11-devel instead of xorg-x11-devel (Kevin Fenzi, #181024) - make ghc-doc require ghc (Michel Salim, #180449) --- ghc.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ghc.spec b/ghc.spec index 56a1c84..333548d 100644 --- a/ghc.spec +++ b/ghc.spec @@ -6,7 +6,7 @@ Name: ghc Version: 6.4.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Glasgow Haskell Compilation system License: BSD style Group: Development/Languages @@ -15,7 +15,7 @@ URL: http://haskell.org/ghc/ Requires: %{ghcver} = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ghc, sed -Buildrequires: gmp-devel, readline-devel, xorg-x11-devel, freeglut-devel, openal-devel +Buildrequires: gmp-devel, readline-devel, libX11-devel, freeglut-devel, openal-devel %if %{build_doc} # haddock generates libraries/ docs Buildrequires: libxslt, docbook-style-xsl, haddock @@ -65,6 +65,7 @@ needed. %package doc Summary: Documentation for GHC Group: Development/Languages +Requires: %{name} %description doc Preformatted documentation for the Glorious Glasgow Haskell @@ -155,6 +156,10 @@ fi %endif %changelog +* Thu Mar 2 2006 Jens Petersen - 6.4.1-3 +- buildrequire libX11-devel instead of xorg-x11-devel (Kevin Fenzi, #181024) +- make ghc-doc require ghc (Michel Salim, #180449) + * Tue Oct 11 2005 Jens Petersen - 6.4.1-2 - turn on build_doc since haddock is now in Extras - no longer specify ghc version to build with (Ville Skyttä, #170176)