Fixed Cabal/RPM build

4 files changed, 56 insertions, 15 deletions

diff --git a/haddock.cabal b/haddock.cabal
index 7c58faa3..daca9693 100644
--- a/haddock.cabal
+++ b/haddock.cabal
@@ -1,4 +1,4 @@
-name: Haddock
+name: haddock
 cabal-version: >=1.1.4
 version: 0.8
 license: BSD3
@@ -11,11 +11,47 @@ homepage: http://www.haskell.org/haddock/
 synopsis: Haddock is a documentation-generation tool for Haskell libraries
 build-depends: base>=1.0, haskell98>=1.0, mtl>=1.0, network>=1.0
 data-files:
+	html/haddock-DEBUG.css
 	html/haddock.css
 	html/haddock.js
 	html/haskell_icon.gif
 	html/minus.gif
 	html/plus.gif
+extra-source-files:
+	CHANGES
+	README
+	TODO
+	doc/Makefile
+	doc/README
+	doc/aclocal.m4
+	doc/config.mk.in
+	doc/configure.ac
+	doc/docbook-xml.mk
+	doc/fptools.css
+	doc/haddock.xml
+	examples/A.hs
+	examples/B.hs
+	examples/Bug1.hs
+	examples/Bug2.hs
+	examples/Bug3.hs
+	examples/Bug4.hs
+	examples/Bug6.hs
+	examples/Bug7.hs
+	examples/Bug8.hs
+	examples/Bug9.hs
+	examples/Hash.hs
+	examples/Hidden.hs
+	examples/Makefile
+	examples/NoLayout.hs
+	examples/Test.hs
+	examples/Visible.hs
+	examples/hide-bug/A.hs
+	examples/hide-bug/B.hs
+	examples/hide-bug/C.hs
+	examples/hide-bug/D.hs
+	haddock.spec
+	haskell.vim
+	src/haddock.sh
 
 executable: haddock
 hs-source-dirs: src
@@ -30,6 +66,7 @@ other-modules:
 	HaddockDevHelp
 	HaddockHH
 	HaddockHH2
+	HaddockHoogle
 	HaddockHtml
 	HaddockLex
 	HaddockModuleTree
@@ -47,4 +84,3 @@ other-modules:
 	Main
 	Map
 	Set
-
diff --git a/haddock.spec b/haddock.spec
index 1b615351..f74f802e 100644
--- a/haddock.spec
+++ b/haddock.spec
@@ -17,7 +17,7 @@
 # version label of your release tarball.
 
 %define name    haddock
-%define version 0.7
+%define version 0.8
 %define release 1
 
 Name:           %{name}
@@ -26,11 +26,11 @@ Release:        %{release}
 License:        BSD-like
 Group:          Development/Languages/Haskell
 URL:            http://haskell.org/haddock/
-Source:         http://haskell.org/haddock/haddock-%{version}-src.tar.gz
+Source:         http://haskell.org/haddock/haddock-%{version}.tar.gz
 Packager:       Sven Panne <sven.panne@aedion.de>
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Prefix:         %{_prefix}
-BuildRequires:  alex, happy, ghc, docbook-dtd, docbook-xsl-stylesheets, libxslt, libxml2, fop, xmltex, dvips
+BuildRequires:  ghc, docbook-dtd, docbook-xsl-stylesheets, libxslt, libxml2, fop, xmltex, dvips
 Summary:        A documentation tool for annotated Haskell source code
 
 %description
@@ -52,25 +52,30 @@ browser to view it properly (Mozilla, Konqueror, Opera, and IE 6
 should all be ok).
 
 %prep
-%setup -n haddock-%{version}
+%setup
 
 %build
+runhaskell Setup.lhs configure --prefix=%{prefix}
+runhaskell Setup.lhs build
+cd doc
 test -f configure || autoreconf
-./configure --prefix=%{prefix}
-make
+./configure
 make html
 
 %install
-make prefix=${RPM_BUILD_ROOT}%{prefix} install
+runhaskell Setup.lhs copy --destdir=${RPM_BUILD_ROOT}
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
 %files
 %defattr(-,root,root)
-%doc haddock/README
-%doc haddock/doc/haddock
+%doc CHANGES
+%doc LICENSE
+%doc README
+%doc TODO
+%doc doc/haddock
+%doc examples
+%doc haskell.vim
 %{prefix}/bin/haddock
-%{prefix}/bin/haddock-%{version}
-%{prefix}/lib/haddock-%{version}
 %{prefix}/share/haddock-%{version}
diff --git a/src/HaddockVersion.hs b/src/HaddockVersion.hs
index 4cb94271..1cade768 100644
--- a/src/HaddockVersion.hs
+++ b/src/HaddockVersion.hs
@@ -8,7 +8,7 @@ module HaddockVersion (
 	projectName, projectVersion, projectUrl
    ) where
 
-import Paths_Haddock ( version )
+import Paths_haddock ( version )
 import Data.Version ( showVersion )
 
 projectName, projectUrl :: String
diff --git a/src/Main.hs b/src/Main.hs
index e9ffb604..c78836f9 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -24,7 +24,7 @@ import HsSyn
 import Map ( Map )
 import qualified Map hiding ( Map )
 import Set
-import Paths_Haddock	( getDataDir )
+import Paths_haddock	( getDataDir )
 
 import Control.Exception ( bracket )
 import Control.Monad ( when )