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

only add dynlib to filelist if found to allow for metapkg subpackage

Browse Source 
eg base-noprelude subpackage of pandoc
This commit is contained in:
Jens Petersen 2020-06-24 18:42:00 +08:00
parent 31a55c3bc9
commit bc06ab77b4
2 changed files with 9 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.10 Version: 2.0.11
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
* Wed Jun 24 2020 Jens Petersen <petersen@redhat.com> - 2.0.11-1
- only add dynlib to file list if it exists
(this allows for metapkg subpackages)
* Thu Jun 18 2020 Jens Petersen <petersen@redhat.com> - 2.0.10-1 * Thu Jun 18 2020 Jens Petersen <petersen@redhat.com> - 2.0.10-1
- cabal-tweak script now output errors to stderr - cabal-tweak script now output errors to stderr

4
macros.ghc
View File

@ -81,7 +81,11 @@ echo "%%license %{pkgnamever}/$i" >> %{basepkg}.files\
done\ done\
%endif\ %endif\
for i in %{buildroot}%{_ghcdynlibdir}/libHS%{pkgnamever}-*ghc%{ghc_version}.so; do\ for i in %{buildroot}%{_ghcdynlibdir}/libHS%{pkgnamever}-*ghc%{ghc_version}.so; do\
if [ -x "$i" ]; then\
echo $i >> %{basepkg}.files\ echo $i >> %{basepkg}.files\
else\
echo 'Warning: %{buildroot}%{_ghcdynlibdir}/libHS%{pkgnamever}-*ghc%{ghc_version}.so not found'\
fi\
done\ done\
pkgdir="%{ghclibdir}/%{pkgnamever}"\ pkgdir="%{ghclibdir}/%{pkgnamever}"\
if [ -d "%{buildroot}${pkgdir}" ]; then\ if [ -d "%{buildroot}${pkgdir}" ]; then\