rpms/ghc/F-10 ghc-rpm-macros.ghc,1.4,1.5 ghc.spec,1.53,1.54

[Jens Petersen]

Author: petersen

Update of /cvs/extras/rpms/ghc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12758

Modified Files:
	ghc-rpm-macros.ghc ghc.spec 
Log Message:
- cabal_configure does not need redundant --haddockdir
- actually ghc-pkg no longer seems to create package.conf.old backups
- include LICENSE in doc




Index: ghc-rpm-macros.ghc
===================================================================
RCS file: /cvs/extras/rpms/ghc/F-10/ghc-rpm-macros.ghc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ghc-rpm-macros.ghc	23 Oct 2008 02:44:16 -0000	1.4
+++ ghc-rpm-macros.ghc	23 Oct 2008 06:14:14 -0000	1.5
@@ -1,7 +1,7 @@
 %cabal %{_bindir}/runhaskell Setup
 
 %cabal_configure \
-%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_docdir}/%{name}-%{version} --htmldir=%{pkg_docdir} --haddockdir=%{pkg_docdir} --libsubdir='$compiler/$pkgid'
+%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_docdir}/%{name}-%{version} --htmldir=%{pkg_docdir} --libsubdir='$compiler/$pkgid'
 
 %cabal_build \
 %cabal build \


Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/F-10/ghc.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- ghc.spec	23 Oct 2008 05:17:06 -0000	1.53
+++ ghc.spec	23 Oct 2008 06:14:14 -0000	1.54
@@ -16,7 +16,7 @@
 
 Name:		ghc
 Version:	6.8.3
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	Glasgow Haskell Compilation system
 # See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239713
 ExcludeArch:	alpha ppc64
@@ -221,6 +221,9 @@
 
 
 %changelog
+* Thu Oct 23 2008 Jens Petersen <petersen at redhat.com> - 6.8.3-10
+- remove redundant --haddockdir (interfacedir in Cabal-1.2) from cabal_configure
+
 * Thu Oct 23 2008 Jens Petersen <petersen at redhat.com> - 6.8.3-9
 - use gen_contents_index to re-index haddock
 - add %%pkg_docdir to cabal_configure