diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc index 97317bb..a3c4f94 100644 --- a/ghc-rpm-macros.ghc +++ b/ghc-rpm-macros.ghc @@ -21,7 +21,7 @@ fi # configure %cabal_configure\ %ghc_check_bootstrap\ -%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_docdir}/%{name}-%{version} --libsubdir='$compiler/$pkgid' --ghc %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?cabal_configure_options} $cabal_configure_extra_options +%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_docdir}/%{name} --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 diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 71a65d4..b8c91a2 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.4 +Version: 1.0.5 Release: 1%{?dist} Summary: RPM macros for building packages for GHC @@ -89,6 +89,9 @@ EOF %changelog +* Fri Jul 26 2013 Jens Petersen - 1.0.5-1 +- F20 Change: docdir's are now unversioned + * Thu Jul 11 2013 Jens Petersen - 1.0.4-1 - check for bindir before looking for executables in ghc_clear_execstack