set ID to rhel

85-display-manager.preset

@@ -9,7 +9,3 @@ enable lxdm.service
 enable sddm.service
 enable kdm.service
 enable xdm.service
-# https://issues.redhat.com/browse/RHEL-135678
-enable plasmalogin.service
-# https://issues.redhat.com/browse/RHEL-147639
-enable cosmic-greeter.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
 
@@ -477,20 +473,3 @@ enable fwupd-refresh.timer
 
 # RHEL-67012
 enable fips-crypto-policy-overlay.service
-
-# Enable greenboot services
-# https://issues.redhat.com/browse/RHEL-114149
-# https://issues.redhat.com/browse/RHEL-141642
-enable greenboot-set-success.target
-enable greenboot-set-rollback-trigger.service
-enable greenboot-grub2-set-counter.service
-enable greenboot-grub2-set-success.service
-enable greenboot-healthcheck.service
-enable greenboot-set-rollback-trigger.service
-enable greenboot-success.target
-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,14 @@
 
 %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
+Epoch:          2
 Version:        %{major}.%{minor}
-Release:        21%{?dist}
+Release:        8%{?dist}.0.1
 Summary:        %{distro} release files
 License:        GPL-2.0-or-later
 URL:            https://almalinux.org
@@ -27,7 +24,7 @@ Provides:       almalinux-release = %{version}-%{release}
 Suggests: lorax-templates-almalinux
 
 # Required for a lorax run (to generate install media)
-Requires:       almalinux-kitten-repos = %{version}-%{release}
+Requires:       almalinux-kitten-repos = %{epoch}:%{version}-%{release}
 Provides:       centos-release-eula
 Provides:       redhat-release-eula
 
@@ -78,7 +75,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
@@ -90,8 +86,8 @@ Provides: almalinux-sb-certs = %{version}-%{release}
 
 %package -n almalinux-kitten-repos
 Summary:        %{distro} package repositories
-Requires:       almalinux-kitten-release = %{version}-%{release}
-Requires:       almalinux-gpg-keys = %{version}-%{release}
+Requires:       almalinux-kitten-release = %{epoch}:%{version}-%{release}
+Requires:       almalinux-gpg-keys = %{epoch}:%{version}-%{release}
 # Required by CentOS SIGs release packages
 Provides:       centos-stream-repos = %{version}-%{release}
 
@@ -134,11 +130,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,9 +148,8 @@ 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"
+ID="rhel"
+ID_LIKE="fedora"
 VERSION_ID="%{major}"
 PLATFORM_ID="platform:el%{major}"
 PRETTY_NAME="%{distro} %{major} (%{release_name})"
@@ -210,7 +200,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
@@ -319,14 +308,6 @@ 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
 
-# Replace basearch to i686, disable mirrorlist and enable baseurl
-%ifarch i686
-sed -i "s/\$basearch/i686/g" %{buildroot}%{_sysconfdir}/yum.repos.d/*.repo
-sed -i 's/^mirrorlist=/# mirrorlist=/g' %{buildroot}%{_sysconfdir}/yum.repos.d/*.repo
-sed -i 's/^# baseurl=/baseurl=/g' %{buildroot}%{_sysconfdir}/yum.repos.d/*.repo
-sed -i 's/kitten\.repo\.almalinux\.org/kitten.vault.almalinux.org/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
@@ -338,7 +319,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
 
 
@@ -395,37 +377,6 @@ install -p -m 0644 %{SOURCE700}  %{buildroot}%{_sysconfdir}/rpm/
 %{_sysconfdir}/pki/rpm-gpg
 
 %changelog
-* Thu Apr 16 2026 Eduard Abdullin <eabdullin@almalinux.org> - 10.0-21
-- Fix greenboot-rs preset services
-
-* Thu Apr 02 2026 Eduard Abdullin <eabdullin@almalinux.org> - 10.0-20
-- Enable greenboot-rs services
-- Enable cosmic-greeter service for COSMIC
-
-* Wed Mar 25 2026 Eduard Abdullin <eabdullin@almalinux.org> - 10.0-18.0.1
-- Add support for i686 architecture
-
-* 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
 
@@ -437,7 +388,7 @@ install -p -m 0644 %{SOURCE700}  %{buildroot}%{_sysconfdir}/rpm/
 - 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
+* Thu Feb 06 2024 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

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}}