rpms/haddock/devel haddock.spec,1.12,1.13

[Jens Petersen (petersen)]

Author: petersen

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

Modified Files:
	haddock.spec 
Log Message:
- obsolete ghc682-haddock
- add haddock-2.0.0.0-ghc683-process.patch to fix build with ghc-6.8.3



Index: haddock.spec
===================================================================
RCS file: /cvs/extras/rpms/haddock/devel/haddock.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- haddock.spec	23 Jun 2008 06:18:04 -0000	1.12
+++ haddock.spec	26 Jun 2008 05:12:44 -0000	1.13
@@ -15,6 +15,7 @@
 
 BuildRequires:  ghc = %{ghc_version}
 BuildRequires:  coreutils libxslt docbook-style-xsl autoconf
+Patch1:		haddock-2.0.0.0-ghc683-process.patch
 
 %description
 Haddock is a tool for automatically generating hyperlinked documentation from
@@ -29,6 +30,7 @@
 Summary:  Libraries for working with Haddock from Haskell code
 Group:    Development/Libraries
 Requires:  ghc = %{ghc_version}
+Obsoletes: ghc682-haddock < 2.0.0.0-3
 
 %description -n ghc-%{name}
 Libraries for working with Haddock from Haskell code.
@@ -41,6 +43,7 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .1-ghc682~
 
 
 %build
@@ -81,8 +84,10 @@
 
 
 %changelog
-* Mon Jun 23 2008 Jens Petersen <petersen at redhat.com> - 2.0.0.0-3
+* Thu Jun 26 2008 Jens Petersen <petersen at redhat.com> - 2.0.0.0-3.fc10
 - drop ghcver subpackage in line with ghc
+- obsolete ghc682-haddock
+- add haddock-2.0.0.0-ghc683-process.patch to fix build with ghc-6.8.3
 
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.0.0.0-2
 - Autorebuild for GCC 4.3