rpms/ghc/devel ghc.spec,1.10,1.11

Jens Petersen (petersen) fedora-extras-commits at redhat.com
Thu Mar 2 08:40:16 UTC 2006


Author: petersen

Update of /cvs/extras/rpms/ghc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28779

Modified Files:
	ghc.spec 
Log Message:
- buildrequire libX11-devel instead of xorg-x11-devel (Kevin Fenzi, #181024)
- make ghc-doc require ghc (Michel Salim, #180449)



Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ghc.spec	11 Oct 2005 03:05:07 -0000	1.10
+++ ghc.spec	2 Mar 2006 08:40:15 -0000	1.11
@@ -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 @@
 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 @@
 %package doc
 Summary:	Documentation for GHC
 Group:		Development/Languages
+Requires:	%{name}
 
 %description doc
 Preformatted documentation for the Glorious Glasgow Haskell
@@ -155,6 +156,10 @@
 %endif
 
 %changelog
+* Thu Mar  2 2006 Jens Petersen <petersen at redhat.com> - 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 <petersen at redhat.com> - 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)




More information about the fedora-extras-commits mailing list