[ghc-rpm-macros] for ghc-7.6 use --global-package-db and --no-user-package-db

[Jens Petersen]

commit 6910d07de702efed342d7f73b4554a18925e9136
Author: Jens Petersen <petersen at redhat.com>
Date:   Tue Apr 23 20:09:58 2013 +0900

    for ghc-7.6 use --global-package-db and --no-user-package-db

 ghc-deps.sh         |    2 +-
 ghc-rpm-macros.ghc  |    4 ++--
 ghc-rpm-macros.spec |    2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/ghc-deps.sh b/ghc-deps.sh
index 761cb5f..2725cf7 100755
--- a/ghc-deps.sh
+++ b/ghc-deps.sh
@@ -14,7 +14,7 @@ PKGCONFDIR=$PKGBASEDIR/package.conf.d
 GHC_VER=$(basename $PKGBASEDIR | sed -e s/ghc-//)
 
 if [ ! -x "/usr/bin/ghc-pkg-${GHC_VER}" -a -x "$PKGBASEDIR/ghc-pkg" ]; then
-    GHC_PKG="$PKGBASEDIR/ghc-pkg --global-conf=$PKGCONFDIR"
+    GHC_PKG="$PKGBASEDIR/ghc-pkg --global-package-db=$PKGCONFDIR"
 else
     GHC_PKG="/usr/bin/ghc-pkg"
 fi
diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc
index 428b682..510e9de 100644
--- a/ghc-rpm-macros.ghc
+++ b/ghc-rpm-macros.ghc
@@ -2,7 +2,7 @@
 # see https://fedoraproject.org/wiki/Packaging:Haskell for more details
 
 # "cabal"
-%cabal [ -x Setup ] || ghc --make %{!?ghc_user_conf:-no-user-package-conf} %{!?ghc_without_dynamic:-dynamic} Setup\
+%cabal [ -x Setup ] || ghc --make %{!?ghc_user_conf:--no-user-package-db} %{!?ghc_without_dynamic:-dynamic} Setup\
 ./Setup
 
 # check ghc version was rebuilt against self
@@ -83,7 +83,7 @@ Requires(post): ghc-compiler = %{ghc_version}\
 Requires(postun): ghc-compiler = %{ghc_version}\
 Requires:       ghc-%{?pkg_name}%{!?pkg_name:%{pkgname}} = %{?pkgver}%{!?pkgver:%{version}}-%{release}
 
-%ghc_pkg_recache %{_bindir}/ghc-pkg recache --no-user-package-conf || :
+%ghc_pkg_recache %{_bindir}/ghc-pkg recache --no-user-package-db || :
 
 # ghc_strip_dynlinked
 %ghc_strip_dynlinked\
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index c7700b1..3256865 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -96,6 +96,8 @@ EOF
 - move spec section metamacros and multiple library packaging macros still
   needed for ghc and haskell-platform to new extra subpackage
 - drop ghc_add_basepkg_file macro and ghc_exclude_docdir
+- for ghc-7.6 --global-package-db replaces --global-conf and
+  --no-user-package-db deprecates --no-user-package-conf
 
 * Wed Mar 20 2013 Ralf Corsépius <corsepiu at fedoraproject.org> - 0.98.1-4
 - Remove %%config from %%{_sysconfdir}/rpm/macros.*