diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc index 980a996..2d6acbd 100644 --- a/ghc-rpm-macros.ghc +++ b/ghc-rpm-macros.ghc @@ -51,10 +51,7 @@ fi\ %if 0%{!?1:1} && %{undefined ghc_exclude_docdir}\ if [ -d "%{buildroot}%{_docdir}/%{name}-%{version}" ]; then\ echo "%{_docdir}/%{name}-%{version}" >> %{basepkg}%{?ghc_without_shared:-devel}.files\ -fi\ -%endif\ -%if 0%{!?1:1} && %{undefined ghc_exclude_docdir}\ -if [ -d "%{buildroot}%{_docdir}/ghc-%{pkgnamever}" ]; then\ +elif [ -d "%{buildroot}%{_docdir}/ghc-%{pkgnamever}" ]; then\ echo "%{_docdir}/ghc-%{pkgnamever}" >> %{basepkg}%{?ghc_without_shared:-devel}.files\ fi\ %endif\ diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 0805cfa..d951b61 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -3,7 +3,7 @@ %global macros_file %{_sysconfdir}/rpm/macros.ghc Name: ghc-rpm-macros -Version: 0.14 +Version: 0.14.1 Release: 1%{?dist} Summary: Macros for building packages for GHC @@ -59,6 +59,9 @@ EOF %changelog +* Sat Nov 12 2011 Jens Petersen - 0.14.1-1 +- fix double listing of docdir in base lib package + * Tue Nov 1 2011 Jens Petersen - 0.14-1 - replace devel ghc requires with ghc-compiler - disable testsuite in ghc_bootstrap