Check ifarch and ifnarch

90-default.preset

@@ -420,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
@@ -467,5 +467,3 @@ enable cockpit.socket
 # https://fedoraproject.org/wiki/Changes/EnableFwupdRefreshByDefault
 enable fwupd-refresh.timer
 
-# RHEL-67012
-enable fips-crypto-policy-overlay.service

almalinux-kitten-release.spec

@@ -8,7 +8,7 @@
 
 Name:           almalinux-kitten-release
 Version:        %{major}.%{minor}
-Release:        3%{?dist}.0.1
+Release:        0.21%{?dist}
 Summary:        %{distro} release files
 License:        GPL-2.0-or-later
 URL:            https://almalinux.org
@@ -56,8 +56,9 @@ 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
@@ -104,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
@@ -153,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}"
 
@@ -287,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/
@@ -300,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
@@ -356,6 +404,7 @@ echo '%%x86_64_v2 1' >> %{buildroot}%{_sysconfdir}/rpm/macros.x86_64_v2
 %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
@@ -372,19 +421,6 @@ echo '%%x86_64_v2 1' >> %{buildroot}%{_sysconfdir}/rpm/macros.x86_64_v2
 %{_sysconfdir}/pki/rpm-gpg
 
 %changelog
-* 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