From 340d4c8b21e33c7e62925f9cbef6e96a1259cb9a Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 2 Jun 2005 01:55:58 +0000 Subject: [PATCH] revert to non-bootstrap build --- .cvsignore | 3 - Makefile | 4 +- ghc-bootstrap.spec | 231 ------------------------------------ ghc-doc-no-ps-install.patch | 12 -- ghc.spec | 2 +- sources | 3 - 6 files changed, 2 insertions(+), 253 deletions(-) delete mode 100644 ghc-bootstrap.spec delete mode 100644 ghc-doc-no-ps-install.patch diff --git a/.cvsignore b/.cvsignore index cad5ac1..9cbb0e0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -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 diff --git a/Makefile b/Makefile index d6abb41..d85df4e 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/ghc-bootstrap.spec b/ghc-bootstrap.spec deleted file mode 100644 index a5d6f1c..0000000 --- a/ghc-bootstrap.spec +++ /dev/null @@ -1,231 +0,0 @@ -## ghc seeding bootstrap spec file - -%define ghcver ghc64 - -Name: ghc -Version: 6.4 -Release: 1%{?dist} -Summary: Glasgow Haskell Compilation system -License: BSD style -Group: Development/Languages -Source1: http://www.haskell.org/ghc/dist/%{version}/ghc-%{version}-i386-unknown-linux.tar.bz2 -Source2: http://www.haskell.org/ghc/dist/%{version}/ghc-%{version}-ppc-unknown-linux.tar.bz2 -Source3: http://www.haskell.org/ghc/dist/%{version}/ghc-%{version}-x86_64-unknown-linux.tar.bz2 -URL: http://haskell.org/ghc/ -Requires: %{ghcver} = %{version}-%{release} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: sed -Prefix: %{_prefix} -Patch1: ghc-doc-no-ps-install.patch -ExclusiveArch: i386 ppc x86_64 - -%description -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 -interface. - -%package -n %{ghcver} -Summary: Documentation for GHC -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}. - -%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. - -%package doc -Summary: Documentation for GHC -Group: Development/Languages - -%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 -%define debug_package %{nil} -%define __spec_install_post /usr/lib/rpm/brp-compress - -%prep -rm -rf %{name}-%{version} -tar jxf ${RPM_SOURCE_DIR}/%{name}-%{version}-%{_arch}-unknown-linux.tar.bz2 -%setup -T -D -%patch1 -p1 -b .ps - -%build -./configure --prefix=%{_prefix} --libdir=%{_libdir} -make prefix=%{_prefix} libdir=%{_libdir}/%{name}-%{version} - -%install -rm -rf $RPM_BUILD_ROOT - -make prefix=$RPM_BUILD_ROOT%{_prefix} libdir=$RPM_BUILD_ROOT%{_libdir}/%{name}-%{version} datadir=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} htmldir=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} install-dirs install-bin install-libs install-datas install-docs - -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 -cat rpm-dir.files rpm-prof.files > rpm-prof-filelist - -%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 - -%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 - -%files -%defattr(-,root,root,-) -%{_bindir}/* -%exclude %{_bindir}/ghc*%{version} - -%files -n %{ghcver} -f rpm-base-filelist -%defattr(-,root,root,-) -%doc ANNOUNCE LICENSE README -%{_bindir}/ghc*%{version} -%config(noreplace) %{_libdir}/ghc-%{version}/package.conf - -%files -n %{ghcver}-prof -f rpm-prof-filelist -%defattr(-,root,root,-) - -%files doc -%defattr(-,root,root,-) -%{_docdir}/%{name}-%{version} - -%changelog -* Tue May 31 2005 Jens Petersen -- initial seed bootstrap package for Fedora Extras for i386, ppc and x86_64 -- add %%dist to release - -* Thu May 12 2005 Jens Petersen -- add build_prof and build_doc switches for -doc and -prof subpackages - -* Wed May 11 2005 Jens Petersen -- make package relocatable (ghc#1084122) - - add post install scripts to replace prefix in driver scripts - -* Wed Mar 16 2005 Jens Petersen -- make ghc require ghcver of same ver-rel - -* Tue Mar 15 2005 Jens Petersen -- ghc requires ghcver (Amanda Clare) - -* Sat Mar 12 2005 Jens Petersen -- 6.4 release -- use sed instead of perl to tidy filelists -- no epoch for ghc64-prof's ghc64 requirement - -* Fri Jan 21 2005 Jens Petersen - 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 - 6.2.2-1 -- move ghc requires to ghcXYZ - -* Wed Nov 24 2004 Jens Petersen - 6.2.2-0.fdr.1 -- ghc622 - - provide ghc = %%version -- require gcc, gmp-devel and readline-devel - -* Fri Oct 15 2004 Gerard Milmeister - 6.2.2-0.fdr.1 -- New Version 6.2.2 - -* Mon Mar 22 2004 Gerard Milmeister - 6.2.1-0.fdr.1 -- New Version 6.2.1 - -* Tue Dec 16 2003 Gerard Milmeister - 6.2-0.fdr.1 -- New Version 6.2 - -* Tue Dec 16 2003 Gerard Milmeister - 6.0.1-0.fdr.3 -- A few minor specfile tweaks - -* Mon Dec 15 2003 Gerard Milmeister - 6.0.1-0.fdr.2 -- Different file list generation - -* Mon Oct 20 2003 Gerard Milmeister - 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 -- 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/ghc-doc-no-ps-install.patch b/ghc-doc-no-ps-install.patch deleted file mode 100644 index e959aa1..0000000 --- a/ghc-doc-no-ps-install.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- ghc-6.4/Makefile.in~ 2005-03-09 00:01:08.000000000 +0900 -+++ ghc-6.4/Makefile.in 2005-03-12 12:53:02.531724624 +0900 -@@ -274,9 +274,6 @@ - - install-docs : install-dirs-docs - if test -d share/html ; then $(CP) -r share/html/* $(htmldir) ; fi -- for i in share/*.ps; do \ -- $(CP) $$i $(psdir) ; \ -- done - - install-dirs-docs: - $(INSTALL_DIR) $(htmldir) diff --git a/ghc.spec b/ghc.spec index 19c4d6e..d185a2d 100644 --- a/ghc.spec +++ b/ghc.spec @@ -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 diff --git a/sources b/sources index 1fc3de8..39fe85b 100644 --- a/sources +++ b/sources @@ -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