From 1466da90e6f3f6f1bb409113f955446132ca0c52 Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Oct 25 2023 16:45:36 +0000
Subject: ghc_gen_filelists: tweak haddock_dir for ghc-9.8 short hash suffices


---

diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index b0a7f9a..57c9052 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -7,7 +7,7 @@
 %endif
 
 Name:           ghc-rpm-macros
-Version:        2.6.1
+Version:        2.6.2
 Release:        1%{?dist}
 Summary:        RPM macros for building Haskell packages for GHC
 
@@ -185,6 +185,9 @@ mkdir -p %{buildroot}%{_docdir}/ghc/html/libraries
 
 
 %changelog
+* Thu Oct 26 2023 Jens Petersen <petersen@redhat.com> - 2.6.2-1
+- ghc_gen_filelists: tweak haddock_dir for ghc-9.8 short hash suffices
+
 * Tue Oct 24 2023 Jens Petersen <petersen@redhat.com> - 2.6.1-1
 - ghc_gen_filelists: tweak pkgdir for ghc-9.8 short hash suffices
 
diff --git a/macros.ghc b/macros.ghc
index 3e5b7e9..20788f1 100644
--- a/macros.ghc
+++ b/macros.ghc
@@ -197,8 +197,11 @@ fi\
 ls %{buildroot}%{ghcliblib}${subsubdir}/package.conf.d/%{pkgnamever}*.conf >> %{basepkg}-devel.files\
 %if %{with haddock}\
 haddock_dir=%{ghc_html_libraries_dir}/%{pkgnamever}\
+%if %[v"%{ghc_version}" > v"9.8"]\
+haddock_dir="${haddock_dir}-*"\
+%endif\
 if [ -d %{buildroot}$haddock_dir ]; then\
-echo $haddock_dir >> %{basepkg}-doc.files\
+echo %{buildroot}$haddock_dir >> %{basepkg}-doc.files\
 %if %{with hadrian}\
 # for < 9.4.1-rc1\
 else\