template-specs: ghc-package.spec - ghc 6.12 has improved and simpler packag...

[baggins]

Author: baggins                      Date: Fri Aug 27 10:53:18 2010 GMT
Module: template-specs                Tag: HEAD
---- Log message:
- ghc 6.12 has improved and simpler package support

---- Files affected:
template-specs:
   ghc-package.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: template-specs/ghc-package.spec
diff -u template-specs/ghc-package.spec:1.12 template-specs/ghc-package.spec:1.13
--- template-specs/ghc-package.spec:1.12	Fri Apr  9 00:06:04 2010
+++ template-specs/ghc-package.spec	Fri Aug 27 12:53:13 2010
@@ -9,13 +9,13 @@
 Source0:	http://hackage.haskell.org/packages/archive/%{pkgname}/%{version}/%{pkgname}-%{version}.tar.gz
 # Source0-md5:	-
 URL:		http://hackage.haskell.org/package/%{pkgname}/
-BuildRequires:	ghc >= 6.10
+BuildRequires:	ghc >= 6.12.3
 #BuildRequires:	ghc-OTHERMODULE
 %requires_eq	ghc
 #Requires:	ghc-OTHERMODULE
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		libsubdir	ghc-%(/usr/bin/ghc --numeric-version)/%{pkgname}-%{version}
+%define		ghcdir		ghc-%(/usr/bin/ghc --numeric-version)
 
 %description
 
@@ -27,7 +27,6 @@
 	--prefix=%{_prefix} \
 	--libdir=%{_libdir} \
 	--libexecdir=%{_libexecdir} \
-	--libsubdir=%{libsubdir} \
 	--docdir=%{_docdir}/%{name}-%{version}
 
 runhaskell Setup.hs build
@@ -35,6 +34,8 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_libdir}/%{ghcdir}/package.conf.d
+
 runhaskell Setup.hs copy --destdir=$RPM_BUILD_ROOT
 
 # work around automatic haddock docs installation
@@ -42,24 +43,23 @@
 cp -a $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} %{name}-%{version}-doc
 
 runhaskell Setup.hs register \
-	--gen-pkg-config=$RPM_BUILD_ROOT/%{_libdir}/%{libsubdir}/%{pkgname}.conf
+	--gen-pkg-config=$RPM_BUILD_ROOT/%{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/usr/bin/ghc-pkg update %{_libdir}/%{libsubdir}/%{pkgname}.conf
+/usr/bin/ghc-pkg recache
 
 %postun
-if [ "$1" = "0" ]; then
-	/usr/bin/ghc-pkg unregister %{pkgname}-%{version}
-fi
+/usr/bin/ghc-pkg recache
 
 %files
 %defattr(644,root,root,755)
 %doc NEWS
 %doc %{name}-%{version}-doc/html
-%{_libdir}/%{libsubdir}
+%{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -67,6 +67,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2010/08/27 10:53:13  baggins
+- ghc 6.12 has improved and simpler package support
+
 Revision 1.12  2010/04/08 22:06:04  glen
 - docdir
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/template-specs/ghc-package.spec?r1=1.12&r2=1.13&f=u