From ece6f113c745ba774202ff2dec8776f8d5490bde Mon Sep 17 00:00:00 2001
From: Bradley G Smith <bradley.g.smith@gmail.com>
Date: Mar 19 2024 17:47:05 +0000
Subject: Update to v1.29.3 on F40


Updates kubernetes to v1.29.3 on F40. Implements SPDX license standard.
Corrects Requires in kubeadm subpackage.

---

diff --git a/kubernetes.spec b/kubernetes.spec
index 7d428d4..d06f34d 100644
--- a/kubernetes.spec
+++ b/kubernetes.spec
@@ -40,7 +40,7 @@ Name:           %{k8s_name}
 Version:        %{k8s_ver}
 Release:        %autorelease
 Summary:        Open Source Production-Grade Container Scheduling And Management Platform
-License:        ASL 2.0
+License:        Apache-2.0
 URL:            https://%{import_path}
 ExclusiveArch:  x86_64 aarch64 ppc64le s390x %{arm}
 Source0:        https://%{provider_prefix}/archive/%{gittag}/%{repo}-%{tar_ver}.tar.gz
@@ -115,7 +115,7 @@ control plane machines.
 ##############################################
 %package  kubeadm
 Summary:  Kubernetes tool for standing up clusters
-Requires: kubernetes = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 
 BuildRequires: golang >= %{golangver}
 BuildRequires: systemd
@@ -238,9 +238,6 @@ export GOFLAGS="-buildmode=pie -compiler=gc -tags=rpm_crashtraceback${BUILDTAGS:
 
 export GOLDFLAGS="%{?currentgoldflags} -B 0x$(echo '%{name}-%{version}-%{release}-${SOURCE_DATE_EPOCH:-}' | sha1sum | cut -d ' ' -f1) -compressdwarf=false -linkmode=external -extldflags '%{build_ldflags} %{?__golang_extldflags}'"
 
-# macro that executes make all for given cmd argument
-%define makecmd(o:) make all WHAT="cmd/%1" GOLDFLAGS="-B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') $GLINK"
-
 # Build each binary separately to generate a unique build-id.
 # Otherwise: Duplicate build-ids /builddir/build/BUILDROOT/.../usr/bin/kube-apiserver and /builddir/build/BUILDROOT/.../usr/bin/kubeadm
 make WHAT="cmd/kube-proxy"