ghc.attr: include Hadrian lib/ subdir in .conf regex

otherwise lib packages fail to generate devel deps
epel9
Jens Petersen 2 years ago
parent 6d69503ff3
commit 3a116c6a29

@ -192,6 +192,7 @@ mkdir -p %{buildroot}%{_docdir}/ghc/html/libraries
%changelog %changelog
* Wed Feb 15 2023 Jens Petersen <petersen@redhat.com> - 2.5.2-1 * Wed Feb 15 2023 Jens Petersen <petersen@redhat.com> - 2.5.2-1
- ghc-dep.sh: check for *_p.a under Hadrian platform subdir as well - ghc-dep.sh: check for *_p.a under Hadrian platform subdir as well
- ghc.attr: include Hadrian lib/ subdir in .conf regex
* Sat Feb 11 2023 Jens Petersen <petersen@redhat.com> - 2.5.1-1 * Sat Feb 11 2023 Jens Petersen <petersen@redhat.com> - 2.5.1-1
- add ghc_merge_filelist - add ghc_merge_filelist

@ -1,3 +1,3 @@
%__ghc_provides %{_rpmconfigdir}/ghc-deps.sh --provides %{buildroot} %{ghclibdir} %{?ghc_name:ghc-%{ghc_version}} %__ghc_provides %{_rpmconfigdir}/ghc-deps.sh --provides %{buildroot} %{ghclibdir} %{?ghc_name:ghc-%{ghc_version}}
%__ghc_requires %{_rpmconfigdir}/ghc-deps.sh --requires %{buildroot} %{ghclibdir} %{?ghc_name:ghc-%{ghc_version}} %__ghc_requires %{_rpmconfigdir}/ghc-deps.sh --requires %{buildroot} %{ghclibdir} %{?ghc_name:ghc-%{ghc_version}}
%__ghc_path ^(%{ghcliblib}/package.conf.d/.*\.conf|%{ghclibplatform}/.*/libHS.*_p\.a)$ %__ghc_path ^(%{ghcliblib}/(lib/)?package.conf.d/.*\.conf|%{ghclibplatform}/.*/libHS.*\_p.a)$

Loading…
Cancel
Save