[ghc-rpm-macros] unversion htmldir's like pkg docdir's; drop ghc_docdir

[Jens Petersen]

commit c7830b0a64495e42c995c91061c36f29a2a81640
Author: Jens Petersen <petersen at redhat.com>
Date:   Tue Aug 27 19:31:45 2013 +0900

    unversion htmldir's like pkg docdir's; drop ghc_docdir

 ghc-rpm-macros.ghc  |    8 +++-----
 ghc-rpm-macros.spec |    6 +++++-
 2 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc
index 4dbfdba..314145a 100644
--- a/ghc-rpm-macros.ghc
+++ b/ghc-rpm-macros.ghc
@@ -21,13 +21,11 @@ fi
 # configure
 %cabal_configure\
 %ghc_check_bootstrap\
-%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{ghc_docdir} --libsubdir='$compiler/$pkgid' --ghc %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?cabal_configure_options} $cabal_configure_extra_options
+%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_pkgdocdir} --libsubdir='$compiler/$pkgid' --ghc %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?cabal_configure_options} $cabal_configure_extra_options
 
 # install
 %cabal_install %cabal copy --destdir=%{buildroot} -v
 
-# F20 has unversioned docdir's
-%ghc_docdir %{_docdir}/%{name}
 # root dir for ghc docs
 %ghcdocbasedir %{_docdir}/ghc/html
 # libraries doc dir
@@ -42,7 +40,7 @@ fi
 %define pkgnamever %{pkgname}-%{pkgver}\
 %define basepkg ghc-%{pkgname}\
 %define pkgdir %{ghclibdir}/%{pkgnamever}\
-%define docdir %{ghclibdocdir}/%{pkgnamever}\
+%define docdir %{ghclibdocdir}/%{pkgname}\
 rm -f %{basepkg}.files %{basepkg}-devel.files\
 if [ -d "%{buildroot}%{pkgdir}" ]; then\
 echo "%dir %{pkgdir}" >> %{basepkg}.files\
@@ -88,7 +86,7 @@ install --mode=0644 %{pkgnamever}.conf %{buildroot}%{ghclibdir}/package.conf.d\
 # 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}-%{version}} %{?1:--docdir=%{_docdir}/ghc-%1 --htmldir=%{ghclibdocdir}/%1-%2} %{!?1:--global} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci} --ghc-option=-O2\
+%cabal_configure %{!?without_prof:-p} %{!?ghc_without_shared:--enable-shared} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}} %{?1:--docdir=%{_docdir}/ghc-%1 --htmldir=%{ghclibdocdir}/%1} %{!?1:--global} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci} --ghc-option=-O2\
 %cabal build\
 %{nil}
 
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index 996515e..2be2ee2 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.0.7
+Version:        1.0.8
 Release:        1%{?dist}
 Summary:        RPM macros for building packages for GHC
 
@@ -90,6 +90,10 @@ EOF
 
 
 %changelog
+* Tue Aug 27 2013 Jens Petersen <petersen at redhat.com> - 1.0.8-1
+- drop ghc_docdir in favor of _pkgdocdir
+- no longer version package htmldirs
+
 * Fri Jul 26 2013 Jens Petersen <petersen at redhat.com> - 1.0.7-1
 - add ghc_docdir for package's docdir since not provided by standard macros