haddock generation failing since f25 ghc-7.10 due to [ -f *.a] failing
This commit is contained in:
parent
7b97799ed4
commit
78b7c8e144
@ -10,8 +10,8 @@
|
||||
#%%global without_hscolour 1
|
||||
|
||||
Name: ghc-rpm-macros
|
||||
Version: 1.6.18
|
||||
Release: 3%{?dist}
|
||||
Version: 1.6.19
|
||||
Release: 1%{?dist}
|
||||
Summary: RPM macros for building Haskell packages for GHC
|
||||
|
||||
License: GPLv3+
|
||||
@ -158,6 +158,9 @@ EOF
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Mar 24 2017 Jens Petersen <petersen@redhat.com> - 1.6.19-1
|
||||
- fix haddock generation
|
||||
|
||||
* Thu Mar 16 2017 Jens Petersen <petersen@redhat.com> - 1.6.18-3
|
||||
- condition obsoletes on fedora version
|
||||
- add f26 obsoletes for cgi and multipart
|
||||
|
@ -128,7 +128,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 [ -n dist/build/libHS%{pkgname}-%{pkgver}*.so ]; then\
|
||||
%cabal haddock --html %{!?without_hscolour:%(if [ -x %{_bindir}/HsColour ]; then echo --hyperlink-source; fi)} --hoogle %{?cabal_haddock_options}\
|
||||
fi\
|
||||
%endif\
|
||||
|
Loading…
Reference in New Issue
Block a user