packages: ghc/ghc.spec - use %ghc_pkg_recache macro with umask; rel 4

[glen]

Author: glen                         Date: Thu Feb 24 10:47:33 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use %ghc_pkg_recache macro with umask; rel 4

---- Files affected:
packages/ghc:
   ghc.spec (1.114 -> 1.115) 

---- Diffs:

================================================================
Index: packages/ghc/ghc.spec
diff -u packages/ghc/ghc.spec:1.114 packages/ghc/ghc.spec:1.115
--- packages/ghc/ghc.spec:1.114	Sun Oct  3 14:12:11 2010
+++ packages/ghc/ghc.spec	Thu Feb 24 11:47:28 2011
@@ -12,12 +12,12 @@
 %bcond_with	bootstrap	# use foreign (non-rpm) ghc to bootstrap (extra 140MB to download)
 %bcond_with	unregistered	# non-registerised interpreter (use for build problems/new arches)
 %bcond_without	doc		# don't build documentation (requires haddock)
-#
+
 Summary:	Glasgow Haskell Compilation system
 Summary(pl.UTF-8):	System kompilacji Glasgow Haskell
 Name:		ghc
 Version:	6.12.3
-Release:	3
+Release:	4
 License:	BSD-like w/o adv. clause
 Group:		Development/Languages
 Source0:	http://darcs.haskell.org/download/dist/%{version}/%{name}-%{version}-src.tar.bz2
@@ -42,7 +42,7 @@
 %{!?with_bootstrap:BuildRequires:	happy >= 1.16}
 BuildRequires:	ncurses-devel
 BuildRequires:	readline-devel
-BuildRequires:	rpmbuild(macros) >= 1.213
+BuildRequires:	rpmbuild(macros) >= 1.607
 BuildRequires:	sed >= 4.0
 %if %{with doc}
 BuildRequires:	dblatex
@@ -56,9 +56,9 @@
 BuildRequires:	texlive-latex-bibtex
 #For generating documentation in PDF: fop or xmltex
 %endif
-Obsoletes:	haddock
-Provides:	haddock
 Suggests:	ghc-haskell-platform
+Provides:	haddock
+Obsoletes:	haddock
 ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -155,8 +155,8 @@
 # An unregisterised build is one that compiles via vanilla C only
 # http://hackage.haskell.org/trac/ghc/wiki/Building/Unregisterised
 cat <<'EOF' >> mk/build.mk
-GhcUnregisterised=YES                                                     
-GhcWithNativeCodeGen=NO                                                   
+GhcUnregisterised=YES
+GhcWithNativeCodeGen=NO
 SplitObjs=NO
 EOF
 %endif
@@ -216,11 +216,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%{_bindir}/ghc-pkg recache
+%ghc_pkg_recache
 
 %postun
 if [ "$1" != 0 ]; then
-	%{_bindir}/ghc-pkg recache
+	%ghc_pkg_recache
 fi
 
 %files
@@ -815,6 +815,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.115  2011/02/24 10:47:28  glen
+- use %ghc_pkg_recache macro with umask; rel 4
+
 Revision 1.114  2010/10/03 12:12:11  glen
 - release 3
 
================================================================

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