From 7df306c4402845b57d1628a64be7e935937296c4 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Sep 27 2024 04:03:35 +0000 Subject: [PATCH 1/3] more work on the helper tool Signed-off-by: Ryan Brue --- diff --git a/Cargo.lock b/Cargo.lock index 92b4a82..6deba74 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -104,6 +104,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] +name = "cosmic-packaging-tool" +version = "0.1.0" +dependencies = [ + "anyhow", + "clap", +] + +[[package]] name = "heck" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -116,14 +124,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] -name = "license_generator" -version = "0.1.0" -dependencies = [ - "anyhow", - "clap", -] - -[[package]] name = "proc-macro2" version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/Cargo.toml b/Cargo.toml index f4cf5f2..d1278b7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,4 +1,4 @@ [workspace] members = [ - "helper_programs/*" + "cosmic-packaging-tool" ] \ No newline at end of file diff --git a/cosmic-packaging-tool/.gitignore b/cosmic-packaging-tool/.gitignore new file mode 100644 index 0000000..0fce04d --- /dev/null +++ b/cosmic-packaging-tool/.gitignore @@ -0,0 +1 @@ +/workdir \ No newline at end of file diff --git a/cosmic-packaging-tool/Cargo.toml b/cosmic-packaging-tool/Cargo.toml new file mode 100644 index 0000000..66c2ab9 --- /dev/null +++ b/cosmic-packaging-tool/Cargo.toml @@ -0,0 +1,10 @@ +[package] +name = "cosmic-packaging-tool" +authors = ["Ryan Brue "] +license = "MIT" +version = "0.1.0" +edition = "2021" + +[dependencies] +anyhow = "1.0.89" +clap = { version = "4.5.18", features = ["derive"] } diff --git a/cosmic-packaging-tool/README.md b/cosmic-packaging-tool/README.md new file mode 100644 index 0000000..4a647a9 --- /dev/null +++ b/cosmic-packaging-tool/README.md @@ -0,0 +1 @@ +# A small collection of helper programs for cosmic-packaging \ No newline at end of file diff --git a/cosmic-packaging-tool/src/main.rs b/cosmic-packaging-tool/src/main.rs new file mode 100644 index 0000000..97309c9 --- /dev/null +++ b/cosmic-packaging-tool/src/main.rs @@ -0,0 +1,254 @@ +use std::{ + collections::HashSet, + env, + fs::{self, File}, + io::{self, BufRead, Write}, + path::{Path, PathBuf}, + process::Command, +}; + +use clap::{Parser, Subcommand}; + +#[derive(Parser)] +#[command(version, about)] +/// Tools for fedora cosmic packaging +struct Cli { + /// Command to run + #[command(subcommand)] + action: Commands, +} + +#[derive(Subcommand, Clone, Debug)] +enum Commands { + /// Update the licenses for the cosmic packages + UpdateLicenses { + /// Working directory + workdir: PathBuf, + /// Clean working directory + #[arg(short, long)] + clean: bool, + /// Packaging directory to rewrite cosmic spec files (OPTIONAL) + #[arg(long)] + packaging_dir: Option, + }, +} + +const PACKAGES_ITER: [Packages; 22] = [ + Packages::CosmicAppLibrary, + Packages::CosmicApplets, + Packages::CosmicBg, + Packages::CosmicComp, + Packages::CosmicEdit, + Packages::CosmicFiles, + Packages::CosmicGreeter, + Packages::CosmicIcons, + Packages::CosmicLauncher, + Packages::CosmicNotifications, + Packages::CosmicOsd, + Packages::CosmicPanel, + Packages::CosmicRandr, + Packages::CosmicScreenshot, + Packages::CosmicSession, + Packages::CosmicSettings, + Packages::CosmicSettingsDaemon, + Packages::CosmicStore, + Packages::CosmicTerm, + Packages::CosmicWorkspaces, + Packages::PopLauncher, + Packages::XdgDesktopPortalCosmic, +]; + +enum Packages { + CosmicAppLibrary, + CosmicApplets, + CosmicBg, + CosmicComp, + CosmicEdit, + CosmicFiles, + CosmicGreeter, + CosmicIcons, + CosmicLauncher, + CosmicNotifications, + CosmicOsd, + CosmicPanel, + CosmicRandr, + CosmicScreenshot, + CosmicSession, + CosmicSettings, + CosmicSettingsDaemon, + CosmicStore, + CosmicTerm, + CosmicWorkspaces, + PopLauncher, + XdgDesktopPortalCosmic, +} + +impl Packages { + fn to_repo<'a>(&self) -> &'a str { + match self { + Packages::CosmicAppLibrary => "cosmic-applibrary", + Packages::CosmicApplets => "cosmic-applets", + Packages::CosmicBg => "cosmic-bg", + Packages::CosmicComp => "cosmic-comp", + Packages::CosmicEdit => "cosmic-edit", + Packages::CosmicFiles => "cosmic-files", + Packages::CosmicGreeter => "cosmic-greeter", + Packages::CosmicIcons => "cosmic-icons", + Packages::CosmicLauncher => "cosmic-launcher", + Packages::CosmicNotifications => "cosmic-notifications", + Packages::CosmicOsd => "cosmic-osd", + Packages::CosmicPanel => "cosmic-panel", + Packages::CosmicRandr => "cosmic-randr", + Packages::CosmicScreenshot => "cosmic-screenshot", + Packages::CosmicSession => "cosmic-session", + Packages::CosmicSettings => "cosmic-settings", + Packages::CosmicSettingsDaemon => "cosmic-settings-daemon", + Packages::CosmicStore => "cosmic-store", + Packages::CosmicTerm => "cosmic-term", + Packages::CosmicWorkspaces => "cosmic-workspaces-epoch", + Packages::PopLauncher => "launcher", + Packages::XdgDesktopPortalCosmic => "xdg-desktop-portal-cosmic", + } + } + + fn package_name<'a>(&self) -> &'a str { + match self { + Packages::CosmicAppLibrary => "cosmic-app-library", + Packages::CosmicApplets => "cosmic-applets", + Packages::CosmicBg => "cosmic-bg", + Packages::CosmicComp => "cosmic-comp", + Packages::CosmicEdit => "cosmic-edit", + Packages::CosmicFiles => "cosmic-files", + Packages::CosmicGreeter => "cosmic-greeter", + Packages::CosmicIcons => "cosmic-icon-theme", + Packages::CosmicLauncher => "cosmic-launcher", + Packages::CosmicNotifications => "cosmic-notifications", + Packages::CosmicOsd => "cosmic-osd", + Packages::CosmicPanel => "cosmic-panel", + Packages::CosmicRandr => "cosmic-randr", + Packages::CosmicScreenshot => "cosmic-screenshot", + Packages::CosmicSession => "cosmic-session", + Packages::CosmicSettings => "cosmic-settings", + Packages::CosmicSettingsDaemon => "cosmic-settings-daemon", + Packages::CosmicStore => "cosmic-store", + Packages::CosmicTerm => "cosmic-term", + Packages::CosmicWorkspaces => "cosmic-workspaces", + Packages::PopLauncher => "pop-launcher", + Packages::XdgDesktopPortalCosmic => "xdg-desktop-portal-cosmic", + } + } +} + +fn main() -> anyhow::Result<()> { + let args = Cli::parse(); + match args.action { + Commands::UpdateLicenses { + workdir, + clean, + packaging_dir, + } => update_licenses_command(workdir, clean, packaging_dir), + } +} + +fn update_licenses_command( + workdir: PathBuf, + clean: bool, + packaging_dir: Option, +) -> anyhow::Result<()> { + let base_working_dir = workdir.canonicalize().unwrap(); + if clean { + let _ = fs::remove_dir_all(&base_working_dir); + let _ = fs::create_dir(&base_working_dir); + } + println!("Working directory: {:?}", &base_working_dir); + let mut result_string = "".to_string(); + let res = || -> anyhow::Result<()> { + for package in PACKAGES_ITER { + let package_repo = package.to_repo(); + let package_name = package.package_name(); + println!("Package: {}", package_repo); + if !&base_working_dir.join(package_repo).exists() { + let _ = Command::new("git") + .current_dir(&base_working_dir) + .arg("clone") + .arg(format!("https://github.com/pop-os/{}.git", package_repo)) + .status()?; + } + let output = Command::new("sh") + .current_dir(base_working_dir.join(package_repo)) + .arg("-c") + .arg( + r##"cargo tree --workspace --edges no-build,no-dev,no-proc-macro --no-dedupe --target all --prefix none --format "{l}" | sort | uniq"## + ).output()?; + + let (stdout, _stderr) = ( + String::from_utf8(output.stdout).unwrap(), + String::from_utf8(output.stderr).unwrap(), + ); + let license_result = stdout + .lines() + .map(|l| { + let repl_or = l.replace("/", " OR "); + if repl_or.contains("OR") { + format!("({})", repl_or) + } else { + repl_or + } + }) + .collect::>() + .into_iter() + .collect::>() + .join(" AND "); + if let Some(packaging_dir) = packaging_dir.as_deref() { + set_license( + &packaging_dir.join(&format!("rpms/{}/{}.spec", package_name, package_name)), + &license_result, + )?; + } + result_string.push_str(&format!("License: {}", &license_result)); + } + Ok(()) + }(); + + if res.is_err() { + eprintln!("There was a problem with the program. Saving what was grabbed.") + } else { + println!("Program executed successfully!"); + } + let _ = env::set_current_dir(&base_working_dir); + fs::write( + &base_working_dir.join("cosmic_licenses.txt"), + &result_string, + )?; + Ok(()) +} + +fn set_license(spec_path: &Path, license: &str) -> anyhow::Result<()> { + let search_prefix = "License: "; + let replacement = &format!("License: {}", license); + + // Step 1: Open the file and read it line by line + let file = File::open(spec_path)?; + let reader = io::BufReader::new(file); + + let mut new_content = Vec::new(); // To store the modified file content + + for line in reader.lines() { + let line = line?; // Unwrap the Result to get the actual line content + // Step 2: Check if the line starts with "Key:" + if line.starts_with(search_prefix) { + // Step 3: Replace the whole line + new_content.push(replacement.to_string()); + } else { + // Keep the original line + new_content.push(line); + } + } + + // Step 4: Write the modified content back to the file + let mut file = File::create(&spec_path)?; // Open the file in write mode + for line in new_content { + writeln!(file, "{}", line)?; + } + Ok(()) +} diff --git a/helper_programs/README.md b/helper_programs/README.md deleted file mode 100644 index 4a647a9..0000000 --- a/helper_programs/README.md +++ /dev/null @@ -1 +0,0 @@ -# A small collection of helper programs for cosmic-packaging \ No newline at end of file diff --git a/helper_programs/license_generator/.gitignore b/helper_programs/license_generator/.gitignore deleted file mode 100644 index 0fce04d..0000000 --- a/helper_programs/license_generator/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/workdir \ No newline at end of file diff --git a/helper_programs/license_generator/Cargo.toml b/helper_programs/license_generator/Cargo.toml deleted file mode 100644 index 8652f4d..0000000 --- a/helper_programs/license_generator/Cargo.toml +++ /dev/null @@ -1,10 +0,0 @@ -[package] -name = "license_generator" -authors = ["Ryan Brue "] -license = "MIT" -version = "0.1.0" -edition = "2021" - -[dependencies] -anyhow = "1.0.89" -clap = { version = "4.5.18", features = ["derive"] } diff --git a/helper_programs/license_generator/src/main.rs b/helper_programs/license_generator/src/main.rs deleted file mode 100644 index a9d6ee5..0000000 --- a/helper_programs/license_generator/src/main.rs +++ /dev/null @@ -1,102 +0,0 @@ -use std::{env, fs, path::PathBuf, process::Command}; - -use clap::{Parser, ValueEnum}; - -#[derive(Parser)] -#[command(version, about)] -/// Generate licenses for cosmic packages -struct Cli { - #[arg(value_enum)] - out_type: OutType, - /// Working directory - workdir: PathBuf, - /// Clean working directory - #[arg(short, long)] - clean: bool, -} - -#[derive(ValueEnum, Clone, Debug)] -enum OutType { - LicenseForSpec, - LicenseGPL, - LicenseSummary, -} - -const PACKAGES: [&str; 22] = [ - "cosmic-applibrary", - "cosmic-applets", - "cosmic-bg", - "cosmic-comp", - "cosmic-edit", - "cosmic-files", - "cosmic-greeter", - "cosmic-icons", - "cosmic-launcher", - "cosmic-notifications", - "cosmic-osd", - "cosmic-panel", - "cosmic-randr", - "cosmic-screenshot", - "cosmic-session", - "cosmic-settings", - "cosmic-settings-daemon", - "cosmic-store", - "cosmic-term", - "cosmic-workspaces-epoch", - "launcher", - "xdg-desktop-portal-cosmic", -]; - -fn main() -> anyhow::Result<()> { - let args = Cli::parse(); - let base_working_dir = args.workdir.canonicalize().unwrap(); - if args.clean { - let _ = fs::remove_dir_all(&base_working_dir); - let _ = fs::create_dir(&base_working_dir); - } - println!("Working directory: {:?}", &base_working_dir); - let mut result_string = "".to_string(); - let res = || -> anyhow::Result<()> { - for package in PACKAGES { - println!("Package: {}", package); - if !&base_working_dir.join(package).exists() { - let _ = Command::new("git") - .current_dir(&base_working_dir) - .arg("clone") - .arg(format!("https://github.com/pop-os/{}.git", package)) - .status()?; - } - let output = Command::new("sh") - .current_dir(base_working_dir.join(package)) - .arg("-c") - .arg( - match args.out_type { - OutType::LicenseForSpec => r##"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$//'"##, - OutType::LicenseGPL => r##"cargo tree --workspace --edges no-build,no-dev,no-proc-macro --no-dedupe --target all --prefix none --format "{p}: {l}" | grep "GPL-3.0$""##, - OutType::LicenseSummary => r##"cargo tree --workspace --edges no-build,no-dev,no-proc-macro --no-dedupe --target all --prefix none --format "{l}""##, - } - - ).output()?; - - let (stdout, _stderr) = ( - String::from_utf8(output.stdout).unwrap(), - String::from_utf8(output.stderr).unwrap(), - ); - // println!("stdout: {} stderr: {}\n", &stdout, &stderr); - result_string.push_str(&format!("{}\n{}\n\n", package, &stdout)); - } - Ok(()) - }(); - - if res.is_err() { - eprintln!("There was a problem with the program. Saving what was grabbed.") - } else { - println!("Program executed successfully!"); - } - let _ = env::set_current_dir(&base_working_dir); - fs::write( - &base_working_dir.join("cosmic_licenses.txt"), - &result_string, - )?; - Ok(()) -} From 67508748ed140b0cfb99a707312ff8f728603c48 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Sep 27 2024 04:10:42 +0000 Subject: [PATCH 2/3] update packages' licenses again Signed-off-by: Ryan Brue --- diff --git a/cosmic-packaging-tool/src/main.rs b/cosmic-packaging-tool/src/main.rs index 97309c9..543958d 100644 --- a/cosmic-packaging-tool/src/main.rs +++ b/cosmic-packaging-tool/src/main.rs @@ -30,6 +30,10 @@ enum Commands { /// Packaging directory to rewrite cosmic spec files (OPTIONAL) #[arg(long)] packaging_dir: Option, + /// Optionally exclude GPL-3.0 from the license summary. cosmic-protocols has had its + /// license clarified but is still on old versions for all the packages. + #[arg(long)] + exclude_gpl_3: bool, }, } @@ -146,7 +150,8 @@ fn main() -> anyhow::Result<()> { workdir, clean, packaging_dir, - } => update_licenses_command(workdir, clean, packaging_dir), + exclude_gpl_3, + } => update_licenses_command(workdir, clean, packaging_dir, exclude_gpl_3), } } @@ -154,6 +159,7 @@ fn update_licenses_command( workdir: PathBuf, clean: bool, packaging_dir: Option, + exclude_gpl_3: bool, ) -> anyhow::Result<()> { let base_working_dir = workdir.canonicalize().unwrap(); if clean { @@ -187,12 +193,16 @@ fn update_licenses_command( ); let license_result = stdout .lines() - .map(|l| { + .filter_map(|l| { + if l == "GPL-3.0" && exclude_gpl_3 { + println!("Skipping raw GPL-3.0"); + return None; + } let repl_or = l.replace("/", " OR "); if repl_or.contains("OR") { - format!("({})", repl_or) + Some(format!("({})", repl_or)) } else { - repl_or + Some(repl_or) } }) .collect::>() diff --git a/rpms/cosmic-app-library/cosmic-app-library.spec b/rpms/cosmic-app-library/cosmic-app-library.spec index a872421..4f2e168 100644 --- a/rpms/cosmic-app-library/cosmic-app-library.spec +++ b/rpms/cosmic-app-library/cosmic-app-library.spec @@ -15,7 +15,7 @@ Version: ### Release: %autorelease Summary: App Library program for the COSMIC Desktop Environment -License: (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND Apache-2.0/MIT 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 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 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: (MIT OR Apache-2.0 OR CC0-1.0) AND BSL-1.0 AND (Apache-2.0 OR MIT) AND MPL-2.0 AND MIT AND (MIT OR Apache-2.0) AND Zlib AND (Apache-2.0 OR BSL-1.0) AND (Zlib OR Apache-2.0 OR MIT) AND (0BSD OR MIT OR Apache-2.0) AND CC0-1.0 AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND ISC AND (MIT OR Zlib OR Apache-2.0) AND BSD-3-Clause AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (Unlicense OR MIT) AND Apache-2.0 AND (MIT OR Apache-2.0 OR Zlib) AND Unicode-3.0 AND BSD-2-Clause AND URL: https://github.com/pop-os/cosmic-applibrary diff --git a/rpms/cosmic-applets/cosmic-applets.spec b/rpms/cosmic-applets/cosmic-applets.spec index 8df199f..3317f38 100644 --- a/rpms/cosmic-applets/cosmic-applets.spec +++ b/rpms/cosmic-applets/cosmic-applets.spec @@ -13,7 +13,7 @@ Version: ### Release: %autorelease Summary: Applets for the COSMIC Desktop Environment -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 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 BSL-1.0 AND CC0-1.0 AND GPL-3.0-only AND GPL-3.0-or-later 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 AND Unlicense/MIT AND (Unlicense OR MIT) AND Zlib AND (Zlib OR Apache-2.0 OR MIT) +License: BSD-2-Clause AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND GPL-3.0-only AND GPL-3.0-or-later AND ISC AND Unicode-3.0 AND (Apache-2.0 OR BSL-1.0) AND BSL-1.0 AND Unlicense AND MPL-2.0 AND AND MIT AND Apache-2.0 AND (MIT OR Apache-2.0 OR CC0-1.0) AND (MIT OR Apache-2.0 OR Zlib) AND BSD-3-Clause AND (MIT OR Zlib OR Apache-2.0) AND (0BSD OR MIT OR Apache-2.0) AND CC0-1.0 AND (MIT OR Apache-2.0) AND (Unlicense OR MIT) AND Zlib AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 OR BSD-3-Clause) AND (Zlib OR Apache-2.0 OR MIT) URL: https://github.com/pop-os/cosmic-applets diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec index 964694b..0456308 100644 --- a/rpms/cosmic-bg/cosmic-bg.spec +++ b/rpms/cosmic-bg/cosmic-bg.spec @@ -13,7 +13,7 @@ Version: ### Release: %autorelease Summary: Background manager for the COSMIC Desktop Environment -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: (Apache-2.0 OR MIT) AND (Unlicense OR MIT) AND ISC AND Apache-2.0 AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (MIT OR Apache-2.0 OR Zlib) AND (Zlib OR Apache-2.0 OR MIT) AND (MIT OR Zlib OR Apache-2.0) AND BSL-1.0 AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND MIT AND (MIT OR Apache-2.0) AND (0BSD OR MIT OR Apache-2.0) AND AND BSD-3-Clause AND MPL-2.0 AND CC0-1.0 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 2dc5620..5791b7e 100644 --- a/rpms/cosmic-comp/cosmic-comp.spec +++ b/rpms/cosmic-comp/cosmic-comp.spec @@ -13,7 +13,7 @@ Version: ### Release: %autorelease Summary: Compositor for the COSMIC Desktop Environment -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: (BSD-2-Clause OR Apache-2.0 OR MIT) AND (Apache-2.0 OR BSL-1.0) AND BSL-1.0 AND (MIT OR Apache-2.0) AND (Apache-2.0 OR MIT) AND MIT AND (MIT OR Zlib OR Apache-2.0) AND Zlib AND BSD-2-Clause AND (BSD-3-Clause OR MIT OR Apache-2.0) AND GPL-3.0-only AND Apache-2.0 AND CC0-1.0 AND AND ISC AND (Unlicense OR MIT) AND (MIT OR Apache-2.0 OR CC0-1.0) AND (Apache-2.0 OR BSD-3-Clause) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND BSD-3-Clause AND (0BSD OR MIT OR Apache-2.0) AND MPL-2.0 AND Unicode-3.0 AND (Zlib OR Apache-2.0 OR MIT) AND ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND (MIT OR Apache-2.0 OR Zlib) URL: https://github.com/pop-os/cosmic-comp diff --git a/rpms/cosmic-edit/cosmic-edit.spec b/rpms/cosmic-edit/cosmic-edit.spec index de65a1f..40809c6 100644 --- a/rpms/cosmic-edit/cosmic-edit.spec +++ b/rpms/cosmic-edit/cosmic-edit.spec @@ -15,7 +15,7 @@ Version: ### Release: %autorelease Summary: Libcosmic text editor -License: (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND Apache-2.0/MIT AND Apache-2.0 / MIT 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 (CC0-1.0 OR MIT-0 OR Apache-2.0) AND GPL-2.0-only 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: MIT AND (CC0-1.0 OR MIT-0 OR Apache-2.0) AND AND (MIT OR Apache-2.0) AND (0BSD OR MIT OR Apache-2.0) AND GPL-2.0-only AND Zlib AND (Zlib OR Apache-2.0 OR MIT) AND CC0-1.0 AND (MIT OR Zlib OR Apache-2.0) AND GPL-3.0-only AND (MIT OR Apache-2.0 OR Zlib) AND BSD-2-Clause AND BSD-3-Clause AND (BSD-3-Clause OR MIT OR Apache-2.0) AND ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND ISC AND Apache-2.0 AND Unicode-3.0 AND MPL-2.0 AND (Unlicense OR MIT) AND (Apache-2.0 OR MIT) AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND BSL-1.0 AND (MIT OR Apache-2.0 OR CC0-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (Apache-2.0 OR BSL-1.0) URL: https://github.com/pop-os/cosmic-edit diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index 31462a4..1732e7e 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -16,7 +16,7 @@ Version: ### Release: %autorelease Summary: Libcosmic file manager -License: (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND Apache-2.0/MIT AND Apache-2.0 / MIT 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 (CC0-1.0 OR MIT-0 OR Apache-2.0) AND GPL-2.0-only 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: (BSD-2-Clause OR Apache-2.0 OR MIT) AND GPL-2.0-only AND CC0-1.0 AND BSD-2-Clause AND (MIT OR Apache-2.0 OR CC0-1.0) AND (MIT OR Apache-2.0) AND (Apache-2.0 OR BSL-1.0) AND AND Apache-2.0 AND (BSD-3-Clause OR MIT OR Apache-2.0) AND (MIT OR Apache-2.0 OR Zlib) AND MPL-2.0 AND Unicode-3.0 AND (0BSD OR MIT OR Apache-2.0) AND BSL-1.0 AND ISC AND (MIT OR Zlib OR Apache-2.0) AND (Apache-2.0 OR MIT) AND BSD-3-Clause AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (CC0-1.0 OR MIT-0 OR Apache-2.0) AND (Apache-2.0 OR MIT) AND MIT AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT) AND GPL-3.0-only AND Zlib URL: https://github.com/pop-os/cosmic-files diff --git a/rpms/cosmic-greeter/cosmic-greeter.spec b/rpms/cosmic-greeter/cosmic-greeter.spec index 1c43e8d..0e66f0f 100644 --- a/rpms/cosmic-greeter/cosmic-greeter.spec +++ b/rpms/cosmic-greeter/cosmic-greeter.spec @@ -14,7 +14,7 @@ Release: 2 # Release: %%autorelease Summary: Login and display manager for the COSMIC Desktop Environment -License: (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND Apache-2.0/MIT 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-3-Clause AND BSL-1.0 AND CC0-1.0 AND CC-PDDC 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: Zlib AND BSD-2-Clause AND (Unlicense OR MIT) AND BSL-1.0 AND (Apache-2.0 OR MIT) AND CC-PDDC AND GPL-3.0-only AND Unicode-3.0 AND (MIT OR Apache-2.0) AND (MIT OR Apache-2.0 OR CC0-1.0) AND (Zlib OR Apache-2.0 OR MIT) AND AND (MIT OR Zlib OR Apache-2.0) AND (MIT OR Apache-2.0 OR Zlib) AND BSD-3-Clause AND ISC AND (0BSD OR MIT OR Apache-2.0) AND MIT AND Apache-2.0 AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND CC0-1.0 AND (Apache-2.0 OR BSL-1.0) AND MPL-2.0 URL: https://github.com/pop-os/cosmic-greeter diff --git a/rpms/cosmic-icon-theme/cosmic-icon-theme.spec b/rpms/cosmic-icon-theme/cosmic-icon-theme.spec index fe2b76b..1c529bc 100644 --- a/rpms/cosmic-icon-theme/cosmic-icon-theme.spec +++ b/rpms/cosmic-icon-theme/cosmic-icon-theme.spec @@ -9,7 +9,7 @@ Version: ### Release: %autorelease Summary: Icon theme for the COSMIC Desktop Environment -License: CC-BY-SA-4.0 +License: URL: https://github.com/pop-os/cosmic-icons @@ -47,4 +47,4 @@ just rootdir=%{buildroot} install %changelog %autochangelog - \ No newline at end of file + diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index fb4074a..ebf85f5 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -16,7 +16,7 @@ Version: ### Release: %autorelease Summary: Pop launcher frontend for the COSMIC Desktop Environment -License: (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND Apache-2.0/MIT AND Apache-2.0 / MIT AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND Apache-2.0 WITH LLVM-exception AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND BSD-2-Clause AND BSD-3-Clause AND BSL-1.0 AND CC0-1.0 AND ISC AND MIT AND MIT AND BSD-3-Clause 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: BSD-3-Clause AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (Apache-2.0 OR BSL-1.0) AND (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND (Apache-2.0 OR MIT) AND BSD-2-Clause AND CC0-1.0 AND (MIT OR Apache-2.0 OR CC0-1.0) AND Apache-2.0 WITH LLVM-exception AND MIT AND Unicode-3.0 AND (Apache-2.0 OR MIT) AND (Unlicense OR MIT) AND MPL-2.0 AND (MIT OR Apache-2.0) AND (MIT OR Apache-2.0 OR Zlib) AND ISC AND (MIT OR Zlib OR Apache-2.0) AND Zlib AND (Zlib OR Apache-2.0 OR MIT) AND AND BSL-1.0 AND MIT AND BSD-3-Clause URL: https://github.com/pop-os/cosmic-launcher diff --git a/rpms/cosmic-notifications/cosmic-notifications.spec b/rpms/cosmic-notifications/cosmic-notifications.spec index 12637c2..500dbf4 100644 --- a/rpms/cosmic-notifications/cosmic-notifications.spec +++ b/rpms/cosmic-notifications/cosmic-notifications.spec @@ -13,7 +13,7 @@ Version: ### Release: %autorelease Summary: Notifications daemon for the COSMIC Desktop Environment -License: (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND Apache-2.0/MIT 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 WITH LLVM-exception OR Apache-2.0 OR MIT) AND BSD-2-Clause AND BSD-3-Clause AND BSL-1.0 AND CC0-1.0 AND ISC AND MIT AND MIT AND BSD-3-Clause 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: (Zlib OR Apache-2.0 OR MIT) AND BSD-2-Clause AND (Unlicense OR MIT) AND CC0-1.0 AND (Apache-2.0 OR MIT) AND (MIT OR Apache-2.0) AND MPL-2.0 AND AND (Apache-2.0 OR MIT) AND BSL-1.0 AND (MIT OR Apache-2.0 OR Zlib) AND Unicode-3.0 AND (0BSD OR MIT OR Apache-2.0) AND MIT AND (MIT OR Apache-2.0 OR CC0-1.0) AND (Apache-2.0 OR BSD-3-Clause) AND BSD-3-Clause AND (Apache-2.0 OR BSL-1.0) AND ISC AND MIT AND BSD-3-Clause AND Zlib AND (MIT OR Zlib OR Apache-2.0) AND Apache-2.0 AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) URL: https://github.com/pop-os/cosmic-notifications diff --git a/rpms/cosmic-osd/cosmic-osd.spec b/rpms/cosmic-osd/cosmic-osd.spec index 97c2a77..c163c56 100644 --- a/rpms/cosmic-osd/cosmic-osd.spec +++ b/rpms/cosmic-osd/cosmic-osd.spec @@ -16,7 +16,7 @@ Version: ### Release: %autorelease Summary: OSDs for the COSMIC Desktop Environment -License: (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND Apache-2.0/MIT 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-3-Clause AND BSL-1.0 AND CC0-1.0 AND GPL-3.0-or-later 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: BSD-3-Clause AND (Apache-2.0 OR MIT) AND AND BSD-2-Clause AND BSL-1.0 AND MPL-2.0 AND (Unlicense OR MIT) AND Zlib AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (0BSD OR MIT OR Apache-2.0) AND CC0-1.0 AND ISC AND (MIT OR Zlib OR Apache-2.0) AND (MIT OR Apache-2.0 OR Zlib) AND (Apache-2.0 OR BSL-1.0) AND (Zlib OR Apache-2.0 OR MIT) AND Apache-2.0 AND Unicode-3.0 AND GPL-3.0-or-later AND MIT AND (MIT OR Apache-2.0 OR CC0-1.0) AND (MIT OR Apache-2.0) URL: https://github.com/pop-os/cosmic-osd diff --git a/rpms/cosmic-panel/cosmic-panel.spec b/rpms/cosmic-panel/cosmic-panel.spec index 38a1ea1..22d8b33 100644 --- a/rpms/cosmic-panel/cosmic-panel.spec +++ b/rpms/cosmic-panel/cosmic-panel.spec @@ -13,7 +13,7 @@ Version: ### Release: %autorelease Summary: Panel for the COSMIC Desktop Environment -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 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 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 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/MIT AND (Unlicense OR MIT) AND Zlib AND (Zlib OR Apache-2.0 OR MIT) +License: AND ISC AND CC0-1.0 AND (MIT OR Apache-2.0 OR Zlib) AND (Zlib OR Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (Apache-2.0 OR MIT) AND BSL-1.0 AND (MIT OR Apache-2.0 OR CC0-1.0) AND MPL-2.0 AND BSD-2-Clause AND (MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND MIT AND (Unlicense OR MIT) AND Zlib AND (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND (Apache-2.0 OR BSL-1.0) AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND (Apache-2.0 OR BSD-3-Clause) AND BSD-3-Clause URL: https://github.com/pop-os/cosmic-panel diff --git a/rpms/cosmic-randr/cosmic-randr.spec b/rpms/cosmic-randr/cosmic-randr.spec index 09567c6..0602e4d 100644 --- a/rpms/cosmic-randr/cosmic-randr.spec +++ b/rpms/cosmic-randr/cosmic-randr.spec @@ -13,7 +13,7 @@ Version: ### Release: %autorelease Summary: Display configuration command line tool -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 GPL-3.0-only AND ISC AND MIT AND MIT/Apache-2.0 AND (MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND MPL-2.0 AND Unlicense/MIT AND (Unlicense OR MIT) AND Zlib +License: Apache-2.0 AND (0BSD OR MIT OR Apache-2.0) AND GPL-3.0-only AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (MIT OR Apache-2.0) AND AND (MIT OR Zlib OR Apache-2.0) AND ISC AND (Apache-2.0 OR MIT) AND (Unlicense OR MIT) AND MIT AND Zlib AND MPL-2.0 URL: https://github.com/pop-os/cosmic-randr diff --git a/rpms/cosmic-screenshot/cosmic-screenshot.spec b/rpms/cosmic-screenshot/cosmic-screenshot.spec index aefa3d1..ea43bfd 100644 --- a/rpms/cosmic-screenshot/cosmic-screenshot.spec +++ b/rpms/cosmic-screenshot/cosmic-screenshot.spec @@ -16,7 +16,7 @@ Version: ### Release: %autorelease Summary: Screenshot utility for the COSMIC Desktop Environment -License: (0BSD OR MIT OR 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-3-Clause 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 OR MIT) AND (Zlib OR Apache-2.0 OR MIT) +License: AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND BSD-3-Clause AND (MIT OR Apache-2.0 OR Zlib) AND (0BSD OR MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND MIT AND (MIT OR Apache-2.0) AND MPL-2.0 AND (Apache-2.0 OR MIT) AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT) URL: https://github.com/pop-os/cosmic-screenshot diff --git a/rpms/cosmic-session/cosmic-session.spec b/rpms/cosmic-session/cosmic-session.spec index ee87ea4..e3e86a4 100644 --- a/rpms/cosmic-session/cosmic-session.spec +++ b/rpms/cosmic-session/cosmic-session.spec @@ -16,7 +16,7 @@ Version: ### Release: %autorelease Summary: Session manager for the COSMIC desktop environment -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 WITH LLVM-exception OR Apache-2.0 OR MIT) AND BSD-3-Clause AND GPL-3.0-only AND MIT AND MIT/Apache-2.0 AND (MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND MPL-2.0 AND Unlicense/MIT AND Zlib AND (Zlib OR Apache-2.0 OR MIT) +License: AND MIT AND (Apache-2.0 OR MIT) AND (Unlicense OR MIT) AND BSD-3-Clause AND (Zlib OR Apache-2.0 OR MIT) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND Zlib AND GPL-3.0-only AND MPL-2.0 AND (MIT OR Zlib OR Apache-2.0) AND (Apache-2.0 OR BSD-3-Clause) AND (MIT OR Apache-2.0) URL: https://github.com/pop-os/cosmic-session diff --git a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec index adb3c91..c051982 100644 --- a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec +++ b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec @@ -16,7 +16,7 @@ Version: ### Release: %autorelease Summary: Settings daemon for the COSMIC Desktop Environment -License: (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND Apache-2.0/MIT 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 BSL-1.0 AND CC0-1.0 AND GPL-3.0-or-later 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 Unlicense/MIT AND (Unlicense OR MIT) AND Zlib AND (Zlib OR Apache-2.0 OR MIT) +License: ISC AND GPL-3.0-or-later AND (MIT OR Apache-2.0 OR CC0-1.0) AND (MIT OR Apache-2.0) AND MPL-2.0 AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND (Apache-2.0 OR BSL-1.0) AND BSD-3-Clause AND BSL-1.0 AND (MIT OR Zlib OR Apache-2.0) AND BSD-2-Clause AND Apache-2.0 AND (0BSD OR MIT OR Apache-2.0) AND Zlib AND (MIT OR Apache-2.0 OR Zlib) AND (Zlib OR Apache-2.0 OR MIT) AND AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND MIT AND CC0-1.0 AND (Apache-2.0 OR MIT) AND (Unlicense OR MIT) URL: https://github.com/pop-os/cosmic-settings-daemon diff --git a/rpms/cosmic-settings/cosmic-settings.spec b/rpms/cosmic-settings/cosmic-settings.spec index c365519..c6f5268 100644 --- a/rpms/cosmic-settings/cosmic-settings.spec +++ b/rpms/cosmic-settings/cosmic-settings.spec @@ -15,7 +15,7 @@ Version: ### Release: %autorelease Summary: Settings app for the COSMIC Desktop Environment -License: (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND Apache-2.0/MIT AND Apache-2.0 / MIT AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND Apache-2.0 WITH LLVM-exception 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 BSL-1.0 AND CC0-1.0 AND (CC0-1.0 OR Apache-2.0) AND GPL-3.0-only AND ISC AND MIT AND MIT/Apache-2.0 AND MIT/Apache-2.0/NCSA 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 AND Unlicense/MIT AND (Unlicense OR MIT) AND Zlib AND (Zlib OR Apache-2.0 OR MIT) +License: (Apache-2.0 OR MIT) AND (Apache-2.0 OR MIT) AND (MIT OR Apache-2.0 OR Zlib) AND Apache-2.0 AND (0BSD OR MIT OR Apache-2.0) AND CC0-1.0 AND (MIT OR Zlib OR Apache-2.0) AND (Unlicense OR MIT) AND Zlib AND (Zlib OR Apache-2.0 OR MIT) AND Unlicense AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND GPL-3.0-only AND Unicode-3.0 AND (CC0-1.0 OR Apache-2.0) AND ISC AND BSL-1.0 AND (MIT OR Apache-2.0 OR NCSA) AND Apache-2.0 WITH LLVM-exception AND (Apache-2.0 OR BSL-1.0) AND AND MIT AND (MIT OR Apache-2.0) AND (MIT OR Apache-2.0 OR CC0-1.0) AND MPL-2.0 AND BSD-2-Clause AND BSD-3-Clause URL: https://github.com/pop-os/cosmic-settings diff --git a/rpms/cosmic-store/cosmic-store.spec b/rpms/cosmic-store/cosmic-store.spec index 01c7ba5..fab8961 100644 --- a/rpms/cosmic-store/cosmic-store.spec +++ b/rpms/cosmic-store/cosmic-store.spec @@ -13,7 +13,7 @@ Version: ### Release: %autorelease Summary: App store for the COSMIC Desktop Environment -License: (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND Apache-2.0/MIT AND Apache-2.0 / MIT AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) 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 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: Apache-2.0 AND (Apache-2.0 OR MIT) AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND MIT AND (Apache-2.0 OR ISC OR MIT) AND (BSD-3-Clause OR MIT OR Apache-2.0) AND BSD-3-Clause AND MPL-2.0 AND (MIT OR Apache-2.0 OR Zlib) AND (Unlicense OR MIT) AND (0BSD OR MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND Unicode-3.0 AND (Zlib OR Apache-2.0 OR MIT) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (Apache-2.0 OR MIT) AND ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND ISC AND AND Zlib AND BSD-2-Clause AND BSL-1.0 AND CC0-1.0 AND (MIT OR Apache-2.0) AND (MIT OR Apache-2.0 OR CC0-1.0) URL: https://github.com/pop-os/cosmic-store diff --git a/rpms/cosmic-term/cosmic-term.spec b/rpms/cosmic-term/cosmic-term.spec index c85e05a..739b0d2 100644 --- a/rpms/cosmic-term/cosmic-term.spec +++ b/rpms/cosmic-term/cosmic-term.spec @@ -15,7 +15,7 @@ Version: ### Release: %autorelease Summary: Terminal emulator built with alacritty and Libcosmic -License: (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND Apache-2.0/MIT AND Apache-2.0 / MIT 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 (CC0-1.0 OR MIT-0 OR Apache-2.0) AND GPL-2.0-only 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: BSL-1.0 AND Apache-2.0 AND BSD-3-Clause AND (MIT OR Apache-2.0 OR CC0-1.0) AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND (MIT OR Apache-2.0) AND (MIT OR Apache-2.0 OR Zlib) AND (Apache-2.0 OR MIT) AND MPL-2.0 AND Unicode-3.0 AND GPL-2.0-only AND (Unlicense OR MIT) AND (Apache-2.0 OR MIT) AND (CC0-1.0 OR MIT-0 OR Apache-2.0) AND (Apache-2.0 OR BSL-1.0) AND Zlib AND (Zlib OR Apache-2.0 OR MIT) AND ISC AND MIT AND AND (0BSD OR MIT OR Apache-2.0) AND (BSD-3-Clause OR MIT OR Apache-2.0) AND CC0-1.0 AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND GPL-3.0-only AND (MIT OR Zlib OR Apache-2.0) AND BSD-2-Clause URL: https://github.com/pop-os/cosmic-term diff --git a/rpms/cosmic-workspaces/cosmic-workspaces.spec b/rpms/cosmic-workspaces/cosmic-workspaces.spec index 794633c..a8ac6fd 100644 --- a/rpms/cosmic-workspaces/cosmic-workspaces.spec +++ b/rpms/cosmic-workspaces/cosmic-workspaces.spec @@ -16,7 +16,7 @@ Version: ### Release: %autorelease Summary: Workspaces overview for the COSMIC Desktop Environment -License: (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND Apache-2.0/MIT 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 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 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: (MIT OR Zlib OR Apache-2.0) AND (Unlicense OR MIT) AND Unicode-3.0 AND Zlib AND (Apache-2.0 OR BSL-1.0) AND (MIT OR Apache-2.0) AND BSL-1.0 AND ISC AND (Apache-2.0 OR MIT) AND CC0-1.0 AND MIT AND MPL-2.0 AND (0BSD OR MIT OR Apache-2.0) AND BSD-3-Clause AND (MIT OR Apache-2.0 OR CC0-1.0) AND Apache-2.0 AND AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND (Zlib OR Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND BSD-2-Clause AND (MIT OR Apache-2.0 OR Zlib) URL: https://github.com/pop-os/cosmic-workspaces-epoch diff --git a/rpms/pop-launcher/pop-launcher.spec b/rpms/pop-launcher/pop-launcher.spec index fff3dab..2967f34 100644 --- a/rpms/pop-launcher/pop-launcher.spec +++ b/rpms/pop-launcher/pop-launcher.spec @@ -13,7 +13,7 @@ Version: ### Release: %autorelease Summary: Modular IPC-based desktop launcher service -License: (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND Apache-2.0/MIT AND Apache-2.0 / MIT AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND Apache-2.0 WITH LLVM-exception AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND BSD-3-Clause 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 Zlib) AND (MIT OR Zlib OR Apache-2.0) AND MPL-2.0 AND Unlicense/MIT AND (Unlicense OR MIT) AND Zlib AND (Zlib OR Apache-2.0 OR MIT) +License: Apache-2.0 WITH LLVM-exception AND ISC AND (MIT OR Apache-2.0 OR Zlib) AND MIT AND GPL-3.0-only AND Apache-2.0 AND (MIT OR Zlib OR Apache-2.0) AND (MIT OR Apache-2.0) AND (Unlicense OR MIT) AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR MIT) AND MPL-2.0 AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND Zlib AND BSD-3-Clause AND (Zlib OR Apache-2.0 OR MIT) AND URL: https://github.com/pop-os/launcher diff --git a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec index 2601958..bf6e47c 100644 --- a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec +++ b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec @@ -16,7 +16,7 @@ Version: ### Release: %autorelease Summary: XDG Desktop Portals for the COSMIC Desktop Environment -License: (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND Apache-2.0/MIT AND Apache-2.0 / MIT AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND Apache-2.0 WITH LLVM-exception 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 BSL-1.0 AND CC0-1.0 AND (CC0-1.0 OR Apache-2.0) AND (CC0-1.0 OR MIT-0 OR Apache-2.0) AND GPL-2.0-only AND GPL-3.0-only AND GPL-3.0-or-later AND ISC AND MIT AND MIT/Apache-2.0 AND MIT/Apache-2.0/NCSA 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: GPL-2.0-only AND BSL-1.0 AND ISC AND (MIT OR Zlib OR Apache-2.0) AND GPL-3.0-or-later AND (MIT OR Apache-2.0 OR CC0-1.0) AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND Unicode-3.0 AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND AND GPL-3.0-only AND (MIT OR Apache-2.0) AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND MIT AND (CC0-1.0 OR MIT-0 OR Apache-2.0) AND (MIT OR Apache-2.0 OR NCSA) AND BSD-3-Clause AND (MIT OR Apache-2.0 OR Zlib) AND Zlib AND (Zlib OR Apache-2.0 OR MIT) AND (Unlicense OR MIT) AND (CC0-1.0 OR Apache-2.0) AND MPL-2.0 AND Apache-2.0 WITH LLVM-exception AND BSD-2-Clause AND (Apache-2.0 OR MIT) AND Apache-2.0 AND CC0-1.0 URL: https://github.com/pop-os/xdg-desktop-portal-cosmic From 9096342ed82f630b8ca2ae36ba29c9a92802753e Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Sep 27 2024 04:12:30 +0000 Subject: [PATCH 3/3] fix: if license string is empty, don't erase license Signed-off-by: Ryan Brue --- diff --git a/cosmic-packaging-tool/src/main.rs b/cosmic-packaging-tool/src/main.rs index 543958d..234756f 100644 --- a/cosmic-packaging-tool/src/main.rs +++ b/cosmic-packaging-tool/src/main.rs @@ -210,10 +210,13 @@ fn update_licenses_command( .collect::>() .join(" AND "); if let Some(packaging_dir) = packaging_dir.as_deref() { - set_license( - &packaging_dir.join(&format!("rpms/{}/{}.spec", package_name, package_name)), - &license_result, - )?; + if !license_result.is_empty() { + set_license( + &packaging_dir + .join(&format!("rpms/{}/{}.spec", package_name, package_name)), + &license_result, + )?; + } } result_string.push_str(&format!("License: {}", &license_result)); } diff --git a/rpms/cosmic-icon-theme/cosmic-icon-theme.spec b/rpms/cosmic-icon-theme/cosmic-icon-theme.spec index 1c529bc..3b4281b 100644 --- a/rpms/cosmic-icon-theme/cosmic-icon-theme.spec +++ b/rpms/cosmic-icon-theme/cosmic-icon-theme.spec @@ -9,7 +9,7 @@ Version: ### Release: %autorelease Summary: Icon theme for the COSMIC Desktop Environment -License: +License: CC-BY-SA-4.0 URL: https://github.com/pop-os/cosmic-icons