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

revert to handling subpackage license in %ghc_gen_filelists

Browse Source
This commit is contained in:
Jens Petersen 2019-07-17 06:27:12 +00:00
parent 35cd9d015e
commit 8e03288604
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
macros.ghc
View File

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

1
macros.ghc-extra
View File

@ -63,7 +63,6 @@ This package provides the Haskell %{pkgname} profiling library.\
%endif\ %endif\
\ \
%files -n %{basepkg} -f %{!-d:%{pkgname}-%{pkgver}/}%{basepkg}.files\ %files -n %{basepkg} -f %{!-d:%{pkgname}-%{pkgver}/}%{basepkg}.files\
%{_ghclicensedir}/%{basepkg}\
\ \
%files -n %{basepkg}-devel -f %{!-d:%{pkgname}-%{pkgver}/}%{basepkg}-devel.files\ %files -n %{basepkg}-devel -f %{!-d:%{pkgname}-%{pkgver}/}%{basepkg}-devel.files\
\ \