packages (DEVEL): ghc/ghc.spec, ghc/ghc-pkgdir.patch (NEW) - try setting sa...

[baggins]

Author: baggins                      Date: Thu Aug 26 19:33:01 2010 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- try setting sane packege install directory

---- Files affected:
packages/ghc:
   ghc.spec (1.105.2.3 -> 1.105.2.4) , ghc-pkgdir.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/ghc/ghc.spec
diff -u packages/ghc/ghc.spec:1.105.2.3 packages/ghc/ghc.spec:1.105.2.4
--- packages/ghc/ghc.spec:1.105.2.3	Sun Aug 22 15:26:07 2010
+++ packages/ghc/ghc.spec	Thu Aug 26 21:32:55 2010
@@ -17,7 +17,7 @@
 Summary(pl.UTF-8):	System kompilacji Glasgow Haskell
 Name:		ghc
 Version:	6.12.3
-Release:	0.1
+Release:	0.2
 License:	BSD-like w/o adv. clause
 Group:		Development/Languages
 Source0:	http://darcs.haskell.org/download/dist/%{version}/%{name}-%{version}-src.tar.bz2
@@ -29,6 +29,7 @@
 # Source4-md5:	d58e5a50d8b120ac933afbd10a773aef
 %endif
 Patch0:		%{name}-pld.patch
+Patch1:		%{name}-pkgdir.patch
 URL:		http://haskell.org/ghc/
 BuildRequires:	OpenAL-devel
 BuildRequires:	OpenGL-GLU-devel
@@ -126,6 +127,7 @@
 mv %{name}-%{version} binsrc
 %endif
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__autoconf}
@@ -212,6 +214,9 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+ghc-pkg recache
+
 %files
 %defattr(644,root,root,755)
 %doc ANNOUNCE README
@@ -804,6 +809,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.105.2.4  2010/08/26 19:32:55  baggins
+- try setting sane packege install directory
+
 Revision 1.105.2.3  2010/08/22 13:26:07  baggins
 - updated files
 - properly (don't) package profile libraries

================================================================
Index: packages/ghc/ghc-pkgdir.patch
diff -u /dev/null packages/ghc/ghc-pkgdir.patch:1.1
--- /dev/null	Thu Aug 26 21:33:01 2010
+++ packages/ghc/ghc-pkgdir.patch	Thu Aug 26 21:32:55 2010
@@ -0,0 +1,20 @@
+--- ghc-6.12.3/libraries/Cabal/Distribution/Simple/InstallDirs.hs~	2010-06-09 20:10:19.000000000 +0200
++++ ghc-6.12.3/libraries/Cabal/Distribution/Simple/InstallDirs.hs	2010-08-26 21:28:52.969002660 +0200
+@@ -205,7 +205,7 @@
+ -- users to be able to configure @--libdir=\/usr\/lib64@ for example but
+ -- because by default we want to support installing multiple versions of
+ -- packages and building the same package for multiple compilers we append the
+--- libsubdir to get: @\/usr\/lib64\/$pkgid\/$compiler at .
++-- libsubdir to get: @\/usr\/lib64\/$compiler\/$pkgid at .
+ --
+ -- An additional complication is the need to support relocatable packages on
+ -- systems which support such things, like Windows.
+@@ -236,7 +236,7 @@
+            Hugs   -> "hugs" </> "packages" </> "$pkg"
+            JHC    -> "$compiler"
+            LHC    -> "$compiler"
+-           _other -> "$pkgid" </> "$compiler",
++           _other -> "$compiler" </> "$pkgid",
+       dynlibdir    = "$libdir",
+       libexecdir   = case buildOS of
+         Windows   -> "$prefix" </> "$pkgid"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ghc/ghc.spec?r1=1.105.2.3&r2=1.105.2.4&f=u