version doc htmldirs and ghcpkgdocdir again; fix cabal-tweak-flag string
version because haddock generates versioned crosslinks new aliases: %ghc_html_dir, %ghc_html_libraries_dir, and %ghc_html_pkg_dir
This commit is contained in:
parent
3df2d9cc3c
commit
28cbb65983
@ -29,7 +29,7 @@ if [ $(echo $CABALFILE | wc -w) -ne 1 ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if ! grep -q -i "^flag *$FLAG" $CABALFILE; then
|
if ! grep -q -i "^flag *$FLAG" $CABALFILE; then
|
||||||
echo "$CABALFILE does have flag $FLAG"
|
echo "$CABALFILE does not have flag $FLAG"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
#%%global without_hscolour 1
|
#%%global without_hscolour 1
|
||||||
|
|
||||||
Name: ghc-rpm-macros
|
Name: ghc-rpm-macros
|
||||||
Version: 1.2.18
|
Version: 1.2.19
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: RPM macros for building packages for GHC
|
Summary: RPM macros for building packages for GHC
|
||||||
|
|
||||||
@ -102,6 +102,12 @@ EOF
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jan 22 2015 Jens Petersen <petersen@redhat.com> - 1.2.19-1
|
||||||
|
- version ghcpkgdocdir
|
||||||
|
- add new names ghc_html_dir, ghc_html_libraries_dir, and ghc_html_pkg_dir
|
||||||
|
- correct cabal-tweak-flag error message for missing flag (#1184508)
|
||||||
|
- revert to versioned doc htmldirs
|
||||||
|
|
||||||
* Mon Jan 19 2015 Jens Petersen <petersen@redhat.com> - 1.2.18-1
|
* Mon Jan 19 2015 Jens Petersen <petersen@redhat.com> - 1.2.18-1
|
||||||
- exclude -Wall from CFLAGS to prevent Cabal configure warning with ghc-7.6
|
- exclude -Wall from CFLAGS to prevent Cabal configure warning with ghc-7.6
|
||||||
(#1175667)
|
(#1175667)
|
||||||
@ -111,7 +117,7 @@ EOF
|
|||||||
- require ghc-compiler for ghc_version
|
- require ghc-compiler for ghc_version
|
||||||
- macros.ghc: cabal_configure now passes CFLAGS and LDFLAGS to ghc (#1138982)
|
- macros.ghc: cabal_configure now passes CFLAGS and LDFLAGS to ghc (#1138982)
|
||||||
(thanks to Sergei Trofimovich and Ville Skyttä)
|
(thanks to Sergei Trofimovich and Ville Skyttä)
|
||||||
- ghc-deps.sh: support ghc-pkg for ghc build <= 7.4.2 as well
|
- ghc-deps.sh: support ghc-pkg for ghc builds <= 7.4.2 as well
|
||||||
|
|
||||||
* Thu Oct 16 2014 Jens Petersen <petersen@redhat.com> - 1.2.16-1
|
* Thu Oct 16 2014 Jens Petersen <petersen@redhat.com> - 1.2.16-1
|
||||||
- ghc.attr needs to handle requires for /usr/bin files too
|
- ghc.attr needs to handle requires for /usr/bin files too
|
||||||
|
19
macros.ghc
19
macros.ghc
@ -28,12 +28,21 @@ LDFLAGS="${LDFLAGS:-%__global_ldflags}"; export LDFLAGS\
|
|||||||
# install
|
# install
|
||||||
%cabal_install %cabal copy --destdir=%{buildroot} -v
|
%cabal_install %cabal copy --destdir=%{buildroot} -v
|
||||||
|
|
||||||
# root dir for ghc docs
|
# root dir for ghc docs (used by ghc.spec)
|
||||||
|
%ghc_html_dir %{_docdir}/ghc/html
|
||||||
|
# deprecates
|
||||||
%ghcdocbasedir %{_docdir}/ghc/html
|
%ghcdocbasedir %{_docdir}/ghc/html
|
||||||
# libraries doc dir
|
|
||||||
|
# libraries doc dir (internal)
|
||||||
|
%ghc_html_libraries_dir %{ghc_html_dir}/libraries
|
||||||
|
# deprecates
|
||||||
%ghclibdocdir %{ghcdocbasedir}/libraries
|
%ghclibdocdir %{ghcdocbasedir}/libraries
|
||||||
|
|
||||||
# pkg doc dir
|
# pkg doc dir
|
||||||
%ghcpkgdocdir %{ghcdocbasedir}/libraries/%{pkg_name}
|
%ghc_html_pkg_dir %{ghc_html_libraries_dir}/%{pkg_name}-%{version}
|
||||||
|
# deprecates
|
||||||
|
%ghcpkgdocdir %{ghclibdocdir}/%{pkg_name}-%{version}
|
||||||
|
|
||||||
# top library dir
|
# top library dir
|
||||||
%ghclibdir %{_libdir}/ghc-%{ghc_version}
|
%ghclibdir %{_libdir}/ghc-%{ghc_version}
|
||||||
|
|
||||||
@ -44,7 +53,7 @@ LDFLAGS="${LDFLAGS:-%__global_ldflags}"; export LDFLAGS\
|
|||||||
%define pkgnamever %{pkgname}-%{pkgver}\
|
%define pkgnamever %{pkgname}-%{pkgver}\
|
||||||
%define basepkg ghc-%{pkgname}\
|
%define basepkg ghc-%{pkgname}\
|
||||||
%define pkgdir %{ghclibdir}/%{pkgnamever}\
|
%define pkgdir %{ghclibdir}/%{pkgnamever}\
|
||||||
%define docdir %{ghclibdocdir}/%{pkgname}\
|
%define docdir %{ghclibdocdir}/%{pkgnamever}\
|
||||||
rm -f %{basepkg}.files %{basepkg}-devel.files\
|
rm -f %{basepkg}.files %{basepkg}-devel.files\
|
||||||
if [ -d "%{buildroot}%{pkgdir}" ]; then\
|
if [ -d "%{buildroot}%{pkgdir}" ]; then\
|
||||||
echo "%dir %{pkgdir}" >> %{basepkg}.files\
|
echo "%dir %{pkgdir}" >> %{basepkg}.files\
|
||||||
@ -89,7 +98,7 @@ install -D --mode=0644 %{pkgnamever}.conf %{buildroot}%{ghclibdir}/package.conf.
|
|||||||
# ghc_lib_build_without_haddock [name] [version]
|
# ghc_lib_build_without_haddock [name] [version]
|
||||||
%ghc_lib_build_without_haddock()\
|
%ghc_lib_build_without_haddock()\
|
||||||
%global debug_package %{nil}\
|
%global debug_package %{nil}\
|
||||||
%cabal_configure %{!?without_prof:-p} %{!?ghc_without_shared:--enable-shared} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}} %{?1:--docdir=%{_docdir}/ghc-%1%{!?fedora:-%2} --htmldir=%{ghclibdocdir}/%1} %{!?1:--global} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci}\
|
%cabal_configure %{!?without_prof:-p} %{!?ghc_without_shared:--enable-shared} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}-%{version}} %{?1:--docdir=%{_docdir}/ghc-%1%{!?fedora:-%2} --htmldir=%{ghclibdocdir}/%1-%2} %{!?1:--global} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci}\
|
||||||
%cabal build\
|
%cabal build\
|
||||||
%{nil}
|
%{nil}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user