%ghc_gen_filelists: check pkg licensedir exists

prevents warning errors: eg for ghc9.4:

ls: cannot access '~/fedora/haskell/ghc9.4/BUILDROOT/ghc9.4-9.4.0.20220721-7.fc37.x86_64/usr/share/licenses/ghc9.4-Cabal': No such file or directory

etc, though not actually harmful
This commit is contained in:
Jens Petersen 2022-07-26 18:33:57 +08:00
parent 0fd2441bc1
commit b6ba7540fe
2 changed files with 7 additions and 2 deletions

View File

@ -7,8 +7,8 @@
%endif
Name: ghc-rpm-macros
Version: 2.4.3
Release: 2%{?dist}
Version: 2.4.4
Release: 1%{?dist}
Summary: RPM macros for building Haskell packages for GHC
License: GPLv3+
@ -190,6 +190,9 @@ EOF
%changelog
* Tue Jul 26 2022 Jens Petersen <petersen@redhat.com> - 2.4.4-1
- ghc_gen_filelists: check pkg licensedir exists
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

View File

@ -90,9 +90,11 @@ fi\
rm -f %{basepkg}.files %{basepkg}-doc.files\
touch %{basepkg}.files %{basepkg}-doc.files\
%if 0%{?1:1}\
if [ -d "%{buildroot}%{_ghclicensedir}/%{basepkg}" ]; then\
for i in $(ls %{buildroot}%{_ghclicensedir}/%{basepkg}); do\
echo "%%license %{pkgnamever}/$i" >> %{basepkg}.files\
done\
fi\
%endif\
for i in %{buildroot}%{?_ghcdynlibdir}%{!?_ghcdynlibdir:%{ghclibplatform}}/libHS%{pkgnamever}-*ghc%{ghc_version}.so; do\
if [ -x "$i" ]; then\