Check ifarch and ifnarch

85-display-manager.preset

@@ -9,5 +9,3 @@ enable lxdm.service
 enable sddm.service
 enable kdm.service
 enable xdm.service
-# https://issues.redhat.com/browse/RHEL-135678
-enable plasmalogin.service

90-default-user.preset

@@ -28,8 +28,3 @@ 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

@@ -24,6 +24,7 @@ enable sshd.service
 # Locally-running services
 enable atd.*
 enable crond.*
+enable rpcbind.*
 
 # Approved by FESCo - https://fedorahosted.org/fesco/ticket/636
 enable chronyd.service
@@ -126,11 +127,6 @@ enable virtlogd-admin.socket
 enable virtlockd.socket
 enable virtlockd-admin.socket
 
-# Intel SGX/TDX
-# https://issues.redhat.com/browse/RHEL-97438
-enable mpa_registration.service
-enable qgs.service
-
 # https://fedoraproject.org/w/index.php?title=Starting_services_by_default&oldid=377748
 enable xinetd.service
 
@@ -365,10 +361,6 @@ 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
@@ -428,9 +420,9 @@ enable thermald.service
 # https://pagure.io/fesco/issue/2457
 enable uresourced.service
 
-# enable tuned-ppd.service
-# https://issues.redhat.com/browse/RHEL-68853
-enable tuned-ppd.service
+# enable power-profiles-daemon
+# https://pagure.io/fedora-workstation/issue/191
+enable power-profiles-daemon.service
 
 # Enable clevis-luks-askpass.path
 # https://bugzilla.redhat.com/show_bug.cgi?id=2101719
@@ -475,17 +467,3 @@ enable cockpit.socket
 # https://fedoraproject.org/wiki/Changes/EnableFwupdRefreshByDefault
 enable fwupd-refresh.timer
 
-# RHEL-67012
-enable fips-crypto-policy-overlay.service
-
-# Enable greenboot services
-# https://issues.redhat.com/browse/RHEL-114149
-enable greenboot-grub2-set-counter.service
-enable greenboot-grub2-set-success.service
-enable greenboot-healthcheck.service
-enable greenboot-loading-message.service
-enable greenboot-rpm-ostree-grub2-check-fallback.service
-enable greenboot-status.service
-enable greenboot-task-runner.service
-enable redboot-auto-reboot.service
-enable redboot-task-runner.service

almalinux-beta.repo

@@ -0,0 +1,27 @@
+[beta]
+name=AlmaLinux Kitten $releasever - Beta
+baseurl=https://build.almalinux.org/pulp/content/copr/eabdullin1-almalinux10-beta-almalinux-10-$basearch-dr/
+enabled=1
+gpgcheck=1
+countme=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
+metadata_expire=86400
+enabled_metadata=1
+
+[beta-debuginfo]
+name=AlmaLinux Kitten $releasever - Beta - Debug
+baseurl=https://build.almalinux.org/pulp/content/copr/eabdullin1-almalinux10-beta-almalinux-10-$basearch-debug-dr/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
+metadata_expire=86400
+enabled_metadata=0
+
+[beta-source]
+name=AlmaLinux Kitten $releasever - Beta - Source
+baseurl=https://build.almalinux.org/pulp/content/copr/eabdullin1-almalinux10-beta-almalinux-10-src-dr/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
+metadata_expire=86400
+enabled_metadata=0

almalinux-crb.repo

@@ -2,7 +2,7 @@
 name=AlmaLinux Kitten $releasever - CRB
 mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/crb
 # baseurl=https://kitten.repo.almalinux.org/$releasever-kitten/CRB/$basearch/os/
-enabled=1
+enabled=0
 gpgcheck=1
 countme=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10

almalinux-kitten-release.spec

@@ -2,17 +2,13 @@
 
 %global distro  AlmaLinux Kitten
 %define release_name    Lion Cub
-%define release_type    stable
 %global major   10
 %global minor   0
 # %%global eol_date 2035-06-01
 
-# For rpmbuild-bumpspec
-%global baserelease 1
-
 Name:           almalinux-kitten-release
 Version:        %{major}.%{minor}
-Release:        18%{?dist}
+Release:        0.21%{?dist}
 Summary:        %{distro} release files
 License:        GPL-2.0-or-later
 URL:            https://almalinux.org
@@ -38,9 +34,6 @@ 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
@@ -56,16 +49,16 @@ Source302:      90-default-user.preset
 Source303:      99-default-disable.preset
 Source304:      50-redhat.conf
 
