rpms/ghc/devel .cvsignore, 1.4, 1.5 ghc.spec, 1.6, 1.7 sources, 1.4, 1.5 ghc-6.4-dsforeign-x86_64-1097471.patch, 1.1, NONE ghc-6.4-powerpc.patch, 1.1, NONE ghc-6.4-rts-adjustor-x86_64-1097471.patch, 1.1, NONE rts-GCCompact.h-x86_64.patch, 1.1, NONE

[Jens Petersen (petersen)]

Author: petersen

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

Modified Files:
	.cvsignore ghc.spec sources 
Removed Files:
	ghc-6.4-dsforeign-x86_64-1097471.patch ghc-6.4-powerpc.patch 
	ghc-6.4-rts-adjustor-x86_64-1097471.patch 
	rts-GCCompact.h-x86_64.patch 
Log Message:
- 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,
    ghc-6.4-rts-adjustor-x86_64-1097471.patch
  - builds with gcc4 so drop %%_with_gcc32
  - x86_64 build restrictions (no ghci and split objects) no longer apply




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Jun 2005 01:55:58 -0000	1.4
+++ .cvsignore	20 Sep 2005 23:37:16 -0000	1.5
@@ -1 +1 @@
-ghc-6.4-src.tar.bz2
+ghc-6.4.1-src.tar.bz2


Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ghc.spec	2 Jun 2005 01:55:58 -0000	1.6
+++ ghc.spec	20 Sep 2005 23:37:16 -0000	1.7
@@ -1,16 +1,13 @@
 %define build_version 6.4
-%define ghcver ghc64
+%define ghcver ghc641
 
 # speed up test builds by not building profiled libraries
 %define build_prof 1
 %define build_doc 0
 
-# ghc-6.4 doesn't build with gcc-4.0 yet
-%define _with_gcc32 %{nil}
-
 Name:		ghc
-Version:	6.4
-Release:	8%{?dist}
+Version:	6.4.1
+Release:	0.1%{?dist}
 Summary:	Glasgow Haskell Compilation system
 License:	BSD style
 Group:		Development/Languages
@@ -18,17 +15,13 @@
 URL:		http://haskell.org/ghc/
 Requires:	%{ghcver} = %{version}-%{release}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: sed, %{ghcver}, %{?_with_gcc32: compat-gcc-32}
+BuildRequires: ghc, sed
 Buildrequires: gmp-devel, readline-devel, xorg-x11-devel, freeglut-devel, openal-devel
 %if %{build_doc}
 # haddock generates libraries/ docs
 Buildrequires: libxslt, docbook-style-xsl, haddock
 %endif
 Prefix: %{_prefix}
-Patch1: ghc-6.4-powerpc.patch
-Patch2: rts-GCCompact.h-x86_64.patch
-Patch3: ghc-6.4-dsforeign-x86_64-1097471.patch
-Patch4: ghc-6.4-rts-adjustor-x86_64-1097471.patch
 
 %description
 GHC is a state-of-the-art programming suite for Haskell, a purely
@@ -85,22 +78,14 @@
 
 %prep
 %setup -q -n ghc-%{version}
-%patch1 -p1 -b .1-ppc
-%patch2 -p1 -b .2-x86_64
-%patch3 -p1 -b .3-x86_64
-%patch4 -p1 -b .4-x86_64
 
 %build
-%ifarch x86_64
-echo "SplitObjs = NO" >> mk/build.mk
-echo "GhcWithInterpreter = NO" >> mk/build.mk
-%endif
 %if !%{build_prof}
 echo "GhcLibWays=" >> mk/build.mk
 echo "GhcRTSWays=thr debug" >> mk/build.mk
 %endif
 
-./configure --prefix=%{_prefix} --libdir=%{_libdir} --with-ghc=ghc-%{build_version} %{?_with_gcc32: --with-gcc=%{_bindir}/gcc32}
+./configure --prefix=%{_prefix} --libdir=%{_libdir} --with-ghc=ghc-%{build_version}
 
 make all
 %if %{build_doc}
@@ -171,6 +156,14 @@
 %endif
 
 %changelog
+* Tue Sep 20 2005 Jens Petersen <petersen at redhat.com> - 6.4.1-0
+- 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,
+    ghc-6.4-rts-adjustor-x86_64-1097471.patch
+  - builds with gcc4 so drop %%_with_gcc32
+  - x86_64 build restrictions (no ghci and split objects) no longer apply
+
 * Tue May 31 2005 Jens Petersen <petersen at redhat.com>
 - add %%dist to release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Jun 2005 01:55:58 -0000	1.4
+++ sources	20 Sep 2005 23:37:16 -0000	1.5
@@ -1 +1 @@
-45ea4e15f135698feb88d12c5000aaf8  ghc-6.4-src.tar.bz2
+fd289bc7c3afa272ff831a71a50b5b00  ghc-6.4.1-src.tar.bz2


--- ghc-6.4-dsforeign-x86_64-1097471.patch DELETED ---


--- ghc-6.4-powerpc.patch DELETED ---


--- ghc-6.4-rts-adjustor-x86_64-1097471.patch DELETED ---


--- rts-GCCompact.h-x86_64.patch DELETED ---