[ghc-rpm-macros/f17] include docdir in base lib package when ghc_without_shared

[Jens Petersen]

commit 6f66b6002e4dc9c8fffa6ec8b1bcd722f2bc754d
Author: Jens Petersen <petersen at redhat.com>
Date:   Mon Jul 22 13:45:49 2013 +0900

    include docdir in base lib package when ghc_without_shared

 ghc-rpm-macros.ghc  |    4 ++--
 ghc-rpm-macros.spec |    5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc
index 1d88bda..1dc97d8 100644
--- a/ghc-rpm-macros.ghc
+++ b/ghc-rpm-macros.ghc
@@ -50,9 +50,9 @@ echo "%attr(755,root,root) %{pkgdir}/libHS%{pkgnamever}-ghc%{ghc_version}.so" >>
 fi\
 %if %{undefined ghc_exclude_docdir}\
 if [ -d "%{buildroot}%{_docdir}/%{name}-%{version}" ]; then\
-  echo "%{_docdir}/%{name}-%{version}" >> %{basepkg}%{?ghc_without_shared:-devel}.files\
+  echo "%{_docdir}/%{name}-%{version}" >> %{basepkg}.files\
 elif [ -d "%{buildroot}%{_docdir}/ghc-%{pkgnamever}" ]; then\
-  echo "%{_docdir}/ghc-%{pkgnamever}" >> %{basepkg}%{?ghc_without_shared:-devel}.files\
+  echo "%{_docdir}/ghc-%{pkgnamever}" >> %{basepkg}.files\
 fi\
 %endif\
 echo "%{ghclibdir}/package.conf.d/%{pkgnamever}*.conf" >> %{basepkg}-devel.files\
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index ceadc0e..6570d67 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -6,7 +6,7 @@
 #%%global without_hscolour 1
 
 Name:           ghc-rpm-macros
-Version:        0.15.14
+Version:        0.15.15
 Release:        1%{?dist}
 Summary:        RPM macros for building packages for GHC
 
@@ -74,6 +74,9 @@ EOF
 
 
 %changelog
+* Mon Jul 22 2013 Jens Petersen <petersen at redhat.com> - 0.15.15-1
+- include docdir in library base package also when no shared library
+
 * Thu Jul 11 2013 Jens Petersen <petersen at redhat.com> - 0.15.14-1
 - create lib base package also when ghc_without_shared is set (#983137)
   and other ghc_without_shared cleanup