-Source400:      alsecurebootca1.cer
-Source401:      alsecureboot1.cer
+Source400:      alsecureboot001.cer
 
 Source500:      almalinux-appstream.repo
 Source501:      almalinux-baseos.repo
 Source502:      almalinux-crb.repo
 Source503:      almalinux-extras-common.repo
 Source504:      almalinux-highavailability.repo
-Source505:      almalinux-sap.repo
-Source506:      almalinux-saphana.repo
+Source505:      almalinux-resilientstorage.repo
+Source506:      almalinux-sap.repo
+Source507:      almalinux-saphana.repo
 # Only for x86_64
 Source510:      almalinux-nfv.repo
 Source511:      almalinux-rt.repo
@@ -78,7 +71,6 @@ Source512:      almalinux-beta.repo
 
 Source600:      RPM-GPG-KEY-AlmaLinux-10
 
-Source700:      macros.x86_64_v2
 
 %package -n almalinux-sb-certs
 Summary: %{distro} public secureboot certificates
@@ -113,6 +105,53 @@ This package provides the package repository files for %{distro}.
 This package provides the RPM signature keys for %{distro}.
 
 %install
+
+%ifarch x86_64
+echo "ifarch x86_64"
+%endif
+
+%ifarch x86_64_v2
+echo "in ifarch x86_64_v2"
+%endif
+
+%ifarch x86_64_v2 x86_64
+echo "in ifarch x86_64_v2 x86_64"
+%endif
+
+%ifarch ppc64le x86_64
+echo "in ifarch ppc64le x86_64"
+%endif
+
+%ifarch x86_64 aarch64
+echo "in ifarch x86_64 aarch64"
+%endif
+
+%ifnarch x86_64
+echo "in ifnarch x86_64"
+%endif
+
+%ifnarch x86_64 aarch64
+echo "in ifnarch x86_64 aarch64"
+%endif
+
+%ifnarch x86_64_v2
+echo "in ifnarch x86_64_v2"
+%endif
+
+%ifarch aarch64
+echo "ifarch aarch64"
+%endif
+
+%ifarch ppc64le
+echo "ifarch ppc64le"
+%endif
+
+%ifnarch aarch64
+echo "ifnarch aarch64"
+%endif
+
+exit 1
+
 # copy license and contributors doc here for %%license and %%doc macros
 mkdir -p ./docs
 cp %{SOURCE201} ./docs
@@ -134,11 +173,6 @@ ln -s almalinux-release %{buildroot}%{_sysconfdir}/redhat-release
 %global dist_vendor AlmaLinux OS Foundation
 %global dist_name   %{distro}
 
-# The namespace for purl
-# https://github.com/package-url/purl-spec
-# for example as in: pkg:rpm/almalinux/python-setuptools@69.2.0-10.el10?arch=src"
-%global dist_purl_namespace almalinux
-
 # URL of the homepage of the distribution
 # Example: gstreamer1-plugins-base.spec
 %global dist_home_url https://almalinux.org/
@@ -157,7 +191,6 @@ install -d -m 0755 %{buildroot}%{_prefix}/lib
 cat > %{buildroot}%{_prefix}/lib/os-release << EOF
 NAME="%{dist_name}"
 VERSION="%{major} (%{release_name})"
-RELEASE_TYPE=%{release_type}
 ID="almalinux"
 ID_LIKE="rhel centos fedora"
 VERSION_ID="%{major}"
@@ -168,7 +201,7 @@ 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}"
 
@@ -189,7 +222,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 \m' >> %{buildroot}%{_sysconfdir}/issue
+echo 'Kernel \r on an \m' >> %{buildroot}%{_sysconfdir}/issue
 cp %{buildroot}%{_sysconfdir}/issue{,.net}
 echo >> %{buildroot}%{_sysconfdir}/issue
 mkdir -p %{buildroot}%{_sysconfdir}/issue.d
@@ -210,7 +243,6 @@ cat > %{buildroot}%{_rpmmacrodir}/macros.dist << EOF
 %%dist %%{!?distprefix0:%%{?distprefix}}%%{expand:%%{lua:for i=0,9999 do print("%%{?distprefix" .. i .."}") end}}%%{distcore}%%{?distsuffix}%%{?with_bootstrap:%{__bootstrap}}
 %%dist_vendor         %{dist_vendor}
 %%dist_name           %{dist_name}
-%%dist_purl_namespace %{dist_purl_namespace}
 %%dist_home_url       %{dist_home_url}
 %%dist_bug_report_url %{dist_bug_report_url}
 EOF
