From ce79e188c801e56eaede00f605ced2a64dabf5c4 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Sep 16 2024 03:59:27 +0000 Subject: [PATCH 1/2] Add cargo tree command for figuring out license summaries Signed-off-by: Ryan Brue --- diff --git a/docs/index.md b/docs/index.md index 6a23b56..e70bbaa 100644 --- a/docs/index.md +++ b/docs/index.md @@ -2,4 +2,13 @@ The current state of packaging is pretty set, each individual rpm and their patches can be found in the `rpms/*` folder. -The `scripts` folder contains scripts used in the unofficial working repo for the COSMIC master branch . These can be applied to any copr though, provided you set it up properly. \ No newline at end of file +The `scripts` folder contains scripts used in the unofficial working repo for the COSMIC master branch . These can be applied to any copr though, provided you set it up properly. + + +Checking licenses of rust projects: + +```shell +cargo tree --workspace --edges no-build,no-dev,no-proc-macro --no-dedupe --target all --prefix none --format "{p}: {l}" +``` + +Thanks to Fabio Valentini for that command ^ \ No newline at end of file From 2b265d9e034d1a7177008860fae669c535200e69 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Sep 16 2024 04:38:22 +0000 Subject: [PATCH 2/2] docs/license: work on License fixes and document command used to generate licenses Signed-off-by: Ryan Brue --- diff --git a/docs/.gitignore b/docs/.gitignore new file mode 100644 index 0000000..7585238 --- /dev/null +++ b/docs/.gitignore @@ -0,0 +1 @@ +book diff --git a/docs/book.toml b/docs/book.toml new file mode 100644 index 0000000..7be038e --- /dev/null +++ b/docs/book.toml @@ -0,0 +1,6 @@ +[book] +authors = ["Ryan Brue"] +language = "en" +multilingual = false +src = "src" +title = "COSMIC Fedora Packaging" diff --git a/docs/build-for-rawhide.md b/docs/build-for-rawhide.md deleted file mode 100644 index bd7d544..0000000 --- a/docs/build-for-rawhide.md +++ /dev/null @@ -1,11 +0,0 @@ -```sh -fedpkg request-repo ... -fedpkg clone && cd -fedpkg import /path/to/package.src.rpm -fedpkg commit -m "Initial import to Fedora (rhbz#XXXXXXXX)" -fedpkg push && fedpkg build -``` - -``` -fkinit -``` \ No newline at end of file diff --git a/docs/index.md b/docs/index.md deleted file mode 100644 index e70bbaa..0000000 --- a/docs/index.md +++ /dev/null @@ -1,14 +0,0 @@ -# COSMIC Packaging for Fedora - -The current state of packaging is pretty set, each individual rpm and their patches can be found in the `rpms/*` folder. - -The `scripts` folder contains scripts used in the unofficial working repo for the COSMIC master branch . These can be applied to any copr though, provided you set it up properly. - - -Checking licenses of rust projects: - -```shell -cargo tree --workspace --edges no-build,no-dev,no-proc-macro --no-dedupe --target all --prefix none --format "{p}: {l}" -``` - -Thanks to Fabio Valentini for that command ^ \ No newline at end of file diff --git a/docs/src/SUMMARY.md b/docs/src/SUMMARY.md new file mode 100644 index 0000000..92bdef7 --- /dev/null +++ b/docs/src/SUMMARY.md @@ -0,0 +1,4 @@ +# Summary + +- [Welcome](./index.md) +- [Building for Rawhide](./building-for-rawhide.md) diff --git a/docs/src/building-for-rawhide.md b/docs/src/building-for-rawhide.md new file mode 100644 index 0000000..08caf77 --- /dev/null +++ b/docs/src/building-for-rawhide.md @@ -0,0 +1,13 @@ +# Building for Rawhide + +```sh +fedpkg request-repo ... +fedpkg clone && cd +fedpkg import /path/to/package.src.rpm +fedpkg commit -m "Initial import to Fedora (rhbz#XXXXXXXX)" +fedpkg push && fedpkg build +``` + +``` +fkinit +``` \ No newline at end of file diff --git a/docs/src/generating-license.md b/docs/src/generating-license.md new file mode 100644 index 0000000..8b70610 --- /dev/null +++ b/docs/src/generating-license.md @@ -0,0 +1,23 @@ +# Generating Licenses + +Checking licenses of rust projects: + +```shell +cargo tree --workspace --edges no-build,no-dev,no-proc-macro --no-dedupe --target all --prefix none --format "{p}: {l}" +``` + +Thanks to Fabio Valentini for that command ^ + +Getting licenses for the `License:` section in the spec file: + +```shell +cargo tree --workspace --edges no-build,no-dev,no-proc-macro --no-dedupe --target all --prefix none --format "{l}" | sort | uniq | sed '/OR/ s/.*/(&)/' | awk '{printf("%s AND ", $0)} END {print ""}' | sed 's/AND$//' +``` + +> **NOTE:** There might be an AND before and after, make sure to remove those! + + +Licenses updated so far: + +cosmic-bg +cosmic-comp \ No newline at end of file diff --git a/docs/src/index.md b/docs/src/index.md new file mode 100644 index 0000000..6a23b56 --- /dev/null +++ b/docs/src/index.md @@ -0,0 +1,5 @@ +# COSMIC Packaging for Fedora + +The current state of packaging is pretty set, each individual rpm and their patches can be found in the `rpms/*` folder. + +The `scripts` folder contains scripts used in the unofficial working repo for the COSMIC master branch . These can be applied to any copr though, provided you set it up properly. \ No newline at end of file diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec index a7f2a88..45954bd 100644 --- a/rpms/cosmic-bg/cosmic-bg.spec +++ b/rpms/cosmic-bg/cosmic-bg.spec @@ -13,21 +13,7 @@ Version: ### Release: %autorelease Summary: Background manager for the COSMIC Desktop Environment -# 0BSD OR MIT OR Apache-2.0 -# Apache-2.0 OR MIT -# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT -# BSD-3-Clause -# BSL-1.0 -# CC0-1.0 -# ISC -# MIT -# MIT OR Apache-2.0 -# MIT OR Apache-2.0 OR Zlib -# MIT OR Zlib OR Apache-2.0 -# MPL-2.0 -# Unlicense OR MIT -# Zlib OR Apache-2.0 OR MIT -License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 OR MIT AND Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT AND BSD-3-Clause AND BSL-1.0 AND CC0-1.0 AND ISC AND MIT AND MIT OR Apache-2.0 AND MIT OR Apache-2.0 OR Zlib AND MIT OR Zlib OR Apache-2.0 AND MPL-2.0 AND Unlicense OR MIT AND Zlib OR Apache-2.0 OR MIT +License: (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND Apache-2.0/MIT AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND BSD-3-Clause AND BSL-1.0 AND CC0-1.0 AND ISC AND MIT AND MIT/Apache-2.0 AND (MIT OR Apache-2.0) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Zlib OR Apache-2.0) AND MPL-2.0 AND Unlicense/MIT AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT) # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-bg diff --git a/rpms/cosmic-comp/cosmic-comp.spec b/rpms/cosmic-comp/cosmic-comp.spec index 4f06094..5623d6d 100644 --- a/rpms/cosmic-comp/cosmic-comp.spec +++ b/rpms/cosmic-comp/cosmic-comp.spec @@ -13,32 +13,7 @@ Version: ### Release: %autorelease Summary: Compositor for the COSMIC Desktop Environment -# (Apache-2.0 OR MIT) AND BSD-3-Clause -# 0BSD OR MIT OR Apache-2.0 -# Apache-2.0 -# Apache-2.0 OR BSD-3-Clause -# Apache-2.0 OR BSL-1.0 -# Apache-2.0 OR MIT -# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT -# BSD-2-Clause -# BSD-2-Clause OR Apache-2.0 OR MIT -# BSD-3-Clause -# BSD-3-Clause OR MIT OR Apache-2.0 -# BSL-1.0 -# CC0-1.0 -# GPL-3.0 -# GPL-3.0-only -# ISC -# MIT -# MIT OR Apache-2.0 -# MIT OR Apache-2.0 OR CC0-1.0 -# MIT OR Apache-2.0 OR Zlib -# MIT OR Zlib OR Apache-2.0 -# MPL-2.0 -# Unlicense OR MIT -# Zlib -# Zlib OR Apache-2.0 OR MIT -License: GPL-3.0 AND (Apache-2.0 OR MIT) AND BSD-3-Clause AND 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR BSD-3-Clause AND Apache-2.0 OR BSL-1.0 AND Apache-2.0 OR MIT AND Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT AND BSD-2-Clause AND BSD-2-Clause OR Apache-2.0 OR MIT AND BSD-3-Clause AND BSD-3-Clause OR MIT OR Apache-2.0 AND BSL-1.0 AND CC0-1.0 AND GPL-3.0 AND GPL-3.0-only AND ISC AND MIT AND MIT OR Apache-2.0 AND MIT OR Apache-2.0 OR CC0-1.0 AND MIT OR Apache-2.0 OR Zlib AND MIT OR Zlib OR Apache-2.0 AND MPL-2.0 AND Unlicense OR MIT AND Zlib AND Zlib OR Apache-2.0 OR MIT +License: (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND Apache-2.0/MIT AND (Apache-2.0 OR BSD-3-Clause) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND BSD-2-Clause AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND BSD-3-Clause AND (BSD-3-Clause OR MIT OR Apache-2.0) AND BSL-1.0 AND CC0-1.0 AND GPL-3.0-only AND ISC AND MIT AND MIT/Apache-2.0 AND (MIT OR Apache-2.0) AND (MIT OR Apache-2.0 OR CC0-1.0) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Zlib OR Apache-2.0) AND MPL-2.0 AND Unicode-3.0 AND Unlicense/MIT AND (Unlicense OR MIT) AND Zlib AND (Zlib OR Apache-2.0 OR MIT) # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-comp