diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 4be8031..5838171 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.10 +Version: 2.0.11 Release: 1%{?dist} Summary: RPM macros for building Haskell packages for GHC @@ -212,6 +212,10 @@ EOF %changelog +* Wed Jun 24 2020 Jens Petersen - 2.0.11-1 +- only add dynlib to file list if it exists + (this allows for metapkg subpackages) + * Thu Jun 18 2020 Jens Petersen - 2.0.10-1 - cabal-tweak script now output errors to stderr diff --git a/macros.ghc b/macros.ghc index d0c7525..5cd24b9 100644 --- a/macros.ghc +++ b/macros.ghc @@ -81,7 +81,11 @@ echo "%%license %{pkgnamever}/$i" >> %{basepkg}.files\ done\ %endif\ for i in %{buildroot}%{_ghcdynlibdir}/libHS%{pkgnamever}-*ghc%{ghc_version}.so; do\ +if [ -x "$i" ]; then\ echo $i >> %{basepkg}.files\ +else\ +echo 'Warning: %{buildroot}%{_ghcdynlibdir}/libHS%{pkgnamever}-*ghc%{ghc_version}.so not found'\ +fi\ done\ pkgdir="%{ghclibdir}/%{pkgnamever}"\ if [ -d "%{buildroot}${pkgdir}" ]; then\