diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index b8ec7ab..004c7e3 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.15 -Release: 2%{?dist} +Version: 1.6.16 +Release: 1%{?dist} Summary: RPM macros for building Haskell packages for GHC License: GPLv3+ @@ -147,6 +147,9 @@ EOF %changelog +* Wed Feb 22 2017 Jens Petersen - 1.6.16-1 +- fix generation of haddock's + * Tue Feb 14 2017 Jens Petersen - 1.6.15-2 - do not set CFLAGS on ppc64 or ppc64le due to -Wunused-label noise diff --git a/macros.ghc b/macros.ghc index 736febf..2ecf58c 100644 --- a/macros.ghc +++ b/macros.ghc @@ -127,7 +127,7 @@ install -D --mode=0644 %{pkgnamever}.conf %{buildroot}%{ghclibdir}/package.conf. %if %{undefined without_haddock}\ %define pkgname %{?1}%{!?1:%{pkg_name}}\ %define pkgver %{?2}%{!?2:%{version}}\ -if [ -f dist/build/libHS%{pkgname}-%{pkgver}.a ]; then\ +if [ -f dist/build/libHS%{pkgname}-%{pkgver}*.a ]; then\ %cabal haddock --html %{!?without_hscolour:%(if [ -x %{_bindir}/HsColour ]; then echo --hyperlink-source; fi)} --hoogle %{?cabal_haddock_options}\ fi\ %endif\