From cd4926bbbaa4b84429feb54991cd18431b22a3cb Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Sat, 6 Jul 2013 16:25:54 +0900
Subject: [PATCH] restore docdir autopackaging for f17 and el6

to fix rebuilding of old "%ghc_files$" packages
---
 ghc-rpm-macros.ghc  | 7 +++++++
 ghc-rpm-macros.spec | 5 ++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc
index 37feda4..2fdf6fa 100644
--- a/ghc-rpm-macros.ghc
+++ b/ghc-rpm-macros.ghc
@@ -48,6 +48,13 @@ echo "%dir %{pkgdir}" >> %{basepkg}.files\
 echo "%attr(755,root,root) %{pkgdir}/libHS%{pkgnamever}-ghc%{ghc_version}.so" >> %{basepkg}.files\
 %endif\
 fi\
+%if %{undefined ghc_exclude_docdir}\
+if [ -d "%{buildroot}%{_docdir}/%{name}-%{version}" ]; then\
+  echo "%{_docdir}/%{name}-%{version}" >> %{basepkg}%{?ghc_without_shared:-devel}.files\
+elif [ -d "%{buildroot}%{_docdir}/ghc-%{pkgnamever}" ]; then\
+  echo "%{_docdir}/ghc-%{pkgnamever}" >> %{basepkg}%{?ghc_without_shared:-devel}.files\
+fi\
+%endif\
 echo "%{ghclibdir}/package.conf.d/%{pkgnamever}*.conf" >> %{basepkg}-devel.files\
 if [ -d "%{buildroot}%{pkgdir}" ]; then\
 find %{buildroot}%{pkgdir} -mindepth 1 -type d | sed "s/^/%dir /" >> %{basepkg}-devel.files\
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index 82c436e..cb326ff 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.12
+Version:        0.15.13
 Release:        1%{?dist}
 Summary:        Macros for building packages for GHC
 
@@ -74,6 +74,9 @@ EOF
 
 
 %changelog
+* Sat Jul  6 2013 Jens Petersen <petersen@redhat.com> - 0.15.13-1
+- restore docdir autopackaging for f17 and el6
+
 * Fri Jun 21 2013 Jens Petersen <petersen@redhat.com> - 0.15.12-1
 - ghc_fix_dynamic_rpath: do not assume first RPATH
 - packaging for without_shared is now done the same way as shared