@@ -245,30 +277,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 %{SOURCE401} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-kernel-aarch64.cer
-install -m 644 %{SOURCE401} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-grub2-aarch64.cer
-install -m 644 %{SOURCE401} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-fwupd-aarch64.cer
-install -m 644 %{SOURCE401} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-uki-virt-aarch64.cer
+install -m 644 %{SOURCE400} %{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 %{SOURCE400} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-fwupd-aarch64.cer
+install -m 644 %{SOURCE400} %{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 %{SOURCE401} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-kernel-x86_64.cer
-install -m 644 %{SOURCE401} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-grub2-x86_64.cer
-install -m 644 %{SOURCE401} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-fwupd-x86_64.cer
-install -m 644 %{SOURCE401} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-uki-virt-x86_64.cer
+install -m 644 %{SOURCE400} %{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 %{SOURCE400} %{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 ppc64le certs
 install -m 644 %{SOURCE400} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-ca-ppc64le.cer
-install -m 644 %{SOURCE401} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-kernel-ppc64le.cer
-install -m 644 %{SOURCE401} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-grub2-ppc64le.cer
-install -m 644 %{SOURCE401} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-uki-virt-ppc64le.cer
+install -m 644 %{SOURCE400} %{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 %{SOURCE400} %{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 %{SOURCE401} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-kernel-s390x.cer
-install -m 644 %{SOURCE401} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-uki-virt-s390x.cer
-# Install
+install -m 644 %{SOURCE400} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-kernel-s390x.cer
+install -m 644 %{SOURCE400} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-uki-virt-s390x.cer
+
 # 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
@@ -303,6 +335,7 @@ 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/
@@ -316,7 +349,6 @@ install -p -m 0644 %{SOURCE512} %{buildroot}%{_sysconfdir}/yum.repos.d/
 # 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
@@ -330,7 +362,8 @@ install -p -m 0644 %{SOURCE600} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/
 # These variables should be set in the build environment to change rpm names
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
 %ifarch x86_64_v2
-install -p -m 0644 %{SOURCE700}  %{buildroot}%{_sysconfdir}/rpm/
+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
 
 
@@ -371,6 +404,7 @@ install -p -m 0644 %{SOURCE700}  %{buildroot}%{_sysconfdir}/rpm/
 %config(noreplace) %{_sysconfdir}/yum.repos.d/almalinux-crb.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
@@ -387,54 +421,6 @@ install -p -m 0644 %{SOURCE700}  %{buildroot}%{_sysconfdir}/rpm/
 %{_sysconfdir}/pki/rpm-gpg
 
 %changelog
-* Wed Jan 21 2026 Eduard Abdullin <eabdullin@almalinux.org> - 10.0-18
-- Enable plasmalogin service for KDE Plasma Login Manager
-- Add RELEASE_TYPE field to os-release
-
-* Fri Oct 17 2025 Eduard Abdullin <eabdullin@almalinux.org> - 10.0-12.0.1
-- Update SB keys
-
-* Tue Oct 14 2025 Eduard Abdullin <eabdullin@almalinux.org> - 10.0-12
-- Add dist_purl_namespace to macros.dist
-- Re-disable rpcbind.service and rpcbind.socket
-- Enable greenboot services
-
-* Mon Mar 31 2025 Eduard Abdullin <eabdullin@almalinux.org> - 10.0-9.0.1
-- Redefine __cflags_arch_x86_64_level and __cflags_arch_x86_64 macroses for x86_64_v2
-
-* Tue Aug 26 2025 Eduard Abdullin <eabdullin@almalinux.org> - 10.0-9
-- Enable mpa_registration.service and qgs.service
-
-* 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

almalinux-resilientstorage.repo

@@ -0,0 +1,30 @@
+[resilientstorage]
+name=AlmaLinux Kitten $releasever - ResilientStorage
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/resilientstorage
+# baseurl=https://kitten.repo.almalinux.org/$releasever-kitten/ResilientStorage/$basearch/os/
+enabled=0
+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://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/resilientstorage-debug
+# baseurl=https://kitten.vault.almalinux.org/$releasever-kitten/ResilientStorage/debug/$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://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/resilientstorage-source
+# baseurl=https://kitten.vault.almalinux.org/$releasever-kitten/ResilientStorage/Source/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
+metadata_expire=86400
+enabled_metadata=0

macros.x86_64_v2

@@ -1,4 +0,0 @@
-%_target_platform x86_64-%{_vendor}-%{_target_os}%{?_gnu}
-%x86_64_v2 1
-%__cflags_arch_x86_64_level %[0%{?x86_64_v2} ? "-v2" : ""]%[ (!0%{?x86_64_v2} && 0%{?rhel} == 9) ? "-v2" : ""]%[ (!0%{?x86_64_v2} && 0%{?rhel} > 9) ? "-v3" : ""]
-%__cflags_arch_x86_64 -march=x86-64%{?__cflags_arch_x86_64_level:%{__cflags_arch_x86_64_level}}