fix haddock and manual filelists for no doc or no manual builds

- drop build.mk assignment indents
This commit is contained in:
Jens Petersen 2011-01-13 10:29:27 +09:00
parent 8e04f60166
commit 381ac69fec

View File

@ -27,7 +27,7 @@ Name: ghc
# haskell-platform-2011.1.0.0 # haskell-platform-2011.1.0.0
Version: 7.0.1 Version: 7.0.1
# can't be reset - used by versioned library subpackages # can't be reset - used by versioned library subpackages
Release: 4%{?dist} Release: 5%{?dist}
Summary: Glasgow Haskell Compilation system Summary: Glasgow Haskell Compilation system
# fedora ghc has only been bootstrapped on the following archs: # fedora ghc has only been bootstrapped on the following archs:
ExclusiveArch: %{ix86} x86_64 ppc alpha ExclusiveArch: %{ix86} x86_64 ppc alpha
@ -150,17 +150,17 @@ rm -r ghc-tarballs/libffi
cat > mk/build.mk << EOF cat > mk/build.mk << EOF
GhcLibWays = v %{?with_prof:p} %{?with_shared:dyn} GhcLibWays = v %{?with_prof:p} %{?with_shared:dyn}
%if %{without doc} %if %{without doc}
HADDOCK_DOCS = NO HADDOCK_DOCS = NO
%endif %endif
%if %{without manual} %if %{without manual}
BUILD_DOCBOOK_HTML = NO BUILD_DOCBOOK_HTML = NO
%endif %endif
%if %{with quick} %if %{with quick}
SRC_HC_OPTS = -H64m -O0 -fasm SRC_HC_OPTS = -H64m -O0 -fasm
GhcStage1HcOpts = -O -fasm GhcStage1HcOpts = -O -fasm
GhcStage2HcOpts = -O0 -fasm GhcStage2HcOpts = -O0 -fasm
GhcLibHcOpts = -O0 -fasm GhcLibHcOpts = -O0 -fasm
SplitObjs = NO SplitObjs = NO
%endif %endif
%if %{without hscolour} %if %{without hscolour}
HSCOLOUR_SRCS = NO HSCOLOUR_SRCS = NO
@ -292,25 +292,27 @@ fi
%{ghclibdir}/ghc-split %{ghclibdir}/ghc-split
%{ghclibdir}/ghc-usage.txt %{ghclibdir}/ghc-usage.txt
%{ghclibdir}/ghci-usage.txt %{ghclibdir}/ghci-usage.txt
%{ghclibdir}/haddock
%{ghclibdir}/hsc2hs %{ghclibdir}/hsc2hs
%if %{with doc}
%{ghclibdir}/haddock
%{ghclibdir}/html %{ghclibdir}/html
%{ghclibdir}/latex %{ghclibdir}/latex
%endif
%dir %{ghclibdir}/package.conf.d %dir %{ghclibdir}/package.conf.d
%ghost %{ghclibdir}/package.conf.d/package.cache %ghost %{ghclibdir}/package.conf.d/package.cache
%{ghclibdir}/runghc %{ghclibdir}/runghc
%{ghclibdir}/template-hsc.h %{ghclibdir}/template-hsc.h
%{ghclibdir}/unlit %{ghclibdir}/unlit
%{_mandir}/man1/ghc.* %{_mandir}/man1/ghc.*
%dir %{_docdir}/ghc
%dir %{ghcdocbasedir}
%if %{with doc}
%{ghcdocbasedir}/html
%if %{with manual} %if %{with manual}
%{ghcdocbasedir}/Cabal %{ghcdocbasedir}/Cabal
%{ghcdocbasedir}/haddock %{ghcdocbasedir}/haddock
%{ghcdocbasedir}/users_guide %{ghcdocbasedir}/users_guide
%endif %endif
%dir %{_docdir}/ghc
%dir %{ghcdocbasedir}
%{ghcdocbasedir}/html
%if %{with doc}
%dir %{ghcdocbasedir}/libraries %dir %{ghcdocbasedir}/libraries
%{ghcdocbasedir}/libraries/frames.html %{ghcdocbasedir}/libraries/frames.html
%{ghcdocbasedir}/libraries/gen_contents_index %{ghcdocbasedir}/libraries/gen_contents_index
@ -336,6 +338,9 @@ fi
%endif %endif
%changelog %changelog
* Thu Jan 13 2011 Jens Petersen <petersen@redhat.com> - 7.0.1-5
- fix no doc and no manual builds
* Thu Jan 13 2011 Jens Petersen <petersen@redhat.com> - 7.0.1-4 * Thu Jan 13 2011 Jens Petersen <petersen@redhat.com> - 7.0.1-4
- add BRs for various subpackaged ghc libraries needed to build ghc - add BRs for various subpackaged ghc libraries needed to build ghc
- condition rts .so libraries for non-shared builds - condition rts .so libraries for non-shared builds