From ed696d0c8b160b264f24b04007e414de23f3b586 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 23 Feb 2024 23:48:06 +0000 Subject: [PATCH] Attempt to account for licenses of vendored components [skip changelog] --- LICENSES.dependencies | 55 +++++++++++++++++++++++++++++++++++++++++++ aerc.spec | 13 ++++++---- 2 files changed, 64 insertions(+), 4 deletions(-) create mode 100644 LICENSES.dependencies diff --git a/LICENSES.dependencies b/LICENSES.dependencies new file mode 100644 index 0000000..d754836 --- /dev/null +++ b/LICENSES.dependencies @@ -0,0 +1,55 @@ +./LICENSE: MIT +./vendor/git.sr.ht/~rjarry/go-opt/LICENSE: MIT +./vendor/git.sr.ht/~rockorager/go-jmap/LICENSE: MIT +./vendor/git.sr.ht/~rockorager/tcell-term/LICENSE: MIT +./vendor/github.com/ProtonMail/go-crypto/LICENSE: BSD-3-Clause +./vendor/github.com/arran4/golang-ical/LICENSE: Apache-2.0 +./vendor/github.com/creack/pty/LICENSE: MIT +./vendor/github.com/danwakefield/fnmatch/LICENSE: BSD-2-Clause +./vendor/github.com/davecgh/go-spew/LICENSE: ISC +./vendor/github.com/emersion/go-imap-sortthread/LICENSE: MIT +./vendor/github.com/emersion/go-imap/LICENSE: MIT +./vendor/github.com/emersion/go-maildir/LICENSE: MIT +./vendor/github.com/emersion/go-mbox/LICENSE: MIT +./vendor/github.com/emersion/go-message/LICENSE: MIT +./vendor/github.com/emersion/go-msgauth/LICENSE: MIT +./vendor/github.com/emersion/go-pgpmail/LICENSE: MIT +./vendor/github.com/emersion/go-sasl/LICENSE: MIT +./vendor/github.com/emersion/go-smtp/LICENSE: MIT +./vendor/github.com/emersion/go-textwrapper/LICENSE: MIT +./vendor/github.com/fsnotify/fsevents/LICENSE: BSD-3-Clause +./vendor/github.com/fsnotify/fsnotify/LICENSE: BSD-3-Clause +./vendor/github.com/gatherstars-com/jwz/LICENSE: Apache-2.0 +./vendor/github.com/gdamore/encoding/LICENSE: Apache-2.0 +./vendor/github.com/gdamore/tcell/v2/LICENSE: Apache-2.0 +./vendor/github.com/go-ini/ini/LICENSE: Apache-2.0 +./vendor/github.com/golang/protobuf/LICENSE: BSD-3-Clause +./vendor/github.com/golang/snappy/LICENSE: BSD-3-Clause +./vendor/github.com/lithammer/fuzzysearch/LICENSE: MIT +./vendor/github.com/lucasb-eyer/go-colorful/LICENSE: MIT +./vendor/github.com/mattn/go-isatty/LICENSE: MIT +./vendor/github.com/mattn/go-runewidth/LICENSE: MIT +./vendor/github.com/pkg/errors/LICENSE: BSD-2-Clause +./vendor/github.com/pmezard/go-difflib/LICENSE: BSD-3-Clause +./vendor/github.com/rivo/uniseg/LICENSE.txt: MIT +./vendor/github.com/riywo/loginshell/LICENSE: MIT +./vendor/github.com/stretchr/testify/LICENSE: MIT +./vendor/github.com/syndtr/goleveldb/LICENSE: BSD-2-Clause +./vendor/github.com/xo/terminfo/LICENSE: MIT +./vendor/golang.org/x/crypto/LICENSE: BSD-3-Clause +./vendor/golang.org/x/mod/LICENSE: BSD-3-Clause +./vendor/golang.org/x/net/LICENSE: BSD-3-Clause +./vendor/golang.org/x/oauth2/LICENSE: BSD-3-Clause +./vendor/golang.org/x/sys/LICENSE: BSD-3-Clause +./vendor/golang.org/x/term/LICENSE: BSD-3-Clause +./vendor/golang.org/x/text/LICENSE: BSD-3-Clause +./vendor/golang.org/x/tools/LICENSE: BSD-3-Clause +./vendor/google.golang.org/appengine/LICENSE: Apache-2.0 +./vendor/google.golang.org/protobuf/LICENSE: BSD-3-Clause + +The following license files were found but the correct license identifier couldn't be determined. +./vendor/github.com/cloudflare/circl/LICENSE (MANUALLY DETECTED as BSD-3-Clause) +./vendor/gopkg.in/yaml.v3/LICENSE (MANUALLY DETECTED as Apache-2.0 AND MIT) + +Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT + diff --git a/aerc.spec b/aerc.spec index a7f694f..2665e8b 100644 --- a/aerc.spec +++ b/aerc.spec @@ -20,12 +20,16 @@ Name: aerc Release: %autorelease Summary: Email client for your terminal -License: MIT +SourceLicense: MIT +# See LICENSES.dependencies +License: MIT AND Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC URL: %{gourl} # The forge macros don't support Sourcehut. # https://src.fedoraproject.org/rpms/redhat-rpm-config/pull-request/209 -Source: %{gourl}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz -Source: aerc-%{version}-vendor.tar.gz +Source0 %{gourl}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source1: aerc-%{version}-vendor.tar.gz +# https://git.sr.ht/~gotmax23/fedora-scripts/tree/main/item/go-sig/go_vendor_licenses.py +Source2: LICENSES.dependencies BuildRequires: desktop-file-utils # wrap and colorize filters are written in C @@ -43,6 +47,7 @@ Requires: notmuch %prep %autosetup -n %{topdir} -p1 %{?with_vendor:-b1} %goprep -e %{?with_vendor:-k} +cp %{SOURCE2} . # Disable building of aerc that we handle manually in the SPEC and # preserve mtimes @@ -93,7 +98,7 @@ LANG=en_US.UTF-8 ./filters/test.sh %endif %files -%license LICENSE %{?with_vendor:vendor/modules.txt} +%license LICENSE %{?with_vendor:vendor/modules.txt LICENSES.dependencies} %doc doc README.md %{_bindir}/aerc %{_bindir}/carddav-query