rpms/ghc-rpm-macros
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Revert "ghc_gen_filelists: tweak haddock_dir for ghc-9.8 short hash suffices"

Browse Source 
This reverts commit 1466da90e6.

instead removing the ghc9.8 haddock dirs hashes
This commit is contained in:
Jens Petersen 2023-10-26 09:58:40 +08:00
parent 1466da90e6
commit 0a2fb947eb
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ghc-rpm-macros.spec
View File

@ -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

5
macros.ghc
View File

@ -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\