From ee1e7462a6b4138ed1b569c63bb3df679916c19a Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 2 Sep 2022 15:20:39 -0500 Subject: [PATCH] Tweak %doc and %license handling --- go-rpm-macros-epel.spec | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/go-rpm-macros-epel.spec b/go-rpm-macros-epel.spec index 7f7afb7..d9f712a 100644 --- a/go-rpm-macros-epel.spec +++ b/go-rpm-macros-epel.spec @@ -21,7 +21,10 @@ Source: macros.zzz-go-srpm-macros-epel Source: https://pagure.io/go-rpm-macros/raw/%{upstream_version}/f/rpm/go_mod_vendor.prov Source: https://pagure.io/go-rpm-macros/raw/%{upstream_version}/f/rpm/fileattrs/go_mod_vendor.attr +# Upstream go-rpm-macros README Source: https://pagure.io/go-rpm-macros/raw/%{upstream_version}/f/README.md#/README.upstream.md +# README specific to the backports in this package. +Source: README.md Source: https://pagure.io/go-rpm-macros/raw/%{upstream_version}/f/LICENSE.txt # golist-symlink subpackage license Source: https://github.com/spdx/license-list-data/raw/master/text/Unlicense.txt @@ -81,22 +84,25 @@ install -Dpm 0755 go_mod_vendor.prov -t %{buildroot}%{_rpmconfigdir} mkdir %{buildroot}%{_bindir} ln -s %{_libexecdir}/go-rpm-macros/golist %{buildroot}%{_bindir}/golist -# Install REAMDE -install -Dpm 0644 README.upstream.md %{buildroot}%{_pkgdocdir}/README.md +# Install REAMDE and licenses to a single directory for both subpackages. +install -Dpm 0644 README.md README.upstream.md \ + -t %{buildroot}%{_docdir}/%{name}/README.fedora.md +install -Dpm 0644 LICENSE.txt -t %{buildroot}%{_defaultlicensedir}/%{name} %ifarch %{go_arches} %files %{_rpmmacrodir}/macros.zzz-go-rpm-macros-epel %endif -%files -n go-srpm-macros-epel -%license LICENSE.txt -%doc %{_pkgdocdir} +%files -n go-srpm-macros-epel +%license %{_defaultlicensedir}/%{name} +%doc %{_docdir}/%{name} %{_rpmmacrodir}/macros.zzz-go-srpm-macros-epel %{_rpmconfigdir}/go_mod_vendor.prov %{_rpmconfigdir}/fileattrs/go_mod_vendor.attr -%files golist-symlink +%files -n go-rpm-macros-golist-symlink +%doc README.md %license Unlicense.txt %{_bindir}/golist