From 995a2c204857a32f4b619403c1a2845a34c0102a Mon Sep 17 00:00:00 2001
From: Andrew Lukoshko <alukoshko@almalinux.org>
Date: Tue, 8 Oct 2024 22:29:04 +0000
Subject: [PATCH] Rename extras to extras-common to follow CS, enable
 kdump.service

---
 90-default.preset                             |  2 ++
 ...xtras.repo => almalinux-extras-common.repo | 24 +++++++++----------
 almalinux-kitten-release.spec                 | 10 +++++---
 3 files changed, 21 insertions(+), 15 deletions(-)
 rename almalinux-extras.repo => almalinux-extras-common.repo (58%)

diff --git a/90-default.preset b/90-default.preset
index dc171a5..786433c 100644
--- a/90-default.preset
+++ b/90-default.preset
@@ -232,6 +232,7 @@ enable abrt-xorg.service
 enable abrt-vmcore.service
 
 # Locally-running services
+enable kdump.service
 enable ksm.service
 enable ksmtuned.service
 enable rootfs-resize.service
@@ -465,3 +466,4 @@ enable cockpit.socket
 
 # https://fedoraproject.org/wiki/Changes/EnableFwupdRefreshByDefault
 enable fwupd-refresh.timer
+
diff --git a/almalinux-extras.repo b/almalinux-extras-common.repo
similarity index 58%
rename from almalinux-extras.repo
rename to almalinux-extras-common.repo
index d58c806..3caa79a 100644
--- a/almalinux-extras.repo
+++ b/almalinux-extras-common.repo
@@ -1,7 +1,7 @@
-[extras]
-name=AlmaLinux Kitten $releasever - AppStream
-mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/extras
-# baseurl=https://kitten.repo.almalinux.org/$releasever-kitten/AppStream/$basearch/os/
+[extras-common]
+name=AlmaLinux Kitten $releasever - Extras packages
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/extras-common
+# baseurl=https://kitten.repo.almalinux.org/$releasever-kitten/extras-common/$basearch/os/
 enabled=1
 gpgcheck=1
 countme=1
@@ -9,20 +9,20 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
 metadata_expire=86400
 enabled_metadata=1
 
-[extras-debuginfo]
-name=AlmaLinux Kitten $releasever - AppStream - Debug
-mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/extras-debug
-# baseurl=https://kitten.vault.almalinux.org/$releasever-kitten/AppStream/debug/$basearch/
+[extras-common-debuginfo]
+name=AlmaLinux Kitten $releasever - Extras packages - Debug
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/extras-common-debug
+# baseurl=https://kitten.vault.almalinux.org/$releasever-kitten/extras-common/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
 metadata_expire=86400
 enabled_metadata=0
 
-[extras-source]
-name=AlmaLinux Kitten $releasever - AppStream - Source
-mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/extras-source
-# baseurl=https://kitten.vault.almalinux.org/$releasever-kitten/AppStream/Source/
+[extras-common-source]
+name=AlmaLinux Kitten $releasever - Extras packages - Source
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/extras-common-source
+# baseurl=https://kitten.vault.almalinux.org/$releasever-kitten/extras-common/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
diff --git a/almalinux-kitten-release.spec b/almalinux-kitten-release.spec
index 2b80278..02fda68 100644
--- a/almalinux-kitten-release.spec
+++ b/almalinux-kitten-release.spec
@@ -11,7 +11,7 @@
 
 Name:           almalinux-kitten-release
 Version:        %{major}.%{minor}
-Release:        0.19%{?dist}.1
+Release:        0.21%{?dist}
 Summary:        %{distro} release files
 License:        GPL-2.0-or-later
 URL:            https://almalinux.org
@@ -57,7 +57,7 @@ Source400:      alsecureboot001.cer
 Source500:      almalinux-appstream.repo
 Source501:      almalinux-baseos.repo
 Source502:      almalinux-crb.repo
-Source503:      almalinux-extras.repo
+Source503:      almalinux-extras-common.repo
 Source504:      almalinux-highavailability.repo
 Source505:      almalinux-resilientstorage.repo
 Source506:      almalinux-sap.repo
@@ -354,7 +354,7 @@ echo '%%x86_64_v2 1' >> %{buildroot}%{_sysconfdir}/rpm/macros.x86_64_v2
 %config(noreplace) %{_sysconfdir}/yum.repos.d/almalinux-appstream.repo
 %config(noreplace) %{_sysconfdir}/yum.repos.d/almalinux-baseos.repo
 %config(noreplace) %{_sysconfdir}/yum.repos.d/almalinux-crb.repo
-%config(noreplace) %{_sysconfdir}/yum.repos.d/almalinux-extras.repo
+%config(noreplace) %{_sysconfdir}/yum.repos.d/almalinux-extras-common.repo
 %config(noreplace) %{_sysconfdir}/yum.repos.d/almalinux-highavailability.repo
 %config(noreplace) %{_sysconfdir}/yum.repos.d/almalinux-resilientstorage.repo
 %config(noreplace) %{_sysconfdir}/yum.repos.d/almalinux-sap.repo
@@ -373,6 +373,10 @@ echo '%%x86_64_v2 1' >> %{buildroot}%{_sysconfdir}/rpm/macros.x86_64_v2
 %{_sysconfdir}/pki/rpm-gpg
 
 %changelog
+* Wed Oct 09 2024 Andrew Lukoshko <alukoshko@almalinux.org> - 10.0-0.21
+- Rename extras to extras-common to follow CS
+- enable kdump.service
+
 * Mon Oct 07 2024 Eduard Abdullin <eabdullin@almalinux.org> - 10.0-0.19.1
 - Set mirrorlist as default
 - Update mirrorlist and baseurl for repos