rpms/ghc/devel .cvsignore, 1.18, 1.19 ghc.spec, 1.97, 1.98 sources, 1.20, 1.21

[Bryan O'Sullivan]

Author: bos

Update of /cvs/extras/rpms/ghc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14008

Modified Files:
	.cvsignore ghc.spec sources 
Log Message:
First attempt at GHC 6.12 RC 1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	22 Jul 2009 04:04:45 -0000	1.18
+++ .cvsignore	12 Oct 2009 01:06:40 -0000	1.19
@@ -1,2 +1 @@
-ghc-6.10.4-src.tar.bz2
-ghc-6.10.4-src-extralibs.tar.bz2
+ghc-6.12.0.20091010-src.tar.bz2


Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- ghc.spec	1 Oct 2009 08:45:50 -0000	1.97
+++ ghc.spec	12 Oct 2009 01:06:41 -0000	1.98
@@ -3,8 +3,6 @@
 %bcond_without prof
 # build users_guide, etc
 %bcond_without manual
-# include extralibs
-%bcond_without extralibs
 
 # experimental
 ## shared libraries support available in ghc >= 6.11
@@ -28,17 +26,14 @@
 
 Name: ghc
 # part of haskell-platform-2009.2.0.2
-Version: 6.10.4
-Release: 2%{?dist}
+Version: 6.12.0.20091010
+Release: 1%{?dist}
 Summary: Glasgow Haskell Compilation system
 # fedora ghc has only been bootstrapped on the following archs:
 ExclusiveArch: %{ix86} x86_64 ppc alpha
 License: BSD
 Group: Development/Languages
 Source0: http://www.haskell.org/ghc/dist/%{version}/ghc-%{version}-src.tar.bz2
-%if %{with extralibs}
-Source1: http://www.haskell.org/ghc/dist/%{version}/ghc-%{version}-src-extralibs.tar.bz2
-%endif
 URL: http://haskell.org/ghc/
 Requires: gcc, gmp-devel
 Requires(post): policycoreutils
@@ -114,7 +109,7 @@ needed.
 %global debug_package %{nil}
 
 %prep
-%setup -q -n %{name}-%{version} %{?with_extralibs:-b1}
+%setup -q -n %{name}-%{version}
 
 %build
 # hack for building a local test package quickly from a prebuilt tree 
@@ -263,6 +258,9 @@ fi
 %endif
 
 %changelog
+* Sun Oct 11 2009 Bryan O'Sullivan <bos at serpentine.com> - 6.12.0.20091010-1
+- Update to 6.12 RC 1
+
 * Thu Oct  1 2009 Jens Petersen <petersen at redhat.com>
 - selinux file context no longer needed in post script
 - (for ghc-6.12-shared) drop ld.so.conf.d files


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	22 Jul 2009 04:04:45 -0000	1.20
+++ sources	12 Oct 2009 01:06:41 -0000	1.21
@@ -1,2 +1 @@
-167687fa582ef6702aaac24e139ec982  ghc-6.10.4-src.tar.bz2
-37ce285617d7cebabc3cf6805bdbca25  ghc-6.10.4-src-extralibs.tar.bz2
+5ca685d5fc1c1d6924656a092f4d9b34  ghc-6.12.0.20091010-src.tar.bz2