fix handling of ghc's .files with new ghc_lib_subpackage -d option

ghc-rpm-macros.spec

@@ -10,7 +10,7 @@
 #%%global without_hscolour 1
 
 Name:           ghc-rpm-macros
-Version:        1.6.14
+Version:        1.6.15
 Release:        1%{?dist}
 Summary:        RPM macros for building Haskell packages for GHC
 
@@ -147,6 +147,9 @@ EOF
 
 
 %changelog
+* Mon Feb 13 2017 Jens Petersen <petersen@redhat.com> - 1.6.15-1
+- fix handling of ghc's .files with new ghc_lib_subpackage -d option
+
 * Fri Feb 10 2017 Jens Petersen <petersen@redhat.com> - 1.6.14-1
 - if ghc_subpackaging set configure with --user otherwise --global
 

macros.ghc

@@ -117,7 +117,7 @@ install -D --mode=0644 %{pkgnamever}.conf %{buildroot}%{ghclibdir}/package.conf.
 # ghc_lib_build_without_haddock [name] [version]
 %ghc_lib_build_without_haddock()\
 %global debug_package %{nil}\
-%cabal_configure %{!?without_prof:-p} %{!?ghc_without_shared:--enable-shared} %{?ghc_without_shared:--disable-shared} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}-%{version}} %{?1:--docdir=%{?_defaultlicensedir}%{!?_defaultlicensedir:%_docdir}/ghc-%1%{!?fedora:-%2} --htmldir=%{ghclibdocdir}/%1-%2} %{?ghc_subpackaging:--user} %{!?ghc_subpackaging:--global} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci}\
+%cabal_configure %{!?without_prof:-p} %{!?ghc_without_shared:--enable-shared} %{?ghc_without_shared:--disable-shared} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}-%{version}} %{?1:--docdir=%{?_defaultlicensedir}%{!?_defaultlicensedir:%_docdir}/ghc-%1%{!?fedora:-%2} --htmldir=%{ghclibdocdir}/%1-%2} %{?ghc_subpackaging:--user}%{!?ghc_subpackaging:--global} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci}\
 %cabal build  %{?cabal_build_options}\
 %{nil}
 

macros.ghc-extra

@@ -1,8 +1,8 @@
 # RPM Macros for packaging Haskell packages with multiple libs  -*-rpm-spec-*-
 
-# ghc_lib_subpackage [-c cdepslist] [-l licensetag] [-x] [name-version]
+# ghc_lib_subpackage [-c cdepslist] [-d] [-l licensetag] [-x] [name-version]
 # for backward compat also support: ghc_lib_subpackage name version
-%ghc_lib_subpackage(c:l:x)\
+%ghc_lib_subpackage(c:dl:x)\
 %define pkgname %{?2:%{1}}%{!?2:%{lua:\
 local pv = rpm.expand("%1")\
 local _, _, name = string.find(pv, "^([%a-]+)-")\
@@ -51,13 +51,13 @@ This package provides the Haskell %{pkgname} library development files.\
 %postun -n %{basepkg}-devel\
 %ghc_pkg_recache\
 \
-%files -n %{basepkg} -f %{pkgname}-%{pkgver}/%{basepkg}.files\
+%files -n %{basepkg} -f %{!-d:%{pkgname}-%{pkgver}/}%{basepkg}.files\
 %if 0%{?rhel} && 0%{?rhel} < 7\
 %defattr(-,root,root,-)\
 %endif\
 %{?base_doc_files:%doc %base_doc_files}\
 \
-%files -n %{basepkg}-devel -f %{pkgname}-%{pkgver}/%{basepkg}-devel.files\
+%files -n %{basepkg}-devel -f %{!-d:%{pkgname}-%{pkgver}/}%{basepkg}-devel.files\
 %if 0%{?rhel} && 0%{?rhel} < 7\
 %defattr(-,root,root,-)\
 %endif\