Author: petersen
Update of /cvs/extras/rpms/ghc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16563
Modified Files: .cvsignore Makefile ghc.spec sources Removed Files: ghc-bootstrap.spec ghc-doc-no-ps-install.patch Log Message: revert to non-bootstrap build
Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ghc/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 31 May 2005 11:04:47 -0000 1.3 +++ .cvsignore 2 Jun 2005 01:55:58 -0000 1.4 @@ -1,4 +1 @@ ghc-6.4-src.tar.bz2 -ghc-6.4-i386-unknown-linux.tar.bz2 -ghc-6.4-x86_64-unknown-linux.tar.bz2 -ghc-6.4-ppc-unknown-linux.tar.bz2
Index: Makefile =================================================================== RCS file: /cvs/extras/rpms/ghc/devel/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 31 May 2005 11:04:47 -0000 1.2 +++ Makefile 2 Jun 2005 01:55:58 -0000 1.3 @@ -1,9 +1,7 @@ # Makefile for source rpm: ghc # $Id$ NAME := ghc -#SPECFILE = $(firstword $(wildcard *.spec)) -# for bootstrap -SPECFILE = ghc-bootstrap.spec +SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
Index: ghc.spec =================================================================== RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ghc.spec 31 May 2005 11:04:47 -0000 1.5 +++ ghc.spec 2 Jun 2005 01:55:58 -0000 1.6 @@ -10,7 +10,7 @@
Name: ghc Version: 6.4 -Release: 8%{dist} +Release: 8%{?dist} Summary: Glasgow Haskell Compilation system License: BSD style Group: Development/Languages
Index: sources =================================================================== RCS file: /cvs/extras/rpms/ghc/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 31 May 2005 11:04:47 -0000 1.3 +++ sources 2 Jun 2005 01:55:58 -0000 1.4 @@ -1,4 +1 @@ 45ea4e15f135698feb88d12c5000aaf8 ghc-6.4-src.tar.bz2 -89aaed2c09667f25a1777012a42200c7 ghc-6.4-i386-unknown-linux.tar.bz2 -6ad2f7df7f55e8cfec0504384bf664ea ghc-6.4-x86_64-unknown-linux.tar.bz2 -1400a1c158b07821f81ee5e4a7433b91 ghc-6.4-ppc-unknown-linux.tar.bz2
--- ghc-bootstrap.spec DELETED ---
--- ghc-doc-no-ps-install.patch DELETED ---