From 4b3c2433d5ab61566b21fb760f209604004b8c84 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 17 Jan 2015 18:38:55 +0900 Subject: [PATCH] version doc htmldirs again haddock generates versioned cross-links anyway! This reverts commit c7830b0. --- ghc-rpm-macros.spec | 7 +++++-- macros.ghc | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 46699f1..c54751f 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -6,7 +6,7 @@ #%%global without_hscolour 1 Name: ghc-rpm-macros -Version: 1.4.0 +Version: 1.4.1 Release: 1%{?dist} Summary: RPM macros for building packages for GHC @@ -88,6 +88,9 @@ install -p -D -m 0755 %{SOURCE5} %{buildroot}/%{_bindir}/cabal-tweak-flag %changelog +* Sat Jan 17 2015 Jens Petersen - 1.4.1-1 +- revert to versioned doc htmldirs + * Sat Jan 17 2015 Jens Petersen - 1.4.0-1 - enable shared libraries and dynamic linking on all arch's since ghc-7.8 now supports that @@ -103,7 +106,7 @@ install -p -D -m 0755 %{SOURCE5} %{buildroot}/%{_bindir}/cabal-tweak-flag (thanks to Sergei Trofimovich and Ville Skyttä) * Thu Oct 23 2014 Jens Petersen - 1.3.8-1 -- 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 - 1.3.7-1 - ghc.attr needs to handle requires for /usr/bin files too diff --git a/macros.ghc b/macros.ghc index 9039b53..6ae05eb 100644 --- a/macros.ghc +++ b/macros.ghc @@ -44,7 +44,7 @@ LDFLAGS="${LDFLAGS:-%__global_ldflags}"; export LDFLAGS\ %define pkgnamever %{pkgname}-%{pkgver}\ %define basepkg ghc-%{pkgname}\ %define pkgdir %{ghclibdir}/%{pkgnamever}\ -%define docdir %{ghclibdocdir}/%{pkgname}\ +%define docdir %{ghclibdocdir}/%{pkgnamever}\ rm -f %{basepkg}.files %{basepkg}-devel.files\ if [ -d "%{buildroot}%{pkgdir}" ]; then\ echo "%dir %{pkgdir}" >> %{basepkg}.files\ @@ -89,7 +89,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} %{?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\ %{nil}