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/cdogs-sdl] rawhide: Fix SPDX license field with correct versioned identifiers
Date: Tue, 14 Jul 2026 19:02:19 GMT	[thread overview]
Message-ID: <178405573907.1.9057334935414217293.rpms-cdogs-sdl-3883a2c52326@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/cdogs-sdl
            Branch : rawhide
            Commit : 3883a2c523268e1fcc8ffa868b3ae0066428f9bd
            Author : Michal Schorm <mschorm@redhat.com>
            Date   : 2026-07-14T15:56:41+02:00
            Stats  : +10/-5 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/cdogs-sdl/c/3883a2c523268e1fcc8ffa868b3ae0066428f9bd?branch=rawhide

            Log:
            Fix SPDX license field with correct versioned identifiers

The automated SPDX conversion left 'LicenseRef-Callaway-CC-BY' and
'LicenseRef-Callaway-CC-BY-SA' because it could not determine the
Creative Commons version numbers. Replace them with the specific
versions found in the source tree, and add bundled code licenses
that were missing from the License field.

Source tree license audit of cdogs-sdl 0.7.3:

Code licenses (bundled, compiled into binary):
- GPL-2.0-or-later: main game engine (./COPYING)
- BSD-3-Clause: some utility code ('doc/COPYING.BSD')
- LGPL-2.1-or-later: bundled json-c library ('src/json/', 'doc/COPYING.MJSON.txt')
- ISC: bundled yajl JSON library ('src/cdogs/yajl/', 'doc/COPYING.yajl.txt')
- Zlib: bundled nanopb ('src/cdogs/proto/nanopb/', 'doc/LICENSE.nanopb.txt')
- WTFPL: bundled rlutil ('src/cdogs/rlutil/', 'doc/license.rlutil.txt')

Asset licenses (graphics, sounds, music, missions):
- CC0-1.0: default for new artwork by Cong Xu ('graphics/LICENSE.md'),
  134+ files across 'graphics/', 'sounds/', 'missions/'
- CC-BY-3.0: original C-Dogs data relicensed by Ronny Wester in 2016
  ('doc/README_DATA.md'), plus 130+ third-party assets from OpenGameArt
  (e.g. 'graphics/hud/license.txt', 'sounds/footsteps/license.txt',
  'music/briefing/Futuristic_junk.txt')
- CC-BY-2.0: two assets ('graphics/door/office2/base/LICENSE.txt',
  'graphics/exits/hazard2/LICENSE.txt')
- CC-BY-4.0: two assets ('missions/spacepirates.cdogscpn/graphics/bio_grenade.txt',
  'music/menu/Battle_2.txt')
- CC-BY-SA-3.0: 15 assets (e.g. 'graphics/bag.txt', 'graphics/biogun.txt',
  'graphics/particles/beam_bright.txt')

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

---
diff --git a/cdogs-sdl.spec b/cdogs-sdl.spec
index 0f21dd7..f9ad495 100644
--- a/cdogs-sdl.spec
+++ b/cdogs-sdl.spec
@@ -2,12 +2,13 @@
 
 Name:           cdogs-sdl
 Version:        0.7.3
-Release:        18%{?dist}
+Release:        19%{?dist}
 Summary:        C-Dogs is an arcade shoot-em-up
-# The game-engine is GPLv2+
-# The game art is CC
-# Automatically converted from old format: GPLv2+ and CC-BY and CC-BY-SA and CC0 - review is highly recommended.
-License:        GPL-2.0-or-later AND LicenseRef-Callaway-CC-BY AND LicenseRef-Callaway-CC-BY-SA AND CC0-1.0
+# Code: GPL-2.0-or-later (engine), BSD-3-Clause, LGPL-2.1-or-later (json-c),
+#        ISC (yajl), Zlib (nanopb), WTFPL (rlutil)
+# Data: CC0-1.0 (default), CC-BY-3.0 (original C-Dogs data, most third-party
+#        assets), CC-BY-2.0 and CC-BY-4.0 (a few assets), CC-BY-SA-3.0
+License:        GPL-2.0-or-later AND BSD-3-Clause AND LGPL-2.1-or-later AND ISC AND Zlib AND WTFPL AND CC0-1.0 AND CC-BY-2.0 AND CC-BY-3.0 AND CC-BY-4.0 AND CC-BY-SA-3.0
 URL:            http://cxong.github.io/cdogs-sdl/
 Source0:        https://github.com/cxong/cdogs-sdl/archive/%{version}%{?extra_version}.tar.gz#/%{name}-%{version}%{?extra_version}.tar.gz
 Patch0:         cdogs-sdl-0.5.8-cmake.patch
@@ -66,6 +67,10 @@ appstream-util validate-relax --nonet \
 
 
 %changelog
+* Tue Jul 14 2026 Michal Schorm <mschorm@redhat.com> - 0.7.3-19
+- Fix SPDX license: replace 'LicenseRef-Callaway-CC-BY' and 'LicenseRef-Callaway-CC-BY-SA' with
+  versioned identifiers, add missing bundled code licenses
+
 * Tue Jul 14 2026 Michal Schorm <mschorm@redhat.com> - 0.7.3-18
 - Fix FTBFS with CMake 4.x by adding '-DCMAKE_POLICY_VERSION_MINIMUM=3.5' (rhbz#2380491)
 

                 reply	other threads:[~2026-07-14 19:02 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=178405573907.1.9057334935414217293.rpms-cdogs-sdl-3883a2c52326@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