rpms/haddock/F-8 haddock.spec,1.7,1.8

[Bryan O'Sullivan (bos)]

Author: bos

Update of /cvs/extras/rpms/haddock/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3693

Modified Files:
	haddock.spec 
Log Message:
haddock 0.9


Index: haddock.spec
===================================================================
RCS file: /cvs/extras/rpms/haddock/F-8/haddock.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- haddock.spec	16 Aug 2007 07:17:07 -0000	1.7
+++ haddock.spec	20 Dec 2007 18:12:16 -0000	1.8
@@ -1,17 +1,16 @@
 Name:           haddock
-Version:        0.8
+Version:        0.9
 Release:        1%{?dist}
 Summary:        Haddock documentation tool for annotated Haskell source code
 
 Group:          Development/Tools
 License:        BSD
 URL:            http://www.haskell.org/haddock/
-Source0:        http://www.haskell.org/haddock/%{name}-%{version}-src.tar.gz
+Source0:        http://www.haskell.org/haddock/dist/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  ghc libxslt docbook-style-xsl autoconf
-# need chcon
-PreReq:		coreutils
+BuildRequires:  ghc >= 6.8.1
+BuildRequires:  coreutils libxslt docbook-style-xsl autoconf
 
 %description
 Haddock is a tool for automatically generating hyperlinked documentation from
@@ -32,7 +31,8 @@
 
 
 %build
-runhaskell Setup.lhs configure --prefix=%{_prefix} --libdir=%{_libdir}
+runhaskell Setup.lhs configure --prefix=%{_prefix} --libdir=%{_libdir} \
+  --datadir=%{_datadir} --docdir=%{_docdir} --htmldir=%{_docdir}
 runhaskell Setup.lhs build
 cd doc
 test -f configure || autoreconf
@@ -43,7 +43,7 @@
 %install
 rm -rf ${RPM_BUILD_ROOT}
 runhaskell Setup.lhs copy --destdir=${RPM_BUILD_ROOT}
-
+rm ${RPM_BUILD_ROOT}/%{_docdir}/LICENSE
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -55,13 +55,16 @@
 
 %files
 %defattr(-,root,root)
-%doc README
+%doc CHANGES LICENSE README TODO
 %doc doc/haddock/*
 %{_bindir}/haddock
 %{_datadir}/haddock-%{version}
 
 
 %changelog
+* Thu Dec 20 2007 Bryan O'Sullivan <bos at serpentine.com> - 0.9-1
+- update to 0.9
+
 * Thu Aug 16 2007 Jens Petersen <petersen at redhat.com>
 - update License field