rpms/ghc/FC-4 .cvsignore,1.5,1.6 ghc.spec,1.7,1.8 sources,1.5,1.6

Jens Petersen (petersen) fedora-extras-commits at redhat.com
Mon Apr 24 08:34:21 UTC 2006


Author: petersen

Update of /cvs/extras/rpms/ghc/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16295

Modified Files:
	.cvsignore ghc.spec sources 
Log Message:
sync with fe5:
- update to 6.4.2 release
- make ghc-doc require ghc (Michel Salim, #180449)
- turn on build_doc since haddock is now in Extras
- no longer specify ghc version to build with (Ville Skytta, #170176)
: ----------------------------------------------------------------------



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ghc/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	20 Sep 2005 23:50:02 -0000	1.5
+++ .cvsignore	24 Apr 2006 08:34:21 -0000	1.6
@@ -1 +1 @@
-ghc-6.4.1-src.tar.bz2
+ghc-6.4.2-src.tar.bz2


Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/FC-4/ghc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ghc.spec	20 Sep 2005 23:50:02 -0000	1.7
+++ ghc.spec	24 Apr 2006 08:34:21 -0000	1.8
@@ -1,12 +1,11 @@
-%define build_version 6.4
-%define ghcver ghc641
+%define ghcver ghc642
 
 # speed up test builds by not building profiled libraries
 %define build_prof 1
-%define build_doc 0
+%define build_doc 1
 
 Name:		ghc
-Version:	6.4.1
+Version:	6.4.2
 Release:	1%{?dist}
 Summary:	Glasgow Haskell Compilation system
 License:	BSD style
@@ -21,7 +20,7 @@
 # haddock generates libraries/ docs
 Buildrequires: libxslt, docbook-style-xsl, haddock
 %endif
-Prefix: %{_prefix}
+Prefix:		%{_prefix}
 
 %description
 GHC is a state-of-the-art programming suite for Haskell, a purely
@@ -66,6 +65,7 @@
 %package doc
 Summary:	Documentation for GHC
 Group:		Development/Languages
+Requires:	%{name}
 
 %description doc
 Preformatted documentation for the Glorious Glasgow Haskell
@@ -85,7 +85,7 @@
 echo "GhcRTSWays=thr debug" >> mk/build.mk
 %endif
 
-./configure --prefix=%{_prefix} --libdir=%{_libdir} --with-ghc=ghc-%{build_version}
+./configure --prefix=%{_prefix} --libdir=%{_libdir}
 
 make all
 %if %{build_doc}
@@ -156,7 +156,17 @@
 %endif
 
 %changelog
-* Tue Sep 20 2005 Jens Petersen <petersen at redhat.com> - 6.4.1-1
+* Sat Apr 22 2006 Jens Petersen <petersen at redhat.com> - 6.4.2-1.fc4
+- update to 6.4.2 release
+
+* Thu Mar  2 2006 Jens Petersen <petersen at redhat.com>
+- make ghc-doc require ghc (Michel Salim, #180449)
+
+* Tue Oct 11 2005 Jens Petersen <petersen at redhat.com>
+- turn on build_doc since haddock is now in Extras
+- no longer specify ghc version to build with (Ville Skyttä, #170176)
+
+* Tue Sep 20 2005 Jens Petersen <petersen at redhat.com> - 6.4.1-1.fc4
 - 6.4.1 release
   - the following patches are now upstream: ghc-6.4-powerpc.patch,
     rts-GCCompact.h-x86_64.patch, ghc-6.4-dsforeign-x86_64-1097471.patch,


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ghc/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Sep 2005 23:50:02 -0000	1.5
+++ sources	24 Apr 2006 08:34:21 -0000	1.6
@@ -1 +1 @@
-fd289bc7c3afa272ff831a71a50b5b00  ghc-6.4.1-src.tar.bz2
+a394bf14e94c3bca5507d568fcc03375  ghc-6.4.2-src.tar.bz2




More information about the fedora-extras-commits mailing list