From 0a2fb947ebdae6e1fad14d3a8f99fb4c3e4488a5 Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Thu, 26 Oct 2023 09:58:40 +0800
Subject: [PATCH] Revert "ghc_gen_filelists: tweak haddock_dir for ghc-9.8
 short hash suffices"

This reverts commit 1466da90e6f3f6f1bb409113f955446132ca0c52.

instead removing the ghc9.8 haddock dirs hashes
---
 ghc-rpm-macros.spec | 5 +----
 macros.ghc          | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index 57c9052..b0a7f9a 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -7,7 +7,7 @@
 %endif
 
 Name:           ghc-rpm-macros
-Version:        2.6.2
+Version:        2.6.1
 Release:        1%{?dist}
 Summary:        RPM macros for building Haskell packages for GHC
 
@@ -185,9 +185,6 @@ 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 20788f1..3e5b7e9 100644
--- a/macros.ghc
+++ b/macros.ghc
@@ -197,11 +197,8 @@ 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 %{buildroot}$haddock_dir >> %{basepkg}-doc.files\
+echo $haddock_dir >> %{basepkg}-doc.files\
 %if %{with hadrian}\
 # for < 9.4.1-rc1\
 else\