From 0bb1bc2091b687dba646d72798f0bbb5418ffa2c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Jun 04 2020 04:45:56 +0000 Subject: doc subpackages should own %{_docdir}/ghc/html/libraries/ and parents (#1795526) --- diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 8580b91..8c6b59b 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -10,7 +10,7 @@ #%%global without_hscolour 1 Name: ghc-rpm-macros -Version: 2.0.8 +Version: 2.0.9 Release: 1%{?dist} Summary: RPM macros for building Haskell packages for GHC @@ -212,6 +212,10 @@ EOF %changelog +* Thu Jun 4 2020 Jens Petersen - 2.0.9-1 +- doc subpackages should own /usr/share/doc/ghc/, /usr/share/doc/ghc/html/, + and /usr/share/doc/ghc/html/libraries/ (#1795526) + * Sun May 10 2020 Jens Petersen - 2.0.8-1 - ghc-deps.sh: ignore internal libraries (#1822444) diff --git a/macros.ghc b/macros.ghc index db3050b..d0c7525 100644 --- a/macros.ghc +++ b/macros.ghc @@ -93,6 +93,9 @@ fi\ ls %{buildroot}%{ghclibdir}/package.conf.d/%{pkgnamever}*.conf >> %{basepkg}-devel.files\ %if %{with haddock}\ if [ -d %{buildroot}%{ghc_html_libraries_dir}/%{pkgnamever} ]; then\ +echo %dir %{_docdir}/ghc >> %{basepkg}-doc.files\ +echo %dir %{ghc_html_dir} >> %{basepkg}-doc.files\ +echo %dir %{ghc_html_libraries_dir} >> %{basepkg}-doc.files\ echo %{ghc_html_libraries_dir}/%{pkgnamever} >> %{basepkg}-doc.files\ fi\ %endif\