Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Copyrights and licensing page #1010

Merged
merged 20 commits into from
Aug 10, 2024

Conversation

bact
Copy link
Collaborator

@bact bact commented Jul 25, 2024

Add new copyrights info to index.md

Signed-off-by: Arthit Suriyawongkul <arthit@gmail.com>
@bact bact mentioned this pull request Jul 25, 2024
70 tasks
Signed-off-by: Arthit Suriyawongkul <arthit@gmail.com>
Copy link

@bobmartin3000 bobmartin3000 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@zvr zvr requested a review from swinslow August 4, 2024 11:58
Copy link
Member

@swinslow swinslow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please hold on merging this, I'm reviewing and discussing with the SC.

So it will not be published publicly yet.

Signed-off-by: Arthit Suriyawongkul <arthit@gmail.com>
@swinslow
Copy link
Member

swinslow commented Aug 8, 2024

@bact Can we revise this as follows?

  • Rather than the four copyright notices at the top, please replace with: "Copyright © 2010-2024, Linux Foundation and its Contributors, including SPDX Model contributions from OMG and its Contributors"
  • Following that, keep the references to the licenses that you've included (I'll defer to you and the team on whether those should reference Annex G and H, or not; I'm not sure how the new spec document is being structured)
  • Following that, please re-insert the "With thanks to..." list of individuals from https://spdx.github.io/spdx-spec/v3.0/ (and any additions, if there are any new individuals to be added for 3.0.1)

bact and others added 2 commits August 9, 2024 06:47
Merge copyrights.md into index.md

Signed-off-by: Arthit Suriyawongkul <arthit@gmail.com>
Co-Authored-By: Steve Winslow <678569+swinslow@users.noreply.github.com>
@bact bact requested a review from swinslow August 9, 2024 06:02
@bact
Copy link
Collaborator Author

bact commented Aug 9, 2024

@bact Can we revise this as follows?

* Rather than the four copyright notices at the top, please replace with: "Copyright © 2010-2024, Linux Foundation and its Contributors, including SPDX Model contributions from OMG and its Contributors"

* Following that, keep the references to the licenses that you've included (I'll defer to you and the team on whether those should reference Annex G and H, or not; I'm not sure how the new spec document is being structured)

* Following that, please re-insert the "With thanks to..." list of individuals from https://spdx.github.io/spdx-spec/v3.0/ (and any additions, if there are any new individuals to be added for 3.0.1)

@swinslow Done. Everything is now in index.md.

For Annex G and H, they are no longer the licenses.
The same line in https://spdx.github.io/spdx-spec/v3.0/ does not put reference to any Annexes.
I replaced that line with one from v3.0 instead.

They are now read:

The System Package Data Exchange® (SPDX®) Specification Version 3.0.1

Copyright © 2010-2024, Linux Foundation and its Contributors, including SPDX Model contributions from OMG and its Contributors

This work is licensed under the Community Specification License 1.0 (Community-Spec-1.0). Pre-existing portions of this work from copyright holders who have not subsequently contributed under the Community-Spec-1.0 are provided under Creative Commons Attribution License 3.0 Unported (CC-BY-3.0). Copies of these licenses are reproduced in their entirety herein.

If you like, we can make the texts "Community Specification License 1.0" and "Creative Commons Attribution License 3.0 Unported" to be clickable and link to https://spdx.github.io/spdx-spec/v3.0/licenses/Community-Spec-1.0/ and https://spdx.github.io/spdx-spec/v3.0/licenses/CC-BY-3.0/

Signed-off-by: Arthit Suriyawongkul <arthit@gmail.com>
@goneall goneall added this to the 3.0.1 milestone Aug 9, 2024
@kestewart
Copy link
Contributor

Pending discussion between Bob, Steve & Mike.

@swinslow
Copy link
Member

swinslow commented Aug 9, 2024

Hi @bact,

On the linking to the license texts in GitHub, I don't have a particular preference here. Especially if it means having to keep track of version / branch numbers as the spec evolves, I'm fine with just the general reference since they're included as annexes in the spec anyway.

As @kestewart mentioned, we had a few further edits based on discussions with OMG. Would you mind making a couple further update? Thank you again for all your help!

