From eb63b7162009df4af203af884c2aeef84434959d Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Tue, 26 Jul 2022 16:03:46 +0800
Subject: [PATCH] in 9.4.1 Hadrian html docdirs are versioned again

if using hadrian we also check for unversioned
---
 ghc-rpm-macros.spec |  1 +
 macros.ghc          | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index 9cc011a..3bcfd41 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -192,6 +192,7 @@ EOF
 %changelog
 * Tue Jul 26 2022 Jens Petersen <petersen@redhat.com> - 2.4.4-1
 - ghc_gen_filelists: check pkg licensedir exists
+- in 9.4.1 Hadrian html docdirs are versioned again (breaks older Hadrian)
 
 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
diff --git a/macros.ghc b/macros.ghc
index 7503666..77d226b 100644
--- a/macros.ghc
+++ b/macros.ghc
@@ -112,9 +112,17 @@ touch %{basepkg}-devel.files %{basepkg}-prof.files\
 fi\
 ls %{buildroot}%{ghcliblib}/package.conf.d/%{pkgnamever}*.conf >> %{basepkg}-devel.files\
 %if %{with haddock}\
-haddock_dir=%{ghc_html_libraries_dir}/%{?with_hadrian:%pkgname}%{!?with_hadrian:%pkgnamever}\
+haddock_dir=%{ghc_html_libraries_dir}/%{pkgnamever}\
 if [ -d %{buildroot}$haddock_dir ]; then\
 echo $haddock_dir >> %{basepkg}-doc.files\
+%if %{with hadrian}\
+# for < 9.4.1-rc1\
+else\
+haddock_dir=%{ghc_html_libraries_dir}/%{pkgname}\
+if [ -d %{buildroot}$haddock_dir ]; then\
+echo $haddock_dir >> %{basepkg}-doc.files\
+fi\
+%endif\
 fi\
 %endif\
 for i in %{basepkg}.files %{basepkg}-devel.files %{basepkg}-doc.files %{basepkg}-prof.files; do\