[project @ 2005-01-21 18:06:26 by panne]

* Require happy >= 1.15 for build
* Build some needed PostScript docs
* Merge the ghc-doc- sub-package into the ghc sub-package, it's quite
  unusual to find the docs for a package blah under
  /usr/share/doc/packages/blah-doc

diff --git a/ghc/ghc.spec.in b/ghc/ghc.spec.in
index 688ff0b..f397b6e 100644 (file)
--- a/ghc/ghc.spec.in
+++ b/ghc/ghc.spec.in
@@ -22,7 +22,7 @@ Packager:       Sven Panne <sven.panne@aedion.de>
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Prefix:         %{_prefix}
 Requires:       gmp, readline
-BuildRequires:  alex >= 2.0, happy >= 1.14, ghc >= 5, haddock, docbook-dtd, docbook-xsl-stylesheets, libxslt, libxml2, fop, xmltex, dvips, gmp, readline-devel, mesaglut-devel
+BuildRequires:  alex >= 2.0, happy >= 1.15, ghc >= 5, haddock, docbook-dtd, docbook-xsl-stylesheets, libxslt, libxml2, fop, xmltex, dvips, gmp, readline-devel, mesaglut-devel
 Provides:       haskell
 Summary:        The Glasgow Haskell Compiler
 
@@ -77,18 +77,6 @@ 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:          Documentation
-
-%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 PostScript and
-HTML format. Alternatively, the documentation is available online at
-
-  http://haskell.org/ghc/documentation.html
-
 %prep
 %setup
 
@@ -97,6 +85,8 @@ test -f configure || autoreconf
 ./configure --prefix=%{prefix}
 make
 make html
+make -C ghc/docs/ext-core ps
+make -C ghc/docs/storage-mgt ps
  
 %install
 make prefix=${RPM_BUILD_ROOT}%{prefix} install
@@ -125,9 +115,18 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %files -f rpm-noprof-lib-files
 %defattr(-,root,root)
+%doc docs/building/building
+%doc docs/docbook-cheat-sheet/docbook-cheat-sheet
 %doc ghc/ANNOUNCE
 %doc ghc/LICENSE
 %doc ghc/README
+%doc ghc/docs/ext-core/core.ps
+%doc ghc/docs/storage-mgt/ldv.ps
+%doc ghc/docs/storage-mgt/rp.ps
+%doc ghc/docs/storage-mgt/sm.ps
+%doc ghc/docs/users_guide/users_guide
+%doc hslibs/doc/hslibs
+%doc html/*
 %{prefix}/bin/ghc
 %{prefix}/bin/ghc-%{version}
 %{prefix}/bin/ghc-pkg
@@ -143,15 +142,3 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %files prof -f rpm-prof-lib-files
 %defattr(-,root,root)
-
-%files doc
-%defattr(-,root,root)
-%doc docs/building/building
-%doc docs/docbook-cheat-sheet/docbook-cheat-sheet
-%doc ghc/docs/ext-core/core.ps
-%doc ghc/docs/storage-mgt/ldv.ps
-%doc ghc/docs/storage-mgt/rp.ps
-%doc ghc/docs/storage-mgt/sm.ps
-%doc ghc/docs/users_guide/users_guide
-%doc hslibs/doc/hslibs
-%doc html/*