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

doc subpackages should own %{_docdir}/ghc/html/libraries/ and parents (#1795526)

Browse Source
This commit is contained in:
Jens Petersen 2020-06-04 12:45:56 +08:00
parent 1f6b86fa4b
commit 0bb1bc2091
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ghc-rpm-macros.spec
View File

@ -10,7 +10,7 @@
#%%global without_hscolour 1 #%%global without_hscolour 1
Name: ghc-rpm-macros Name: ghc-rpm-macros
Version: 2.0.8 Version: 2.0.9
Release: 1%{?dist} Release: 1%{?dist}
Summary: RPM macros for building Haskell packages for GHC Summary: RPM macros for building Haskell packages for GHC
@ -212,6 +212,10 @@ EOF
%changelog %changelog
* Thu Jun 4 2020 Jens Petersen <petersen@redhat.com> - 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 <petersen@redhat.com> - 2.0.8-1 * Sun May 10 2020 Jens Petersen <petersen@redhat.com> - 2.0.8-1
- ghc-deps.sh: ignore internal libraries (#1822444) - ghc-deps.sh: ignore internal libraries (#1822444)

3
macros.ghc
View File

@ -93,6 +93,9 @@ fi\
ls %{buildroot}%{ghclibdir}/package.conf.d/%{pkgnamever}*.conf >> %{basepkg}-devel.files\ ls %{buildroot}%{ghclibdir}/package.conf.d/%{pkgnamever}*.conf >> %{basepkg}-devel.files\
%if %{with haddock}\ %if %{with haddock}\
if [ -d %{buildroot}%{ghc_html_libraries_dir}/%{pkgnamever} ]; then\ 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\ echo %{ghc_html_libraries_dir}/%{pkgnamever} >> %{basepkg}-doc.files\
fi\ fi\
%endif\ %endif\