public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Michal Schorm <mschorm@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/scorched3d] rawhide: Fix SPDX license tag: 'LicenseRef-Callaway-CC-BY-SA' -> 'CC-BY-SA-3.0'
Date: Wed, 15 Jul 2026 20:03:42 GMT	[thread overview]
Message-ID: <178414582241.1.1613888011342287343.rpms-scorched3d-76d7969e7342@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/scorched3d
            Branch : rawhide
            Commit : 76d7969e73426a7c3136bbc6bcdee6e31a805869
            Author : Michal Schorm <mschorm@redhat.com>
            Date   : 2026-07-14T23:05:22+02:00
            Stats  : +6/-3 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/scorched3d/c/76d7969e73426a7c3136bbc6bcdee6e31a805869?branch=rawhide

            Log:
            Fix SPDX license tag: 'LicenseRef-Callaway-CC-BY-SA' -> 'CC-BY-SA-3.0'

The automated SPDX conversion (commit by msuchy, 44-37) left behind a
'LicenseRef-Callaway-CC-BY-SA' placeholder because the CC-BY-SA version
could not be determined without inspecting the source tarball.

License analysis
================

Files examined in 'Scorched3D-44-src.tar.gz':

1. 'scorched/COPYING' -- full text of the GNU General Public License
   version 2.  Source files reference "or later", confirming
   'GPL-2.0-or-later'.

2. 'scorched/data/globalmods/apoc/license.txt' -- full legal text
   of the Creative Commons Attribution-ShareAlike license.  The first
   line reads:

     "Creative Commons Attribution-ShareAlike 3.0 License"

   The body matches the CC-BY-SA-3.0 legal code (references
   "Creative Commons Compatible License", section 4(b) re-licensing
   provisions specific to version 3.0).  This is the authoritative
   license for the bundled Apocalypse mod content.

3. 'scorched/data/globalmods/apoc/readme.txt' -- mod readme, "Legal
   Stuff" section also states "Creative Commons Attribution-ShareAlike
   3.0", consistent with 'license.txt'.

4. 'scorched/data/globalmods/apoc/readme-nexus.txt' -- historical
   readme for Nexus6's map pack references "Attribution-ShareAlike
   2.0" in its human-readable summary, but directs readers to the
   LICENSE file for the full legal text.  The actual license file
   ('license.txt') is unambiguously version 3.0.  The Apocalypse mod
   absorbed Nexus6's maps under CC-BY-SA-3.0 (which is a valid
   re-licensing path under CC-BY-SA-2.0 share-alike provisions).

5. 'scorched/data/globalmods/apoc/data/landscapes.xml' -- copyright
   notices for maps by Bobirov, Nexus6, and ShoCkwaVe all state
   "distributed under the Creative Commons Attribution-ShareAlike
   license" without specifying a version; the mod-level 'license.txt'
   governs.

SPDX mapping
=============

  Old: 'GPL-2.0-or-later AND LicenseRef-Callaway-CC-BY-SA'
  New: 'GPL-2.0-or-later AND CC-BY-SA-3.0'

Also removed the "Automatically converted" comment and bumped
Release to 43.

Co-Authored-By: Claude AI <noreply@anthropic.com>

---
diff --git a/scorched3d.spec b/scorched3d.spec
index c12cf91..83d5a03 100644
--- a/scorched3d.spec
+++ b/scorched3d.spec
@@ -2,10 +2,9 @@
 
 Name:           scorched3d
 Version:        44
-Release:        42%{?dist}
+Release:        43%{?dist}
 Summary:        Game based loosely on the classic DOS game Scorched Earth
-# Automatically converted from old format: GPLv2+ and CC-BY-SA - review is highly recommended.
-License:        GPL-2.0-or-later AND LicenseRef-Callaway-CC-BY-SA
+License:        GPL-2.0-or-later AND CC-BY-SA-3.0
 URL:            http://www.scorched3d.co.uk/
 Source0:        http://downloads.sourceforge.net/%{name}/Scorched3D-%{version}-src.tar.gz
 Source1:        %{name}.desktop
@@ -152,6 +151,10 @@ EOF
 
 
 %changelog
+* Tue Jul 14 2026 Michal Schorm <mschorm@redhat.com> - 44-43
+- Fix SPDX license tag: replace 'LicenseRef-Callaway-CC-BY-SA' with
+  'CC-BY-SA-3.0' based on upstream license text
+
 * Thu Apr 16 2026 Tom Callaway <spot@fedoraproject.org> - 44-42
 - rebuild
 

                 reply	other threads:[~2026-07-15 20:03 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178414582241.1.1613888011342287343.rpms-scorched3d-76d7969e7342@fedoraproject.org \
    --to=mschorm@redhat.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox