Skip to content

Commit

Permalink
Issue 6359 - Add exception to GPL license in license tag
Browse files Browse the repository at this point in the history
Description:
Update license string generator tool with the GPL exception.
See https://gitlab.com/fedora/legal/fedora-license-data/-/issues/517

Fixes: 389ds#6359

Reviewed by: @tbordaz, @progier389, @droideck (Thanks!)
  • Loading branch information
vashirov committed Oct 30, 2024
1 parent 95cef49 commit 0c6fdd6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion rpm/389-ds-base.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ Summary: 389 Directory Server (%{variant})
Name: 389-ds-base
Version: __VERSION__%{?prerel}
Release: %{autorelease -n %{?with_asan:-e asan}}%{?dist}
License: GPLv3+ and (ASL 2.0 or MIT)
License: GPL-3.0-or-later WITH GPL-3.0-389-ds-base-exception AND (0BSD OR Apache-2.0 OR MIT) AND (Apache-2.0 OR Apache-2.0 WITH LLVM-exception OR MIT) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT OR Zlib) AND (Apache-2.0 OR MIT) AND (CC-BY-4.0 AND MIT) AND (MIT OR Apache-2.0) AND Unicode-DFS-2016 AND (MIT OR CC0-1.0) AND (MIT OR Unlicense) AND 0BSD AND Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MIT AND ISC AND MPL-2.0 AND PSF-2.0
URL: https://www.port389.org/
Obsoletes: %{name} <= 1.4.0.9
Obsoletes: %{name}-legacy-tools < 1.4.4.6
Expand Down
4 changes: 2 additions & 2 deletions rpm/bundle-rust-npm.py
Original file line number Diff line number Diff line change
Expand Up @@ -146,11 +146,11 @@ def replace_license(spec_file: str, license_string: str):
for line in contents:
if line.startswith("License: "):
if args.fix_it:
result.append(f"License: GPL-3.0-or-later AND {license_string}\n")
result.append(f"License: GPL-3.0-or-later AND WITH GPL-3.0-389-ds-base-exception {license_string}\n")
else:
result.append("# IMPORTANT - Check if it looks right. Additionally, "
"compare with the original line. Then, remove this comment and # FIXME - part.\n")
result.append(f"# FIXME - License: GPL-3.0-or-later AND {license_string}\n")
result.append(f"# FIXME - License: GPL-3.0-or-later AND WITH GPL-3.0-389-ds-base-exception {license_string}\n")
else:
result.append(line)
with open(spec_file, "w") as file:
Expand Down

0 comments on commit 0c6fdd6

Please sign in to comment.