rebased and resolved conflict

Author: jykanase

LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md

@@ -33,7 +33,7 @@ BuildRequires: golang
 BuildRequires: go-md2man
 BuildRequires: make
 BuildRequires: systemd-rpm-macros
-BuildRequires: glibc-static >= 2.38-12%{?dist}
+BuildRequires: glibc-static >= 2.38-13%{?dist}
 
 Requires: moby-runc >= 1.1.0
 

SPECS/moby-containerd-cc/moby-containerd-cc.spec

@@ -109,7 +109,7 @@ go check -t go/cmd \
 
 %changelog
 * Tue Sept 09 2025 Jyoti Kanase <[email protected]> - 21.0.0-1
-- Upgrade to version to 21.0.0
+- Upgrade to version 21.0.0
 
 * Fri Apr 11 2025 Kevin Lockwood <[email protected]> - 19.0.4-7
 - Add patch for CVE-2024-53257