From 430e3284006484ac97deb440665b7e3e3dc3bd09 Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Wed, 13 Sep 2017 18:36:31 +0900
Subject: [PATCH] make some macro call args explicit for rpm-4.14 scope change

---
 ghc-rpm-macros.spec | 7 +++++--
 macros.ghc          | 6 +++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index 314c8d0..30702e7 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -10,8 +10,8 @@
 #%%global without_hscolour 1
 
 Name:           ghc-rpm-macros
-Version:        1.6.20
-Release:        2%{?dist}
+Version:        1.7.0
+Release:        1%{?dist}
 Summary:        RPM macros for building Haskell packages for GHC
 
 License:        GPLv3+
@@ -162,6 +162,9 @@ EOF
 
 
 %changelog
+* Wed Sep 13 2017 Jens Petersen <petersen@redhat.com> - 1.7.0-1
+- make some macro call args explicit for rpm-4.14 scope change
+
 * Wed Aug  2 2017 Jens Petersen <petersen@redhat.com>
 - ghc_gen_filelists: check package.conf exists
 
diff --git a/macros.ghc b/macros.ghc
index a64b865..b8ad29d 100644
--- a/macros.ghc
+++ b/macros.ghc
@@ -131,7 +131,7 @@ install -D --mode=0644 %{pkgnamever}.conf %{buildroot}%{ghclibdir}/package.conf.
 
 # ghc_lib_build [name] [version]
 %ghc_lib_build()\
-%ghc_lib_build_without_haddock\
+%ghc_lib_build_without_haddock %{?1} %{?2}\
 %if %{undefined without_haddock}\
 %define pkgname %{?1}%{!?1:%{pkg_name}}\
 %define pkgver %{?2}%{!?2:%{version}}\
@@ -162,8 +162,8 @@ find %{buildroot} -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \
 %{!?_fileattrsdir:%global __find_provides %{_rpmconfigdir}/rpmdeps --provides}\
 %{!?_fileattrsdir:%global __find_requires %{_rpmconfigdir}/ghc-deps.sh %{buildroot}%{ghclibdir}}\
 %cabal_install\
-%cabal_pkg_conf\
-%ghc_gen_filelists\
+%cabal_pkg_conf %{?1} %{?2}\
+%ghc_gen_filelists %{?1} %{?2}\
 %{!?1:%ghc_strip_dynlinked}\
 %{?ghc_subpackaging:%ghc_fix_rpath %{subpkgs}}\
 %{nil}