Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/cluecode/copyrights.py
Original file line number Diff line number Diff line change
Expand Up @@ -639,6 +639,9 @@ def build_detection_from_node(
# SPDX-FileCopyrightText as defined by the FSFE Reuse project
(r'^[Ss][Pp][Dd][Xx]-[Ff]ile[Cc]opyright[Tt]ext', 'COPY'),

# SPDX-FileContributor as defined in SPDX and seen used in KDE
(r'^[Ss][Pp][Dd][Xx]-[Ff]ile[Cc]ontributor', 'SPDX-CONTRIB'),

############################################################################
# ALL Rights Reserved.
############################################################################
Expand Down Expand Up @@ -2566,6 +2569,9 @@ def build_detection_from_node(
# Authors
#######################################

# SPDX-FileContributor special case
AUTHOR: {<SPDX-CONTRIB> <CCOMPANY|NAME|NAME-EMAIL|NAME-YEAR|EMAIL> <COMPANY|NAME|NAME-EMAIL|NAME-YEAR|EMAIL|NN>? } #264000

# developed by Project Mayo.
AUTHOR: {<AUTH2>+ <BY> <COMPANY> <NNP>} #2645-1

Expand Down Expand Up @@ -2923,6 +2929,7 @@ def refine_names(s, prefixes):
'authors,',
'authorship',
'or',
'spdx-filecontributor',
])
))

Expand Down
1 change: 1 addition & 0 deletions src/cluecode/copyrights_hint.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
'right',
'reserv',
'auth',
'filecontributor',
'devel',
'<s>',
'</s>',
Expand Down
4 changes: 4 additions & 0 deletions tests/cluecode/data/copyrights/spdx-copy-contrib.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
* SPDX-FileCopyrightText: 2008 Red Hat Inc.
* SPDX-FileContributor: Adam Jackson <ajax@redhat.com>
* SPDX-FileContributor: Bill Nottingham <notting@redhat.com>
* SPDX-FileContributor: Ray Strode <rstrode@redhat.com>
14 changes: 14 additions & 0 deletions tests/cluecode/data/copyrights/spdx-copy-contrib.txt.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
what:
- copyrights
- holders
- authors

copyrights:
- Copyright 2008 Red Hat Inc.
holders:
- Red Hat Inc.
authors:
- Adam Jackson <ajax@redhat.com>
- Bill Nottingham <notting@redhat.com>
- Ray Strode <rstrode@redhat.com>