rpms/haddock/devel haddock.spec, 1.16, 1.17 haddock-2.4.1-no-ghc-paths.patch, 1.1, NONE

[Jens Petersen]

Author: petersen

Update of /cvs/extras/rpms/haddock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20151

Modified Files:
	haddock.spec 
Removed Files:
	haddock-2.4.1-no-ghc-paths.patch 
Log Message:
- buildrequire ghc-paths
- no longer need haddock-2.4.1-no-ghc-paths.patch




Index: haddock.spec
===================================================================
RCS file: /cvs/extras/rpms/haddock/devel/haddock.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- haddock.spec	15 Dec 2008 05:29:57 -0000	1.16
+++ haddock.spec	23 Dec 2008 01:59:08 -0000	1.17
@@ -7,7 +7,7 @@
 
 Name:           haddock
 Version:        2.4.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Haskell Documentation tool
 
 Group:          Development/Tools
@@ -18,12 +18,12 @@
 # ghc has only been bootstrapped on the following archs:
 ExclusiveArch:	i386 x86_64 ppc
 BuildRequires:  ghc = %{ghc_version}
-# currently workaround this with patch below
-#Buildrequires:  ghc-paths
+Buildrequires:  ghc-paths-devel
+# for profiling
+BuildRequires:  ghc-prof = %{ghc_version}
+BuildRequires:  ghc-paths-prof
 # for doc/
 BuildRequires:  libxslt, docbook-style-xsl, autoconf
-BuildRequires:  ghc-prof = %{ghc_version}
-Patch1:         haddock-2.4.1-no-ghc-paths.patch
 
 %description
 Haddock is a tool for automatically generating hyperlinked documentation from
@@ -57,9 +57,7 @@
 
 %prep
 %setup -q
-# temporary hacks until ghc-paths is available
-%patch1 -p1 -b .ghc-paths
-sed -i.orig -e "s!@GHCLIBDIR@!%{_libdir}/ghc-%{ghc_version}!" src/Main.hs
+
 
 %build
 %cabal_configure --ghc -p
@@ -123,6 +121,10 @@
 
 
 %changelog
+* Tue Dec 23 2008 Jens Petersen <petersen at redhat.com> - 2.4.1-2
+- buildrequire ghc-paths
+- no longer need haddock-2.4.1-no-ghc-paths.patch
+
 * Mon Dec 15 2008 Jens Petersen <petersen at redhat.com> - 2.4.1-1
 - update to 2.4.1 release needed for gtk2hs
 - update source url


--- haddock-2.4.1-no-ghc-paths.patch DELETED ---