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

Hadrian haddock dirs are not versioned

Browse Source
This commit is contained in:
Jens Petersen 2021-12-19 15:01:25 +08:00
parent f75a976e04
commit f8ff148f18
2 changed files with 7 additions and 3 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 %endif
Name: ghc-rpm-macros Name: ghc-rpm-macros
Version: 2.3.4 Version: 2.3.5
Release: 1%{?dist} Release: 1%{?dist}
Summary: RPM macros for building Haskell packages for GHC Summary: RPM macros for building Haskell packages for GHC
@ -184,6 +184,9 @@ EOF
%changelog %changelog
* Sun Dec 19 2021 Jens Petersen <petersen@redhat.com> - 2.3.5-1
- Hadrian haddock dirs are not versioned
* Sun Dec 19 2021 Jens Petersen <petersen@redhat.com> - 2.3.4-1 * Sun Dec 19 2021 Jens Petersen <petersen@redhat.com> - 2.3.4-1
- move Cabal_arch into ghclibplatform macro - move Cabal_arch into ghclibplatform macro

5
macros.ghc
View File

@ -101,8 +101,9 @@ touch %{basepkg}-devel.files %{basepkg}-prof.files\
fi\ fi\
ls %{buildroot}%{ghcliblib}/package.conf.d/%{pkgnamever}*.conf >> %{basepkg}-devel.files\ ls %{buildroot}%{ghcliblib}/package.conf.d/%{pkgnamever}*.conf >> %{basepkg}-devel.files\
%if %{with haddock}\ %if %{with haddock}\
if [ -d %{buildroot}%{ghc_html_libraries_dir}/%{pkgnamever} ]; then\ haddock_dir=%{ghc_html_libraries_dir}/%{?with_hadrian:%pkgname}%{!?with_hadrian:%pkgnamever}\
echo %{ghc_html_libraries_dir}/%{pkgnamever} >> %{basepkg}-doc.files\ if [ -d %{buildroot}$haddock_dir ]; then\
echo $haddock_dir >> %{basepkg}-doc.files\
fi\ fi\
%endif\ %endif\
for i in %{basepkg}.files %{basepkg}-devel.files %{basepkg}-doc.files %{basepkg}-prof.files; do\ for i in %{basepkg}.files %{basepkg}-devel.files %{basepkg}-doc.files %{basepkg}-prof.files; do\