X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fghc.spec.in;h=87dc6e905ae5ffe91b08b9caa6d47f06363d43f1;hb=c88a984f05a4f93c1086a95a49c109b5c29867b6;hp=8f8a373bc62f96eb2d56cc88483bdd7493ea285e;hpb=6aacb92729ab8889ed35c7e13af0fe4402da40c9;p=ghc-hetmet.git

diff --git a/ghc/ghc.spec.in b/ghc/ghc.spec.in
index 8f8a373..87dc6e9 100644
--- a/ghc/ghc.spec.in
+++ b/ghc/ghc.spec.in
@@ -8,7 +8,7 @@
 # This file is subject to the same free software license as GHC.
 
 %define name    ghc
-%define version @version@
+%define version @ProjectVersion@
 %define release @release@
 
 Name:           %{name}
@@ -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
+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,26 +77,16 @@ 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
 
 %build
 test -f configure || autoreconf
-./configure --prefix=%{prefix} --enable-hopengl
+./configure --prefix=%{prefix}
 make
-make ps html
+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,19 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %files -f rpm-noprof-lib-files
 %defattr(-,root,root)
+%doc docs/docbook-cheat-sheet/docbook-cheat-sheet
 %doc ghc/ANNOUNCE
 %doc ghc/LICENSE
 %doc ghc/README
+%doc ghc/docs/building/building
+%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/*
+%doc libraries/Cabal/doc/Cabal
 %{prefix}/bin/ghc
 %{prefix}/bin/ghc-%{version}
 %{prefix}/bin/ghc-pkg
@@ -139,23 +139,8 @@ rm -rf ${RPM_BUILD_ROOT}
 %{prefix}/bin/hp2ps
 %{prefix}/bin/hsc2hs
 %{prefix}/bin/runghc
+%{prefix}/bin/runhaskell
 %{prefix}/bin/stat2resid
 
 %files prof -f rpm-prof-lib-files
 %defattr(-,root,root)
-
-%files doc
-%defattr(-,root,root)
-%doc docs/building/building
-%doc docs/building/building.ps
-%doc docs/docbook-cheat-sheet/docbook-cheat-sheet
-%doc docs/docbook-cheat-sheet/docbook-cheat-sheet.ps
-%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 ghc/docs/users_guide/users_guide.ps
-%doc hslibs/doc/hslibs
-%doc hslibs/doc/hslibs.ps
-%doc html/*