From 3a116c6a290133e978566e45de67e3dfd7c848c1 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 16 Feb 2023 00:01:15 +0800 Subject: [PATCH] ghc.attr: include Hadrian lib/ subdir in .conf regex otherwise lib packages fail to generate devel deps --- ghc-rpm-macros.spec | 1 + ghc.attr | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index a076259..1cca3f4 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -192,6 +192,7 @@ mkdir -p %{buildroot}%{_docdir}/ghc/html/libraries %changelog * Wed Feb 15 2023 Jens Petersen - 2.5.2-1 - 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 - 2.5.1-1 - add ghc_merge_filelist diff --git a/ghc.attr b/ghc.attr index 560c331..55b7308 100644 --- a/ghc.attr +++ b/ghc.attr @@ -1,3 +1,3 @@ %__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_path ^(%{ghcliblib}/package.conf.d/.*\.conf|%{ghclibplatform}/.*/libHS.*_p\.a)$ +%__ghc_path ^(%{ghcliblib}/(lib/)?package.conf.d/.*\.conf|%{ghclibplatform}/.*/libHS.*\_p.a)$