[ghc/el4/master] update to 6.6.1 from fc7
Jens Petersen
petersen at fedoraproject.org
Mon Oct 4 07:02:38 UTC 2010
commit 0e03e10478465c807c4c3bd421069ccaf2e803f2
Author: Jens Petersen <petersen at redhat.com>
Date: Mon Oct 4 17:02:41 2010 +1000
update to 6.6.1 from fc7
.gitignore | 2 +
ghc.spec | 350 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
sources | 6 +-
3 files changed, 330 insertions(+), 28 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a8eef07..517a329 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@ testsuite-6.12.3.tar.bz2
/ghc-6.4.1-1.fc3.x86_64.rpm
/ghc641-6.4.1-1.fc3.i386.rpm
/ghc641-6.4.1-1.fc3.x86_64.rpm
+/ghc-6.6.1-src-extralibs.tar.bz2
+/ghc-6.6.1-src.tar.bz2
diff --git a/ghc.spec b/ghc.spec
index 2e66ef3..d2cd4be 100644
--- a/ghc.spec
+++ b/ghc.spec
@@ -1,17 +1,31 @@
-Name: ghc
-Version: 6.4.1
-Release: 0.el4
-Summary: Glasgow Haskell Compilation system
-License: BSD
-Group: Development/Languages
-Source1: http://archives.fedoraproject.org/pub/archive/fedora/linux/extras/3/i386/ghc-6.4.1-1.fc3.i386.rpm
-Source2: http://archives.fedoraproject.org/pub/archive/fedora/linux/extras/3/i386/ghc641-6.4.1-1.fc3.i386.rpm
-Source3: http://archives.fedoraproject.org/pub/archive/fedora/linux/extras/3/x86_64/ghc-6.4.1-1.fc3.x86_64.rpm
-Source4: http://archives.fedoraproject.org/pub/archive/fedora/linux/extras/3/x86_64/ghc641-6.4.1-1.fc3.x86_64.rpm
-URL: http://haskell.org/ghc/
-Requires: gcc, gmp-devel
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch: %{ix86} x86_64
+%define ghcver ghc661
+
+# speed up test builds by not building profiled libraries
+%define build_prof 0
+%define build_doc 0
+
+Name: ghc
+Version: 6.6.1
+Release: 4%{?dist}
+Summary: Glasgow Haskell Compilation system
+# See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239713
+ExcludeArch: ppc64
+License: BSD style
+Group: Development/Languages
+Source0: http://www.haskell.org/ghc/dist/%{version}/ghc-%{version}-src.tar.bz2
+Source1: http://www.haskell.org/ghc/dist/%{version}/ghc-%{version}-src-extralibs.tar.bz2
+URL: http://haskell.org/ghc/
+Requires: %{ghcver} = %{version}-%{release}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: ghc, sed
+Buildrequires: gmp-devel, readline-devel
+#Buildrequires: libX11-devel, libXt-devel
+#Buildrequires: freeglut-devel, openal-devel
+%if %{build_doc}
+# haddock generates docs in libraries
+Buildrequires: libxslt, docbook-style-xsl, haddock >= 0.8
+%endif
+Prefix: %{_prefix}
%description
GHC is a state-of-the-art programming suite for Haskell, a purely
@@ -23,30 +37,318 @@ collection of libraries, and support for various language
extensions, including concurrency, exceptions, and a foreign language
interface.
+%package -n %{ghcver}
+Summary: Glasgow Haskell Compilation system
+Group: Development/Languages
+Requires: gcc gmp-devel readline-devel
+
+%description -n %{ghcver}
+GHC is a state-of-the-art programming suite for Haskell, a purely
+functional programming language. It includes an optimising compiler
+generating good code for a variety of platforms, together with an
+interactive system for convenient, quick development. The
+distribution includes space and time profiling facilities, a large
+collection of libraries, and support for various language
+extensions, including concurrency, exceptions, and a foreign language
+interfaces.
+
+This package contains all the main files and libraries of version %{version}.
+
+%if %{build_prof}
+%package -n %{ghcver}-prof
+Summary: Profiling libraries for GHC
+Group: Development/Libraries
+Requires: %{ghcver} = %{version}-%{release}
+Obsoletes: ghc-prof
+
+%description -n %{ghcver}-prof
+Profiling libraries for Glorious Glasgow Haskell Compilation System
+(GHC). They should be installed when GHC's profiling subsystem is
+needed.
+%endif
+
+%package doc
+Summary: Documentation for GHC
+Group: Development/Languages
+Requires: %{name}
+
+%description doc
+Preformatted documentation for the Glorious Glasgow Haskell
+Compilation System (GHC) and its libraries. It should be installed if
+you like to have local access to the documentation in HTML format.
+
# the debuginfo subpackage is currently empty anyway, so don't generate it
-%global debug_package %{nil}
+%define debug_package %{nil}
+%define __spec_install_post /usr/lib/rpm/brp-compress
%prep
+%setup -q -n ghc-%{version} -b1
%build
+%if !%{build_prof}
+echo "GhcLibWays=" >> mk/build.mk
+echo "GhcRTSWays=thr debug" >> mk/build.mk
+%endif
+
+./configure --prefix=%{_prefix} --libdir=%{_libdir}
+
+# drop truncated copy of header (#222865)
+rm libraries/network/include/Typeable.h
+
+make all
+%if %{build_doc}
+make html
+%endif
%install
rm -rf $RPM_BUILD_ROOT
-mkdir -p ${RPM_BUILD_ROOT}
-cd ${RPM_BUILD_ROOT}
-mkdir -p .%{_bindir} .%{_libdir} .%{_docdir} .%{_mandir}/man1 .%{_sysconfdir}/rpm
-rpm2cpio ${RPM_SOURCE_DIR}/%{name}-%{version}-1.fc3.%{_arch}.rpm | cpio --extract
-rpm2cpio ${RPM_SOURCE_DIR}/%{name}641-%{version}-1.fc3.%{_arch}.rpm | cpio --extract
+
+make prefix=$RPM_BUILD_ROOT%{_prefix} libdir=$RPM_BUILD_ROOT%{_libdir}/%{name}-%{version} install
+
+%if %{build_doc}
+make mandir=$RPM_BUILD_ROOT%{_mandir} datadir=$RPM_BUILD_ROOT%{_docdir}/ghc-%{version} XMLDocWays="html" install-docs
+%endif
+
+SRC_TOP=$PWD
+rm -f rpm-*-filelist rpm-*.files
+( cd $RPM_BUILD_ROOT
+ find .%{_libdir}/%{name}-%{version} \( -type d -fprintf $SRC_TOP/rpm-dir.files "%%%%dir %%p\n" \) -o \( -type f \( -name '*.p_hi' -o -name '*_p.a' \) -fprint $SRC_TOP/rpm-prof.files \) -o \( -not -name 'package.conf' -fprint $SRC_TOP/rpm-lib.files \)
+)
+
+# make paths absolute (filter "./usr" to "/usr")
+sed -i -e "s|\.%{_prefix}|%{_prefix}|" rpm-*.files
+
+cat rpm-dir.files rpm-lib.files > rpm-base-filelist
+%if %{build_prof}
+cat rpm-dir.files rpm-prof.files > rpm-prof-filelist
+%endif
+
+# create package.conf.old
+touch $RPM_BUILD_ROOT%{_libdir}/ghc-%{version}/package.conf.old
+
%clean
rm -rf $RPM_BUILD_ROOT
+
+%post
+## tweak prefix in drivers scripts if relocating
+if [ "${RPM_INSTALL_PREFIX}" != "%{_prefix}" ]; then
+ BINDIR=`echo %{_bindir} | sed -e "s|%{_prefix}|${RPM_INSTALL_PREFIX}|"`
+ sed -i "s|%{_prefix}|${RPM_INSTALL_PREFIX}|" ${BINDIR}/{ghcprof,hsc2hs}
+fi
+
+/usr/bin/chcon -t unconfined_execmem_exec_t %{_bindir}/{hasktags,runghc,runhaskell} >/dev/null 2>&1 || :
+
+
+%post -n %{ghcver}
+## tweak prefix in drivers scripts if relocating
+if [ "${RPM_INSTALL_PREFIX}" != "%{_prefix}" ]; then
+ BINDIR=`echo %{_bindir} | sed -e "s|%{_prefix}|${RPM_INSTALL_PREFIX}|"`
+ LIBDIR=`echo %{_libdir} | sed -e "s|%{_prefix}|${RPM_INSTALL_PREFIX}|"`
+ sed -i "s|%{_prefix}|${RPM_INSTALL_PREFIX}|" ${BINDIR}/ghc*-%{version} ${LIBDIR}/ghc-%{version}/package.conf
+fi
+
+/usr/bin/chcon -t unconfined_execmem_exec_t %{_libdir}/ghc-%{version}/{ghc-%{version},ghc-pkg.bin,hsc2hs-bin} >/dev/null 2>&1 || :
+
+
%files
%defattr(-,root,root,-)
%{_bindir}/*
-%{_libdir}/*
-%{_docdir}/*
+%exclude %{_bindir}/ghc*%{version}
+%if %{build_doc}
+%doc %{_mandir}/man1/ghc.*
+%endif
+
+
+%files -n %{ghcver} -f rpm-base-filelist
+%defattr(-,root,root,-)
+%doc ANNOUNCE HACKING LICENSE README
+%{_bindir}/ghc*%{version}
+%config(noreplace) %{_libdir}/ghc-%{version}/package.conf
+%ghost %{_libdir}/ghc-%{version}/package.conf.old
+
+
+%if %{build_prof}
+%files -n %{ghcver}-prof -f rpm-prof-filelist
+%defattr(-,root,root,-)
+%endif
+
+
+%if %{build_doc}
+%files doc
+%defattr(-,root,root,-)
+%{_docdir}/%{name}-%{version}
+%endif
+
%changelog
-* Tue Sep 28 2010 Jens Petersen <petersen at redhat.com> - 6.10.1-0.el5
-- bootstrap FE3 ghc bin packages to EPEL 4
+* Mon Oct 4 2010 Jens Petersen <petersen at redhat.com> - 6.6.1-4.el4
+- turn off prof and doc for now
+- drop X, glut, and openal deps temporarily
+
+* Thu May 10 2007 Bryan O'Sullivan <bos at serpentine.com> - 6.6.1-3
+- install man page for ghc
+
+* Thu May 10 2007 Bryan O'Sullivan <bos at serpentine.com> - 6.6.1-2
+- exclude ppc64 for now, due to lack of time to bootstrap
+
+* Wed May 9 2007 Bryan O'Sullivan <bos at serpentine.com> - 6.6.1-1
+- update to 6.6.1 release
+
+* Mon Jan 22 2007 Jens Petersen <petersen at redhat.com> - 6.6-2
+- remove truncated duplicate Typeable.h header in network package
+ (Bryan O'Sullivan, #222865)
+
+* Fri Nov 3 2006 Jens Petersen <petersen at redhat.com> - 6.6-1
+- update to 6.6 release
+- buildrequire haddock >= 0.8
+- fix summary of ghcver package (Michel Salim, #209574)
+
+* Thu Sep 28 2006 Jens Petersen <petersen at redhat.com> - 6.4.2-4
+- turn on docs generation again
+
+* Mon Sep 25 2006 Jens Petersen <petersen at redhat.com> - 6.4.2-3.fc6
+- ghost package.conf.old (Gérard Milmeister)
+- set unconfined_execmem_exec_t context on executables with ghc rts (#195821)
+- turn off building docs until haddock is back
+
+* Sat Apr 29 2006 Jens Petersen <petersen at redhat.com> - 6.4.2-2.fc6
+- buildrequire libXt-devel so that the X11 package and deps get built
+ (Garrett Mitchener, #190201)
+
+* Thu Apr 20 2006 Jens Petersen <petersen at redhat.com> - 6.4.2-1.fc6
+- update to 6.4.2 release
+
+* Thu Mar 2 2006 Jens Petersen <petersen at redhat.com> - 6.4.1-3.fc5
+- 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.fc5
+- 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.fc5
+- 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
+
+* Thu May 12 2005 Jens Petersen <petersen at redhat.com> - 6.4-8
+- initial import into Fedora Extras
+
+* Thu May 12 2005 Jens Petersen <petersen at haskell.org>
+- add build_prof and build_doc switches for -doc and -prof subpackages
+- add _with_gcc32 switch since ghc-6.4 doesn't build with gcc-4.0
+
+* Wed May 11 2005 Jens Petersen <petersen at haskell.org> - 6.4-7
+- make package relocatable (ghc#1084122)
+ - add post install scripts to replace prefix in driver scripts
+- buildrequire libxslt and docbook-style-xsl instead of docbook-utils and flex
+
+* Fri May 6 2005 Jens Petersen <petersen at haskell.org> - 6.4-6
+- add ghc-6.4-dsforeign-x86_64-1097471.patch and
+ ghc-6.4-rts-adjustor-x86_64-1097471.patch from trunk to hopefully fix
+ ffi support on x86_64 (Simon Marlow, ghc#1097471)
+- use XMLDocWays instead of SGMLDocWays to build documentation fully
+
+* Mon May 2 2005 Jens Petersen <petersen at haskell.org> - 6.4-5
+- add rts-GCCompact.h-x86_64.patch to fix GC issue on x86_64 (Simon Marlow)
+
+* Thu Mar 17 2005 Jens Petersen <petersen at haskell.org> - 6.4-4
+- add ghc-6.4-powerpc.patch (Ryan Lortie)
+- disable building interpreter rather than install and delete on x86_64
+
+* Wed Mar 16 2005 Jens Petersen <petersen at haskell.org> - 6.4-3
+- make ghc require ghcver of same ver-rel
+- on x86_64 remove ghci for now since it doesn't work and all .o files
+
+* Tue Mar 15 2005 Jens Petersen <petersen at haskell.org> - 6.4-2
+- ghc requires ghcver (Amanda Clare)
+
+* Sat Mar 12 2005 Jens Petersen <petersen at haskell.org> - 6.4-1
+- 6.4 release
+ - x86_64 build no longer unregisterised
+- use sed instead of perl to tidy filelists
+- buildrequire ghc64 instead of ghc-6.4
+- no epoch for ghc64-prof's ghc64 requirement
+- install docs directly in docdir
+
+* Fri Jan 21 2005 Jens Petersen <petersen at haskell.org> - 6.2.2-2
+- add x86_64 port
+ - build unregistered and without splitobjs
+ - specify libdir to configure and install
+- rename ghc-prof to ghcXYZ-prof, which obsoletes ghc-prof
+
+* Mon Dec 6 2004 Jens Petersen <petersen at haskell.org> - 6.2.2-1
+- move ghc requires to ghcXYZ
+
+* Wed Nov 24 2004 Jens Petersen <petersen at haskell.org> - 6.2.2-0.fdr.1
+- ghc622
+ - provide ghc = %%version
+- require gcc, gmp-devel and readline-devel
+
+* Fri Oct 15 2004 Gerard Milmeister <gemi at bluewin.ch> - 6.2.2-0.fdr.1
+- New Version 6.2.2
+
+* Mon Mar 22 2004 Gerard Milmeister <gemi at bluewin.ch> - 6.2.1-0.fdr.1
+- New Version 6.2.1
+
+* Tue Dec 16 2003 Gerard Milmeister <gemi at bluewin.ch> - 6.2-0.fdr.1
+- New Version 6.2
+
+* Tue Dec 16 2003 Gerard Milmeister <gemi at bluewin.ch> - 6.0.1-0.fdr.3
+- A few minor specfile tweaks
+
+* Mon Dec 15 2003 Gerard Milmeister <gemi at bluewin.ch> - 6.0.1-0.fdr.2
+- Different file list generation
+
+* Mon Oct 20 2003 Gerard Milmeister <gemi at bluewin.ch> - 6.0.1-0.fdr.1
+- First Fedora release
+- Added generated html docs, so that haddock is not needed
+
+* Wed Sep 26 2001 Manuel Chakravarty
+- small changes for 5.04
+
+* Wed Sep 26 2001 Manuel Chakravarty
+- split documentation off into a separate package
+- adapt to new docbook setup in RH7.1
+
+* Mon Apr 16 2001 Manuel Chakravarty
+- revised for 5.00
+- also runs autoconf automagically if no ./configure found
+
+* Thu Jun 22 2000 Sven Panne
+- removed explicit usage of hslibs/docs, it belongs to ghc/docs/set
+
+* Sun Apr 23 2000 Manuel Chakravarty
+- revised for ghc 4.07; added suggestions from Pixel <pixel at mandrakesoft.com>
+- added profiling package
+
+* Tue Dec 7 1999 Manuel Chakravarty
+- version for use from CVS
+
+* Thu Sep 16 1999 Manuel Chakravarty
+- modified for GHC 4.04, patchlevel 1 (no more 62 tuple stuff); minimises use
+ of patch files - instead emits a build.mk on-the-fly
+
+* Sat Jul 31 1999 Manuel Chakravarty
+- modified for GHC 4.04
+
+* Wed Jun 30 1999 Manuel Chakravarty
+- some more improvements from vbzoli
+
+* Fri Feb 26 1999 Manuel Chakravarty
+- modified for GHC 4.02
+
+* Thu Dec 24 1998 Zoltan Vorosbaranyi
+- added BuildRoot
+- files located in /usr/local/bin, /usr/local/lib moved to /usr/bin, /usr/lib
+
+* Tue Jul 28 1998 Manuel Chakravarty
+- original version
diff --git a/sources b/sources
index b2ae2d5..c6966a0 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,2 @@
-3125a63d632c1111a8e337392e794940 ghc-6.4.1-1.fc3.i386.rpm
-761072c2790d157750e83d6a9b27e9de ghc-6.4.1-1.fc3.x86_64.rpm
-c6a54041f186c6c77a331f54382187bb ghc641-6.4.1-1.fc3.i386.rpm
-d0e68458459d84a356f988fb64f11d18 ghc641-6.4.1-1.fc3.x86_64.rpm
+43a26b81608b206c056adc3032f7da2a ghc-6.6.1-src-extralibs.tar.bz2
+dea271503463bd28c27f25ab90998633 ghc-6.6.1-src.tar.bz2
More information about the scm-commits
mailing list