X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fghc.spec.in;h=6bf7ca5b6ec104c174e6c365d1be8dc450680141;hb=6f4c0cc69493c6a53c06cd58ce5aa99276de8888;hp=5973b0bef97ea5d6544e7565cc7e300fed3420fb;hpb=03aa2ef64390090c64d0fcf81b1050a9f3a4a452;p=ghc-hetmet.git

diff --git a/ghc/ghc.spec.in b/ghc/ghc.spec.in
index 5973b0b..6bf7ca5 100644
--- a/ghc/ghc.spec.in
+++ b/ghc/ghc.spec.in
@@ -1,6 +1,6 @@
-# RPM spec file for GHC
+# RPM spec file for GHC					         -*-rpm-spec-*-
 #
-# Copyright [1998..2001] The GHC Team
+# Copyright [1998..2002] The GHC Team
 #
 # Thanks to Zoltan Vorosbaranyi <vbzoli@vbzo.li> for suggestions in 
 # earlier versions and Pixel <pixel@mandrakesoft.com> for coding tips.
@@ -26,10 +26,10 @@ URL: http://haskell.org/ghc/
 BuildRoot: /var/tmp/ghc-%{version}-%{release}-root
 Requires: gmp-devel
 Provides: haskell
-BuildRequires: happy >= 1.9, ghc >= 4.08, docbook-utils
+BuildRequires: happy >= 1.13, ghc >= 4.08, haddock, docbook-utils
 
 %description
-Haskell is a standard lazy functional programming language; the
+Haskell is the standard purely functional programming language; the
 current language version is Haskell 98, agreed in December 1998.
 
 GHC is a state-of-the-art programming suite for Haskell.  Included is
@@ -48,7 +48,7 @@ Haskell home page at <http://www.haskell.org/>.
 %package prof
 Summary: Profiling libraries for GHC
 Group: Development/Libraries
-Requires: ghc = %{PACKAGE_VERSION}
+Requires: ghc = %{PACKAGE_VERSION}-%{release}
 
 %description prof
 Profiling libraries for Glorious Glasgow Haskell Compilation System (GHC).
@@ -68,6 +68,12 @@ the documentation is available online at
 
 %changelog
 
+* Mon Sep 16 2002 Manuel Chakravarty
+- Use external Haddock installation
+
+* 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
@@ -127,22 +133,9 @@ END
 %build
 ./configure --prefix=%{prefix}
 make boot
-make -C glafp-utils sgmlverb
-make all
-make -C docs ps html
-make -C ghc/docs ps html
-
+make HADDOCK_INPLACE=haddock all ps html
+ 
 %install
-# compress the non-html docs
-#
-for j in docs ghc/docs; do
-  dir=`pwd`
-  cd $j
-  for i in ps dvi sgml verb idx; do
-    find . -name '*.'$i -exec gzip -9 '{}' ';' -print
-  done
-  cd $dir
-done
 rm -rf $RPM_BUILD_ROOT
 
 # FIXME: this is necessary due to brokenness in ghc-5.00/mk/target.mk
@@ -150,6 +143,11 @@ make prefix=$RPM_BUILD_ROOT%{prefix} install-dirs
 
 make prefix=$RPM_BUILD_ROOT%{prefix} install
 
+mkdir -p $RPM_BUILD_ROOT%{prefix}/share/doc/ghc-%{version}
+cp ghc/ANNOUNCE ghc/README $RPM_BUILD_ROOT%{prefix}/share/doc/ghc-%{version}
+
+make prefix=$RPM_BUILD_ROOT%{prefix} datadir=$RPM_BUILD_ROOT%{prefix}/share/doc/ghc-%{version} SGMLDocWays="html ps" install-docs
+
 # generate the file list for lib/ _excluding_ all files needed for profiling
 # only
 #
@@ -166,19 +164,20 @@ cd $RPM_BUILD_ROOT
 libdir=`echo %{prefix}/lib | sed 's|^/||'`
 find $libdir ! -type d ! -name '*.p_hi' ! -name '*_p.a' -print | sed 's|^|/|'\
      >$dir/rpm-noprof-lib-files
+find $libdir ! -type d \( -name '*.p_hi' -or -name '*_p.a' \) -print | sed 's|^|/|'\
+     >$dir/rpm-prof-lib-files
 cd $dir
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files -f rpm-noprof-lib-files
-%doc ghc/ANNOUNCE ghc/README
+%doc %{prefix}/share/doc/ghc-%{version}/ANNOUNCE
+%doc %{prefix}/share/doc/ghc-%{version}/README
 %{prefix}/bin/*
 
-%files prof
-%{prefix}/lib/ghc-%{version}/imports/*/*.p_hi
-%{prefix}/lib/ghc-%{version}/libHS*_p.a
+%files prof -f rpm-prof-lib-files
 
 %files doc
-%doc docs/
-%doc ghc/docs/
+%doc %{prefix}/share/doc/ghc-%{version}/*.ps
+%doc %{prefix}/share/doc/ghc-%{version}/html