rpms/haddock/devel haddock.spec,1.9,1.10

[Bryan O'Sullivan (bos)]

Author: bos

Update of /cvs/extras/rpms/haddock/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26327

Modified Files:
	haddock.spec 
Log Message:
haddock 2.0.0.0


Index: haddock.spec
===================================================================
RCS file: /cvs/extras/rpms/haddock/devel/haddock.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- haddock.spec	20 Dec 2007 18:19:55 -0000	1.9
+++ haddock.spec	7 Jan 2008 19:17:53 -0000	1.10
@@ -1,6 +1,9 @@
+%define ghc_version 6.8.2
+%define ghcver ghc682
+
 Name:           haddock
-Version:        0.9
-Release:        2%{?dist}
+Version:        2.0.0.0
+Release:        1%{?dist}
 Summary:        Haddock documentation tool for annotated Haskell source code
 
 Group:          Development/Tools
@@ -11,9 +14,23 @@
 
 ExcludeArch:	alpha ppc64
 
-BuildRequires:  ghc >= 6.8.1
+BuildRequires:  ghc = %{ghc_version}
 BuildRequires:  coreutils libxslt docbook-style-xsl autoconf
 
+
+%package -n ghc-%{name}
+Summary:  Libraries for working with Haddock from Haskell code
+Group:    Development/Libraries
+Requires:  ghc = %{ghc_version}
+Requires: %{ghcver}-%{name} = %{version}-%{release}
+
+
+%package -n %{ghcver}-%{name}
+Summary:  Libraries for working with Haddock from Haskell code
+Group:    Development/Libraries
+Requires: %{ghcver}
+
+
 %description
 Haddock is a tool for automatically generating hyperlinked documentation from
 annotated Haskell source code. It is primary intended for documenting
@@ -22,6 +39,12 @@
 Haddock lets you write documentation annotations next to the definitions of
 functions and types in the source code in a lightweight syntax.
 
+%description -n ghc-%{name}
+Libraries for working with Haddock from Haskell code.
+
+%description -n %{ghcver}-%{name}
+Libraries for working with Haddock from Haskell code.
+
 
 # don't generate an empty debuginfo subpackage
 %define debug_package %{nil}
@@ -34,7 +57,8 @@
 
 %build
 runhaskell Setup.lhs configure --prefix=%{_prefix} --libdir=%{_libdir} \
-  --datadir=%{_datadir} --docdir=%{_docdir} --htmldir=%{_docdir}
+  --datadir=%{_datadir} --docdir=%{_docdir} --htmldir=%{_docdir} \
+  --libsubdir='$compiler/$pkgid'
 runhaskell Setup.lhs build
 cd doc
 test -f configure || autoreconf
@@ -55,6 +79,15 @@
 /usr/bin/chcon -t unconfined_execmem_exec_t %{_libexecdir}/haddock.bin >/dev/null 2>&1 || :
 
 
+%files -n ghc-%{name}
+%defattr(-,root,root)
+
+
+%files -n %{ghcver}-%{name}
+%defattr(-,root,root)
+%{_libdir}/ghc-%{ghc_version}/%{name}-%{version}
+
+
 %files
 %defattr(-,root,root)
 %doc CHANGES LICENSE README TODO
@@ -64,6 +97,9 @@
 
 
 %changelog
+* Mon Jan  7 2008 Bryan O'Sullivan <bos at serpentine.com> - 2.0.0.0-1
+- Update to 2.0.0.0, add library packages
+
 * Thu Dec 20 2007 Bryan O'Sullivan <bos at serpentine.com> - 0.9-2
 - Exclude alpha, ppc64