Merge pull request 'Enable CRB repository by default' (#1) from ngompa/almalinux-kitten-release-rpm:a10s-enable-crb into a10s

Reviewed-on: #1

90-default-user.preset

@@ -28,3 +28,8 @@ enable snapd.session-agent.socket
 enable obex.service
 enable grub-boot-success.timer
 enable pulseaudio.socket
+
+# Ensure xdg-user-dirs are created properly
+# https://issues.redhat.com/browse/RHEL-79119
+# https://issues.redhat.com/browse/RHEL-80010
+enable xdg-user-dirs.service

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
@@ -360,6 +361,10 @@ enable device_cio_free.service
 # https://bugzilla.redhat.com/show_bug.cgi?id=1630514
 enable stratisd.service
 
+# nvme auto connect
+# RHEL-76850
+enable nvmefc-boot-connections.service
+
 # Enable a service to finalize staged OSTree changes at shutdown
 # https://bugzilla.redhat.com/show_bug.cgi?id=1639372
 enable ostree-finalize-staged.path
@@ -419,9 +424,9 @@ enable thermald.service
 # https://pagure.io/fesco/issue/2457
 enable uresourced.service
 
-# enable power-profiles-daemon
+# enable tuned-ppd.service
-# https://pagure.io/fedora-workstation/issue/191
+# https://issues.redhat.com/browse/RHEL-68853
-enable power-profiles-daemon.service
+enable tuned-ppd.service
 
 # Enable clevis-luks-askpass.path
 # https://bugzilla.redhat.com/show_bug.cgi?id=2101719
@@ -465,3 +470,6 @@ enable cockpit.socket
 
 # https://fedoraproject.org/wiki/Changes/EnableFwupdRefreshByDefault
 enable fwupd-refresh.timer
+
+# RHEL-67012
+enable fips-crypto-policy-overlay.service

almalinux-appstream.repo

@@ -1,8 +1,7 @@
 [appstream]
 name=AlmaLinux Kitten $releasever - AppStream
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/appstream
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/appstream
-# baseurl=https://repo.kitten.almalinux.org/almalinux/$releasever/AppStream/$basearch/os/
+# baseurl=https://kitten.repo.almalinux.org/$releasever-kitten/AppStream/$basearch/os/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-appstream-$basearch/
 enabled=1
 gpgcheck=1
 countme=1
@@ -12,9 +11,8 @@ enabled_metadata=1
 
 [appstream-debuginfo]
 name=AlmaLinux Kitten $releasever - AppStream - Debug
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/appstream-debug
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/appstream-debug
-# baseurl=https://repo.kitten.almalinux.org/vault/$releasever/AppStream/debug/$basearch/
+# baseurl=https://kitten.vault.almalinux.org/$releasever-kitten/AppStream/debug/$basearch/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-appstream-debuginfo-$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
@@ -23,9 +21,8 @@ enabled_metadata=0
 
 [appstream-source]
 name=AlmaLinux Kitten $releasever - AppStream - Source
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/appstream-source
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/appstream-source
-# baseurl=https://repo.kitten.almalinux.org/vault/$releasever/AppStream/Source/
+# baseurl=https://kitten.vault.almalinux.org/$releasever-kitten/AppStream/Source/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-baseos-src/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10

almalinux-baseos.repo

@@ -1,8 +1,7 @@
 [baseos]
 name=AlmaLinux Kitten $releasever - BaseOS
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/baseos
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/baseos
-# baseurl=https://repo.kitten.almalinux.org/almalinux/$releasever/BaseOS/$basearch/os/
+# baseurl=https://kitten.repo.almalinux.org/$releasever-kitten/BaseOS/$basearch/os/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-baseos-$basearch/
 enabled=1
 gpgcheck=1
 countme=1
@@ -12,9 +11,8 @@ enabled_metadata=1
 
 [baseos-debuginfo]
 name=AlmaLinux Kitten $releasever - BaseOS - Debug
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/baseos-debug
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/baseos-debug
-# baseurl=https://repo.kitten.almalinux.org/vault/$releasever/BaseOS/debug/$basearch/
+# baseurl=https://kitten.vault.almalinux.org/$releasever-kitten/BaseOS/debug/$basearch/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-baseos-debuginfo-$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
@@ -23,9 +21,8 @@ enabled_metadata=0
 
 [baseos-source]
 name=AlmaLinux Kitten $releasever - BaseOS - Source
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/baseos-source
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/baseos-source
-# baseurl=https://repo.kitten.almalinux.org/vault/$releasever/BaseOS/Source/
+# baseurl=https://kitten.vault.almalinux.org/$releasever-kitten/BaseOS/Source/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-baseos-src/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10

almalinux-crb.repo

@@ -1,8 +1,7 @@
 [crb]
 name=AlmaLinux Kitten $releasever - CRB
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/crb
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/crb
-# baseurl=https://repo.kitten.almalinux.org/almalinux/$releasever/CRB/$basearch/os/
+# baseurl=https://kitten.repo.almalinux.org/$releasever-kitten/CRB/$basearch/os/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-crb-$basearch/
 enabled=1
 gpgcheck=1
 countme=1
@@ -12,9 +11,8 @@ enabled_metadata=1
 
 [crb-debuginfo]
 name=AlmaLinux Kitten $releasever - CRB - Debug
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/crb-debug
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/crb-debug
-# baseurl=https://repo.kitten.almalinux.org/vault/$releasever/CRB/debug/$basearch/
+# baseurl=https://kitten.vault.almalinux.org/$releasever-kitten/CRB/debug/$basearch/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-crb-debuginfo-$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
@@ -23,9 +21,8 @@ enabled_metadata=0
 
 [crb-source]
 name=AlmaLinux Kitten $releasever - CRB - Source
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/crb-source
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/crb-source
-# baseurl=https://repo.kitten.almalinux.org/vault/$releasever/CRB/Source/
+# baseurl=https://kitten.vault.almalinux.org/$releasever-kitten/CRB/Source/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-crb-src/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10

almalinux-extras-common.repo

@@ -0,0 +1,30 @@
+[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
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
+metadata_expire=86400
+enabled_metadata=1
+
+[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-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
+metadata_expire=86400
+enabled_metadata=0

almalinux-extras.repo

@@ -1,33 +0,0 @@
-[extras]
-name=AlmaLinux Kitten $releasever - Extras
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/extras
-# baseurl=https://repo.kitten.almalinux.org/almalinux/$releasever/extras/$basearch/os/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-extras-$basearch/
-enabled=1
-gpgcheck=1
-countme=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
-metadata_expire=86400
-enabled_metadata=1
-
-[extras-debuginfo]
-name=AlmaLinux Kitten $releasever - Extras - Debug
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/extras-debug
-# baseurl=https://repo.kitten.almalinux.org/vault/$releasever/extras/debug/$basearch/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-extras-debuginfo-$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 - Extras - Source
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/extras-source
-# baseurl=https://repo.kitten.almalinux.org/vault/$releasever/extras/Source/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-extras-src/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
-metadata_expire=86400
-enabled_metadata=0

almalinux-highavailability.repo

@@ -1,9 +1,8 @@
 [highavailability]
 name=AlmaLinux Kitten $releasever - HighAvailability
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/highavailability
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/highavailability
-# baseurl=https://repo.kitten.almalinux.org/almalinux/$releasever/HighAvailability/$basearch/os/
+# baseurl=https://kitten.repo.almalinux.org/$releasever-kitten/HighAvailability/$basearch/os/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-highavailability-$basearch/
+enabled=0
-enabled=1
 gpgcheck=1
 countme=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
@@ -12,9 +11,8 @@ enabled_metadata=1
 
 [highavailability-debuginfo]
 name=AlmaLinux Kitten $releasever - HighAvailability - Debug
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/highavailability-debug
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/highavailability-debug
-# baseurl=https://repo.kitten.almalinux.org/vault/$releasever/HighAvailability/debug/$basearch/
+# baseurl=https://kitten.vault.almalinux.org/$releasever-kitten/HighAvailability/debug/$basearch/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-highavailability-debuginfo-$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
@@ -23,9 +21,8 @@ enabled_metadata=0
 
 [highavailability-source]
 name=AlmaLinux Kitten $releasever - HighAvailability - Source
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/highavailability-source
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/highavailability-source
-# baseurl=https://repo.kitten.almalinux.org/vault/$releasever/HighAvailability/Source/
+# baseurl=https://kitten.vault.almalinux.org/$releasever-kitten/HighAvailability/Source/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-highavailability-src/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10

almalinux-kitten-release.spec

@@ -1,16 +1,17 @@
-# Should be deleted or changed to "%%bcond_with beta" before the release
+%bcond_with beta
-# Also baseurl for regular repos should be changed to repo.kitten.almalinux.org
-# and mirrorlist should be set as default
-%bcond_without beta
 
 %global distro  AlmaLinux Kitten
+%define release_name    Lion Cub
 %global major   10
 %global minor   0
 # %%global eol_date 2035-06-01
 
+# For rpmbuild-bumpspec
+%global baserelease 2
+
 Name:           almalinux-kitten-release
 Version:        %{major}.%{minor}
-Release:        0.18%{?dist}
+Release:        8%{?dist}.0.%{baserelease}
 Summary:        %{distro} release files
 License:        GPL-2.0-or-later
 URL:            https://almalinux.org
@@ -36,6 +37,9 @@ Provides:       redhat-release = %{version}-%{release}
 # https://github.com/rpm-software-management/dnf/blob/4.2.23/dnf/const.py.in#L26
 Provides:       system-release = %{version}-%{release}
 Provides:       system-release(releasever) = %{major}
+# only have releasever_major, do not add releasever_minor
+# https://issues.redhat.com/browse/RHEL-68034
+Provides:       system-release(releasever_major) = %{major}
 Conflicts:      system-release
 
 # required by libdnf
@@ -51,16 +55,16 @@ Source302:      90-default-user.preset
 Source303:      99-default-disable.preset
 Source304:      50-redhat.conf
 
-Source400:      alsecureboot001.cer
+Source400:      alsecurebootca1.cer
+Source401:      alsecureboot1.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
+Source505:      almalinux-sap.repo
-Source506:      almalinux-sap.repo
+Source506:      almalinux-saphana.repo
-Source507:      almalinux-saphana.repo
 # Only for x86_64
 Source510:      almalinux-nfv.repo
 Source511:      almalinux-rt.repo
@@ -86,9 +90,13 @@ Provides: almalinux-sb-certs = %{version}-%{release}
 Summary:        %{distro} package repositories
 Requires:       almalinux-kitten-release = %{version}-%{release}
 Requires:       almalinux-gpg-keys = %{version}-%{release}
+# Required by CentOS SIGs release packages
+Provides:       centos-stream-repos = %{version}-%{release}
 
 %package -n almalinux-gpg-keys
 Summary:        %{distro} RPM keys
+# Required by CentOS SIGs release packages
+Provides:       centos-gpg-keys = %{version}-%{release}
 
 %description
 %{distro} release files.
@@ -109,7 +117,7 @@ cp %{SOURCE201} ./docs
 
 # create /etc/system-release and /etc/redhat-release
 install -d -m 0755 %{buildroot}%{_sysconfdir}
-echo "%{distro} release %{major}" > %{buildroot}%{_sysconfdir}/almalinux-release
+echo "%{distro} release %{major} (%{release_name})" > %{buildroot}%{_sysconfdir}/almalinux-release
 ln -s almalinux-release %{buildroot}%{_sysconfdir}/system-release
 ln -s almalinux-release %{buildroot}%{_sysconfdir}/redhat-release
 
@@ -141,18 +149,18 @@ ln -s almalinux-release %{buildroot}%{_sysconfdir}/redhat-release
 install -d -m 0755 %{buildroot}%{_prefix}/lib
 cat > %{buildroot}%{_prefix}/lib/os-release << EOF
 NAME="%{dist_name}"
-VERSION="%{major}"
+VERSION="%{major} (%{release_name})"
 ID="almalinux"
 ID_LIKE="rhel centos fedora"
 VERSION_ID="%{major}"
 PLATFORM_ID="platform:el%{major}"
-PRETTY_NAME="%{distro} %{major}"
+PRETTY_NAME="%{distro} %{major} (%{release_name})"
 ANSI_COLOR="0;34"
 LOGO="fedora-logo-icon"
 CPE_NAME="cpe:/o:almalinux:almalinux:%{major}::baseos"
 HOME_URL="%{dist_home_url}"
 DOCUMENTATION_URL="https://wiki.almalinux.org/"
-VENDOR_NAME="Almalinux"
+VENDOR_NAME="AlmaLinux"
 VENDOR_URL="%{dist_home_url}"
 BUG_REPORT_URL="%{dist_bug_report_url}"
 
@@ -173,7 +181,7 @@ echo "cpe:/o:almalinux:almalinux:%{major}::baseos" > %{buildroot}%{_sysconfdir}/
 
 # create /etc/issue, /etc/issue.net and /etc/issue.d
 echo '\S' > %{buildroot}%{_sysconfdir}/issue
-echo 'Kernel \r on an \m' >> %{buildroot}%{_sysconfdir}/issue
+echo 'Kernel \r on \m' >> %{buildroot}%{_sysconfdir}/issue
 cp %{buildroot}%{_sysconfdir}/issue{,.net}
 echo >> %{buildroot}%{_sysconfdir}/issue
 mkdir -p %{buildroot}%{_sysconfdir}/issue.d
@@ -228,30 +236,30 @@ install -d -m 0755 %{buildroot}%{_datadir}/pki/sb-certs/
 
 # Install aarch64 certs
 install -m 644 %{SOURCE400} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-ca-aarch64.cer
-install -m 644 %{SOURCE400} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-kernel-aarch64.cer
+install -m 644 %{SOURCE401} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-kernel-aarch64.cer
-install -m 644 %{SOURCE400} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-grub2-aarch64.cer
+install -m 644 %{SOURCE401} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-grub2-aarch64.cer
-install -m 644 %{SOURCE400} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-fwupd-aarch64.cer
+install -m 644 %{SOURCE401} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-fwupd-aarch64.cer
-install -m 644 %{SOURCE400} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-uki-virt-aarch64.cer
+install -m 644 %{SOURCE401} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-uki-virt-aarch64.cer
 
 
 # Install x86_64 certs
 install -m 644 %{SOURCE400} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-ca-x86_64.cer
-install -m 644 %{SOURCE400} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-kernel-x86_64.cer
+install -m 644 %{SOURCE401} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-kernel-x86_64.cer
-install -m 644 %{SOURCE400} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-grub2-x86_64.cer
+install -m 644 %{SOURCE401} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-grub2-x86_64.cer
-install -m 644 %{SOURCE400} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-fwupd-x86_64.cer
+install -m 644 %{SOURCE401} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-fwupd-x86_64.cer
-install -m 644 %{SOURCE400} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-uki-virt-x86_64.cer
+install -m 644 %{SOURCE401} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-uki-virt-x86_64.cer
 
 # Install ppc64le certs
 install -m 644 %{SOURCE400} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-ca-ppc64le.cer
-install -m 644 %{SOURCE400} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-kernel-ppc64le.cer
+install -m 644 %{SOURCE401} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-kernel-ppc64le.cer
-install -m 644 %{SOURCE400} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-grub2-ppc64le.cer
+install -m 644 %{SOURCE401} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-grub2-ppc64le.cer
-install -m 644 %{SOURCE400} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-uki-virt-ppc64le.cer
+install -m 644 %{SOURCE401} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-uki-virt-ppc64le.cer
 
 # Install s390x certs
 install -m 644 %{SOURCE400} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-ca-s390x.cer
-install -m 644 %{SOURCE400} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-kernel-s390x.cer
+install -m 644 %{SOURCE401} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-kernel-s390x.cer
-install -m 644 %{SOURCE400} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-uki-virt-s390x.cer
+install -m 644 %{SOURCE401} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-uki-virt-s390x.cer
-
+# Install
 # Link x86_64 certs
 ln -sr %{buildroot}%{_datadir}/pki/sb-certs/secureboot-ca-x86_64.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-ca-x86_64.cer
 ln -sr %{buildroot}%{_datadir}/pki/sb-certs/secureboot-kernel-x86_64.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-kernel-x86_64.cer
@@ -286,7 +294,6 @@ install -p -m 0644 %{SOURCE503} %{buildroot}%{_sysconfdir}/yum.repos.d/
 install -p -m 0644 %{SOURCE504} %{buildroot}%{_sysconfdir}/yum.repos.d/
 install -p -m 0644 %{SOURCE505} %{buildroot}%{_sysconfdir}/yum.repos.d/
 install -p -m 0644 %{SOURCE506} %{buildroot}%{_sysconfdir}/yum.repos.d/
-install -p -m 0644 %{SOURCE507} %{buildroot}%{_sysconfdir}/yum.repos.d/
 # RT and NFV are only for x86_64
 %ifarch x86_64
 install -p -m 0644 %{SOURCE510} %{buildroot}%{_sysconfdir}/yum.repos.d/
@@ -297,6 +304,12 @@ install -p -m 0644 %{SOURCE511} %{buildroot}%{_sysconfdir}/yum.repos.d/
 install -p -m 0644 %{SOURCE512} %{buildroot}%{_sysconfdir}/yum.repos.d/
 %endif
 
+# Replace basearch to x86_64_v2
+%ifarch x86_64_v2
+sed -i "s/\$basearch/x86_64_v2/g" %{buildroot}%{_sysconfdir}/yum.repos.d/*.repo
+sed -i '/^mirrorlist=/ s|$|?arch=x86_64_v2|g' %{buildroot}%{_sysconfdir}/yum.repos.d/*.repo
+%endif
+
 # dnf variables
 install -d -m 0755 %{buildroot}%{_sysconfdir}/dnf/vars
 echo "%{major}-stream" > %{buildroot}%{_sysconfdir}/dnf/vars/stream
@@ -309,6 +322,7 @@ install -p -m 0644 %{SOURCE600} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
 %ifarch x86_64_v2
 echo '%%_target_platform x86_64-%%{_vendor}-%%{_target_os}%%{?_gnu}' >> %{buildroot}%{_sysconfdir}/rpm/macros.x86_64_v2
+echo '%%x86_64_v2 1' >> %{buildroot}%{_sysconfdir}/rpm/macros.x86_64_v2
 %endif
 
 
@@ -347,9 +361,8 @@ echo '%%_target_platform x86_64-%%{_vendor}-%%{_target_os}%%{?_gnu}' >> %{buildr
 %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
 %config(noreplace) %{_sysconfdir}/yum.repos.d/almalinux-saphana.repo
 %ifarch x86_64
@@ -366,6 +379,55 @@ echo '%%_target_platform x86_64-%%{_vendor}-%%{_target_os}%%{?_gnu}' >> %{buildr
 %{_sysconfdir}/pki/rpm-gpg
 
 %changelog
+* Thu May 29 2025 Neal Gompa <ngompa@almalinux.org> - 10.0-8.0.2
+- Enable CRB repository by default
+
+* Mon Mar 31 2025 Eduard Abdullin <eabdullin@almalinux.org> - 10.0-8.0.1
+- Update SB keys
+
+* Thu Mar 13 2025 Eduard Abdullin <eabdullin@almalinux.org> - 10.0-8
+- Enable xdg-user-dirs service to fix creation races
+
+* Fri Feb 21 2025 Eduard Abdullin <eabdullin@almalinux.org> - 10.0-7
+- Enable nvmefc-boot-connections.service
+- Tweak /etc/issue to avoid incorrect English
+- Provide system-release(releasever_major)
+
+* Thu Feb 06 2025 Andrew Lukoshko <alukoshko@almalinux.org> - 10.0-3.0.2
+- Update AlmaLinux Secure Boot certificate
+
+* Tue Dec 24 2024 Eduard Abdullin <eabdullin@almalinux.org> - 10.0-3.0.1
+- Remove ResilientStorage repo
+
+* Tue Dec 17 2024 Eduard Abdullin <eabdullin@almalinux.org> - 10.0-3
+- Replace power-profiles-daemon with tuned-ppd
+- enable fips-crypto-policy-overlay.service
+
+* Tue Oct 22 2024 Eduard Abdullin <eabdullin@almalinux.org> - 10.0-0.21.2
+- Fix VENDOR_NAME in os-release
+
+* Fri Oct 18 2024 Eduard Abdullin <eabdullin@almalinux.org> - 10.0-0.21.1
+- Use arch parameter for x86_64_v2 architecture in mirrorlists
+
+* Wed Oct 09 2024 Andrew Lukoshko <alukoshko@almalinux.org> - 10.0-0.21
+- Rename extras to extras-common to follow CS
+- Enable kdump.service
+- Drop beta repos
+- Add Provides for compatibility with CentOS SIGs release packages
+
+* Mon Oct 07 2024 Eduard Abdullin <eabdullin@almalinux.org> - 10.0-0.19.1
+- Set mirrorlist as default
+- Update mirrorlist and baseurl for repos
+
+* Mon Sep 30 2024 Eduard Abdullin <eabdullin@almalinux.org> - 10.0-0.19
+- Set release name to Lion Cub
+
+* Thu Sep 19 2024 Eduard Abdullin <eabdullin@almalinux.org> - 10.0-0.18.2
+- Use x86_64_v2 instead of $basearch in repo files.
+
+* Tue Aug 20 2024 Eduard Abdullin <eabdullin@almalinux.org> - 10.0-0.18.1
+- Add x86_64_v2 macros
+
 * Tue Aug 20 2024 Eduard Abdullin <eabdullin@almalinux.org> - 10.0-0.18
 - Rename to almalinux-kitten
 - Update repo paths and names

almalinux-nfv.repo

@@ -1,9 +1,8 @@
 [nfv]
 name=AlmaLinux Kitten $releasever - NFV
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/nfv
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/nfv
-# baseurl=https://repo.kitten.almalinux.org/almalinux/$releasever/NFV/$basearch/os/
+# baseurl=https://kitten.repo.almalinux.org/$releasever-kitten/NFV/$basearch/os/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-nfv-$basearch/
+enabled=0
-enabled=1
 gpgcheck=1
 countme=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
@@ -12,9 +11,8 @@ enabled_metadata=1
 
 [nfv-debuginfo]
 name=AlmaLinux Kitten $releasever - NFV - Debug
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/nfv-debug
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/nfv-debug
-# baseurl=https://repo.kitten.almalinux.org/vault/$releasever/NFV/debug/$basearch/
+# baseurl=https://kitten.vault.almalinux.org/$releasever-kitten/NFV/debug/$basearch/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-nfv-debuginfo-$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
@@ -23,9 +21,8 @@ enabled_metadata=0
 
 [nfv-source]
 name=AlmaLinux Kitten $releasever - NFV - Source
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/nfv-source
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/nfv-source
-# baseurl=https://repo.kitten.almalinux.org/vault/$releasever/NFV/Source/
+# baseurl=https://kitten.vault.almalinux.org/$releasever-kitten/NFV/Source/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-nfv-src/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10

almalinux-resilientstorage.repo

@@ -1,33 +0,0 @@
-[resilientstorage]
-name=AlmaLinux Kitten $releasever - ResilientStorage
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/resilientstorage
-# baseurl=https://repo.kitten.almalinux.org/almalinux/$releasever/ResilientStorage/$basearch/os/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-resilientstorage-$basearch/
-enabled=1
-gpgcheck=1
-countme=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
-metadata_expire=86400
-enabled_metadata=1
-
-[resilientstorage-debuginfo]
-name=AlmaLinux Kitten $releasever - ResilientStorage - Debug
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/resilientstorage-debug
-# baseurl=https://repo.kitten.almalinux.org/vault/$releasever/ResilientStorage/debug/$basearch/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-resilientstorage-debuginfo-$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
-metadata_expire=86400
-enabled_metadata=0
-
-[resilientstorage-source]
-name=AlmaLinux Kitten $releasever - ResilientStorage - Source
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/resilientstorage-source
-# baseurl=https://repo.kitten.almalinux.org/vault/$releasever/ResilientStorage/Source/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-resilientstorage-src/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
-metadata_expire=86400
-enabled_metadata=0

almalinux-rt.repo

@@ -1,9 +1,8 @@
 [rt]
 name=AlmaLinux Kitten $releasever - RT
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/rt
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/rt
-# baseurl=https://repo.kitten.almalinux.org/almalinux/$releasever/RT/$basearch/os/
+# baseurl=https://kitten.repo.almalinux.org/$releasever-kitten/RT/$basearch/os/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-rt-$basearch/
+enabled=0
-enabled=1
 gpgcheck=1
 countme=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
@@ -12,9 +11,8 @@ enabled_metadata=1
 
 [rt-debuginfo]
 name=AlmaLinux Kitten $releasever - RT - Debug
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/rt-debug
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/rt-debug
-# baseurl=https://repo.kitten.almalinux.org/vault/$releasever/RT/debug/$basearch/
+# baseurl=https://kitten.vault.almalinux.org/$releasever-kitten/RT/debug/$basearch/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-rt-debuginfo-$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
@@ -23,9 +21,8 @@ enabled_metadata=0
 
 [rt-source]
 name=AlmaLinux Kitten $releasever - RT - Source
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/rt-source
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/rt-source
-# baseurl=https://repo.kitten.almalinux.org/vault/$releasever/RT/Source/
+# baseurl=https://kitten.vault.almalinux.org/$releasever-kitten/RT/Source/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-rt-src/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10

almalinux-sap.repo

@@ -1,9 +1,8 @@
 [sap]
 name=AlmaLinux Kitten $releasever - SAP
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/sap
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/sap
-# baseurl=https://repo.kitten.almalinux.org/almalinux/$releasever/SAP/$basearch/os/
+# baseurl=https://kitten.repo.almalinux.org/$releasever-kitten/SAP/$basearch/os/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-sap-$basearch/
+enabled=0
-enabled=1
 gpgcheck=1
 countme=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
@@ -12,9 +11,8 @@ enabled_metadata=1
 
 [sap-debuginfo]
 name=AlmaLinux Kitten $releasever - SAP - Debug
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/sap-debug
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/sap-debug
-# baseurl=https://repo.kitten.almalinux.org/vault/$releasever/SAP/debug/$basearch/
+# baseurl=https://kitten.vault.almalinux.org/$releasever-kitten/SAP/debug/$basearch/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-sap-debuginfo-$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
@@ -23,9 +21,8 @@ enabled_metadata=0
 
 [sap-source]
 name=AlmaLinux Kitten $releasever - SAP - Source
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/sap-source
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/sap-source
-# baseurl=https://repo.kitten.almalinux.org/vault/$releasever/SAP/Source/
+# baseurl=https://kitten.vault.almalinux.org/$releasever-kitten/SAP/Source/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-sap-src/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10

almalinux-saphana.repo

@@ -1,9 +1,8 @@
 [saphana]
 name=AlmaLinux Kitten $releasever - SAPHANA
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/saphana
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/saphana
-# baseurl=https://repo.kitten.almalinux.org/almalinux/$releasever/SAPHANA/$basearch/os/
+# baseurl=https://kitten.repo.almalinux.org/$releasever-kitten/SAPHANA/$basearch/os/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-saphana-$basearch/
+enabled=0
-enabled=1
 gpgcheck=1
 countme=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
@@ -12,9 +11,8 @@ enabled_metadata=1
 
 [saphana-debuginfo]
 name=AlmaLinux Kitten $releasever - SAPHANA - Debug
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/saphana-debug
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/saphana-debug
-# baseurl=https://repo.kitten.almalinux.org/vault/$releasever/SAPHANA/debug/$basearch/
+# baseurl=https://kitten.vault.almalinux.org/$releasever-kitten/SAPHANA/debug/$basearch/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-saphana-debuginfo-$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
@@ -23,9 +21,8 @@ enabled_metadata=0
 
 [saphana-source]
 name=AlmaLinux Kitten $releasever - SAPHANA - Source
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/saphana-source
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/saphana-source
-# baseurl=https://repo.kitten.almalinux.org/vault/$releasever/SAPHANA/Source/
+# baseurl=https://kitten.vault.almalinux.org/$releasever-kitten/SAPHANA/Source/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-saphana-src/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10