= = = = =

  1. On a new line immediately prior to "This work is licensed under the...", please add a heading that says "Use of Specification - Terms, Conditions & Notices"

  2. After that paragraph, please add the following text:

Trademarks 

SPDX® is a registered trademark of the Linux Foundation. 

Compliance

Use of the SPDX trademarks is subject to the SPDX Trademark License, currently available at https://spdx.dev/about/legal-notices/

Software developed under the terms of the licenses under which this specification is issued may claim compliance or conformance with this specification if and only if the software provider complies with the SPDX Trademark License given above.

= = = = =

@bobmartin3000 @kestewart I'm suggesting that for the SPDX published version of the spec, we retain the "With thanks to..." section where it is. I understand that OMG may shift that to a different clause for their version.

Please take a look and let me know if you have concerns about either of the changes above. Thanks!

@bact bact mentioned this pull request Aug 9, 2024
@bact
Copy link
Collaborator Author

bact commented Aug 9, 2024

@swinslow added the new section as you suggested.

I also added another heading "Contributors" so the list of contributors is separated from the "Use of Specification" If you think it may be not a good idea, please tell. thx

@bobmartin3000
Copy link

bobmartin3000 commented Aug 10, 2024 via email

@bact
Copy link
Collaborator Author

bact commented Aug 10, 2024

@swinslow @bobmartin3000 @kestewart how are we supposed to use the name "Linux Foundation"?

@swinslow
Copy link
Member

@bact Good eye. :) The formal name of the LF is "The Linux Foundation". So for each of those, it should be a first-letter-capitalized "The" at front. Thanks for catching this!

@bact
Copy link
Collaborator Author

bact commented Aug 10, 2024

Thank you, I will change that accordingly.

@swinslow
Copy link
Member

@bact One comment from your changes -- let's please not use the word "Contributors" for the heading there. That's because that word has particular meanings under the Community Spec license and I just want to avoid confusion around that (this relates also to the discussions we had with OMG yesterday).

Agreed though with setting it off separately from the rest. Perhaps just "Thanks" as the heading?

@bact
Copy link
Collaborator Author

bact commented Aug 10, 2024

@swinslow got it. Will change the heading too

Signed-off-by: Arthit Suriyawongkul <arthit@gmail.com>
@bact
Copy link
Collaborator Author

bact commented Aug 10, 2024

@swinslow done.

bact added a commit to bact/spdx-spec that referenced this pull request Aug 10, 2024
Per spdx#1010 (comment)

Signed-off-by: Arthit Suriyawongkul <arthit@gmail.com>
bact added a commit to bact/spdx-spec that referenced this pull request Aug 10, 2024
Per spdx#1010 (comment)

Signed-off-by: Arthit Suriyawongkul <arthit@gmail.com>
bact added a commit to bact/spdx-spec that referenced this pull request Aug 10, 2024
Per @swinslow comment at spdx#1010 (comment)

Signed-off-by: Arthit Suriyawongkul <arthit@gmail.com>
@swinslow
Copy link
Member

Sorry @bact, I just realized one more tweak -- my apologies :)

The heading "## Use of Specification - Terms, Conditions & Notices" on line 15 -- that should appear above "This work is licensed under..." on line 6. After that change, I think we can call this done!

Signed-off-by: Arthit Suriyawongkul <arthit@gmail.com>
Copy link
Member

@swinslow swinslow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for handling all the adjustments, @bact. Greatly appreciate it!

Signed-off-by: Arthit Suriyawongkul <arthit@gmail.com>
@bact
Copy link
Collaborator Author

bact commented Aug 10, 2024

@swinslow thank you for super quick review as well

Signed-off-by: Arthit Suriyawongkul <arthit@gmail.com>
@kestewart kestewart merged commit 98a7bfa into spdx:development/v3.0.1 Aug 10, 2024
3 checks passed
kestewart pushed a commit that referenced this pull request Aug 10, 2024
Per @swinslow comment at #1010 (comment)

Signed-off-by: Arthit Suriyawongkul <arthit@gmail.com>
kestewart pushed a commit that referenced this pull request Aug 10, 2024
Per #1010 (comment)

Signed-off-by: Arthit Suriyawongkul <arthit@gmail.com>
@bact bact deleted the add-page-copyright branch August 10, 2024 17:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants