From 8e03288604d538c32f40339261cd8c28d53b3e43 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 17 Jul 2019 06:27:12 +0000 Subject: [PATCH] revert to handling subpackage license in %ghc_gen_filelists --- macros.ghc | 5 +++++ macros.ghc-extra | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/macros.ghc b/macros.ghc index d9a0113..b16c413 100644 --- a/macros.ghc +++ b/macros.ghc @@ -75,6 +75,11 @@ exit 1\ fi\ rm -f %{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\ pkgdir="%{ghclibdir}/%{pkgnamever}"\ if [ -d "%{buildroot}${pkgdir}" ]; then\ diff --git a/macros.ghc-extra b/macros.ghc-extra index 2bdbfab..4d81cd7 100644 --- a/macros.ghc-extra +++ b/macros.ghc-extra @@ -63,7 +63,6 @@ This package provides the Haskell %{pkgname} profiling library.\ %endif\ \ %files -n %{basepkg} -f %{!-d:%{pkgname}-%{pkgver}/}%{basepkg}.files\ -%{_ghclicensedir}/%{basepkg}\ \ %files -n %{basepkg}-devel -f %{!-d:%{pkgname}-%{pkgver}/}%{basepkg}-devel.files\ \