Bump epoch

90-default.preset

@@ -194,6 +194,3 @@ enable dbus-daemon.service
 # enable nfs-client.target
 # https://bugzilla.redhat.com/show_bug.cgi?id=1967515
 enable nfs-client.target
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=2126605
-enable clevis-luks-askpass.path

RPM-GPG-KEY-AlmaLinux

@@ -56,32 +56,3 @@ kAIBinjtZwEEAP4GumNNy7f4l4tt1CBy1EgoYtYCcJC5SGyhWMee3L3hLhHe7Iwd
 72EHtteVBoVn0eg6
 =rEWJ
 -----END PGP PUBLIC KEY BLOCK-----
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBGUlFG8BEADc0kEC57b722MbPVkI8aoYFAEWM+lj084H26msZpAYVfW7fCi5
-S7g3n6htVdvvnB6MrJANitZgQhMyC7tchNQz5sjrFffasNkOoI5Q27PSrG676ILP
-diowPWfJkwrN0f0UcJsV3w5KBedvUXJnoa64lP/oBFkbz3SvUTqZFkSBzOfCTdXW
-bvpZonghgm/AEU8wqsdOitXU23Xn4fsPB7aULgR31jz3irnaUDFXUnNqoiQpU6JB
-P6WiFqN/IZMH95HW1WlMBGSOalSbQUlNEND3J0lxK2a33UBmTdR3aLyS+o9P8+7b
-Cdzbkrs1fXXVxxvlaQdSWBSjVULUZjKIZ+HtqhIaTiBELa7JHBEBbEZgNHpymmc8
-hIF6fdTbzbbYx9MbNmpzCcr+SKHubCdvZyX2FsWK1CHvYx6iPc9wcu4x9yh8MIfp
-KpLSJG1SaSCHbUdatpsOSQK2pbIN3THsvFrKPVssLrMgVjwp22Q3vMFL+ldq0vZ5
-6uIIiNRKrX2CKKrUy1kF7FjDNMx4riaCQHs5vp7qOttxv0E/X4Z9B4QZdC02H2Mq
-Ea5LoDxONutv+JMzWFyxIEQvbnfdDSu4QUDkn3H1WkBNmqTUwny5DSxZNjGB8a6P
-ISaIE+kN2pp5v9eB8Q4+4BxbU2G2/Jy/V6bFC8eLL+PIKodPKbpCqoPyGwARAQAB
-tCdBbG1hTGludXggT1MgOCA8cGFja2FnZXJAYWxtYWxpbnV4Lm9yZz6JAk8EEwEI
-ADkWIQS8Xt3K31AsB38Vgogq6B6KztcliwUCZSUUbwIbAwQLCQgHAyICAQQVCgkI
-BBYCAwECHgcCF4AACgkQKugeis7XJYvOeA/9E/hJwfd7UPtvsv+y7Wiei1NCt+OJ
-AzJQPjEzHJNmLAD157AHtpA2yZpB9GlRQkjRu40fn0It20mwjnl0j5oHF9HnQ+/H
-Qtiw9pwgNpZJaTe5YnzETbGqrrOVgWihkJyJhn42vtuirNu7pKJvWilRvz1a81JK
-i/okezXp1KBrgrxR/bG26c8k61AK6n/ExI1MoHZhyaAAebFqG8vTiWTuC2a4t7SD
-pxbzsn5CMuXqVY1gxIdiUGzgrXfSm5WgpSYEG01VN+VF885caPvtMHoLBy/pLGN3
-5TKp4pKiA9JGQxtlZLdO666UbpgbjoxFYxNZEwY3Tdx37zbsP4pHcaN8fOGbk5mG
-h8LwkjppPZzoXONyBfUJ+uHBEzRJEw4KtVRgaZZfCcojRvmyJB4TAM1SYkikaw8F
-0gi3OPRWtVdEogxP0XD/tTrPSKo7pTDEk17HIyKCU0KxF4ZSbxXFMeH5OZUQAQM4
-l7ECGNg3bVhXC66AHE72mz/PN39M2Z0Sww7GWYCf6IDhhkeTxYx+I7VW1Uo9ht5L
-i3ZRMbX/h6NBYTUaPJEx3fwixNv2+RtE3m4JIxg76xBOYGLyIRlaImWNGKTnGz5m
-IBRP5Vm7nRdFOOFhNz+iDIyq0LEyhGU7xCriFaL+ozXLiIzycidgTTZW3WfkHxlr
-ZEzov/wIBeoaIp8=
-=mC/C
------END PGP PUBLIC KEY BLOCK-----

almalinux-nfv.repo

@@ -1,27 +1,27 @@
 # almalinux-nfv.repo
 
 [nfv]
-name=AlmaLinux $releasever - Real Time for NFV
+name=AlmaLinux 8.6-beta - Real Time for NFV
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/nfv
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.6-beta/nfv
-# baseurl=https://repo.almalinux.org/almalinux/$releasever/NFV/$basearch/os/
+# baseurl=https://repo.almalinux.org/almalinux/8.6-beta/NFV/$basearch/os/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 
 ## Sources
 [nfv-source]
-name=AlmaLinux $releasever - Real Time for NFV Sources
+name=AlmaLinux 8.6-beta - Real Time for NFV Sources
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/nfv-source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.6-beta/nfv-source
-# baseurl=https://repo.almalinux.org/vault/$releasever/NFV/Source/
+# baseurl=https://repo.almalinux.org/vault/8.6-beta/NFV/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 
 ## Debuginfo
 [nfv-debuginfo]
-name=AlmaLinux $releasever - Real Time for NFV Debuginfo
+name=AlmaLinux 8.6-beta - Real Time for NFV Debuginfo
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/nfv-debuginfo
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.6-beta/nfv-debuginfo
-# baseurl=https://repo.almalinux.org/vault/$releasever/NFV/debug/$basearch/
+# baseurl=https://repo.almalinux.org/vault/8.6-beta/NFV/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux

almalinux-release.spec

@@ -1,21 +1,21 @@
 %define debug_package %{nil}
 %define product_family AlmaLinux
-%define release_name Cerulean Leopard
+%define release_name Sky Tiger
 %define contentdir almalinux
 %define infra_var stock
 %define base_release_version 8
-%define full_release_version 8.10
+%define full_release_version 8.6
 %define dist_release_version 8
-%define upstream_rel_long 8.10-0.2
+%define upstream_rel_long 8.6-0.1
-%define upstream_rel 8.10
+%define upstream_rel 8.6
-%define almalinux_rel 1
+%define almalinux_rel 0.1
 %define dist .el%{dist_release_version}
-%global eol_date 2029-06-01
 
 # The anaconda scripts in %%{_libexecdir} can create false requirements
 %global __requires_exclude_from %{_libexecdir}
 
 Name:           almalinux-release
+Epoch:          1
 Version:        %{upstream_rel}
 Release:        %{almalinux_rel}%{?dist}
 Summary:        %{product_family} release file
@@ -50,12 +50,9 @@ Source301:      almalinux-ha.repo
 Source302:      almalinux-powertools.repo
 Source303:      almalinux-resilientstorage.repo
 Source304:      almalinux-plus.repo
-Source305:      almalinux-sap.repo
-Source306:      almalinux-saphana.repo
-
 # Only for x86_64
-Source310:      almalinux-rt.repo
+Source305:      almalinux-rt.repo
-Source311:      almalinux-nfv.repo
+Source306:      almalinux-nfv.repo
 
 %description
 %{product_family} release files
@@ -84,13 +81,12 @@ ln -s almalinux-release %{buildroot}/etc/centos-release
 cat << EOF >>%{buildroot}%{_prefix}/lib/os-release
 NAME="%{product_family}"
 VERSION="%{full_release_version} (%{release_name})"
-ID="almalinux"
+ID="rhel"
-ID_LIKE="rhel centos fedora"
+ID_LIKE="fedora"
 VERSION_ID="%{full_release_version}"
 PLATFORM_ID="platform:el%{base_release_version}"
 PRETTY_NAME="%{product_family} %{full_release_version}%{?beta: %{beta}} (%{release_name})"
 ANSI_COLOR="0;34"
-LOGO="fedora-logo-icon"
 CPE_NAME="cpe:/o:almalinux:almalinux:%{base_release_version}::baseos"
 HOME_URL="https://almalinux.org/"
 DOCUMENTATION_URL="https://wiki.almalinux.org/"
@@ -98,9 +94,7 @@ BUG_REPORT_URL="https://bugs.almalinux.org/"
 
 ALMALINUX_MANTISBT_PROJECT="AlmaLinux-%{base_release_version}"
 ALMALINUX_MANTISBT_PROJECT_VERSION="%{full_release_version}"
-REDHAT_SUPPORT_PRODUCT="%{product_family}"
+
-REDHAT_SUPPORT_PRODUCT_VERSION="%{full_release_version}%{?beta: %{beta}}"
-SUPPORT_END=%{eol_date}
 EOF
 
 # Create the symlink for /etc/os-release
@@ -126,19 +120,16 @@ install -m 644 %{SOURCE301} %{buildroot}/etc/yum.repos.d
 install -m 644 %{SOURCE302} %{buildroot}/etc/yum.repos.d
 install -m 644 %{SOURCE303} %{buildroot}/etc/yum.repos.d
 install -m 644 %{SOURCE304} %{buildroot}/etc/yum.repos.d
-install -m 644 %{SOURCE305} %{buildroot}/etc/yum.repos.d
-install -m 644 %{SOURCE306} %{buildroot}/etc/yum.repos.d
 
 # RT and NFV are only for x86_64
 %ifarch x86_64
-install -m 644 %{SOURCE310} %{buildroot}/etc/yum.repos.d
+install -m 644 %{SOURCE305} %{buildroot}/etc/yum.repos.d
-install -m 644 %{SOURCE311} %{buildroot}/etc/yum.repos.d
+install -m 644 %{SOURCE306} %{buildroot}/etc/yum.repos.d
 %endif
 
 mkdir -p -m 755 %{buildroot}/etc/dnf/vars
 echo "%{infra_var}" > %{buildroot}/etc/dnf/vars/infra
 echo "%{contentdir}" >%{buildroot}/etc/dnf/vars/contentdir
-echo "%{base_release_version}-stream" > %{buildroot}/etc/dnf/vars/stream
 
 # set up the dist tag macros
 install -d -m 755 %{buildroot}/etc/rpm
@@ -182,15 +173,13 @@ rm -rf %{buildroot}
 ##/etc/centos-release-upstream
 /etc/almalinux-release
 /etc/almalinux-release-upstream
-/etc/dnf/vars/*
+/etc/dnf/
 /etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 %config(noreplace) /etc/yum.repos.d/almalinux.repo
 %config(noreplace) /etc/yum.repos.d/almalinux-ha.repo
 %config(noreplace) /etc/yum.repos.d/almalinux-powertools.repo
 %config(noreplace) /etc/yum.repos.d/almalinux-resilientstorage.repo
 %config(noreplace) /etc/yum.repos.d/almalinux-plus.repo
-%config(noreplace) /etc/yum.repos.d/almalinux-sap.repo
-%config(noreplace) /etc/yum.repos.d/almalinux-saphana.repo
 %ifarch x86_64
 %config(noreplace) /etc/yum.repos.d/almalinux-rt.repo
 %config(noreplace) /etc/yum.repos.d/almalinux-nfv.repo
@@ -201,44 +190,13 @@ rm -rf %{buildroot}
 %config(noreplace) /etc/issue.net
 /etc/rpm/macros.dist
 %{_docdir}/redhat-release
-%{_docdir}/almalinux-release
+%{_docdir}/almalinux-release/*
 %{_datadir}/redhat-release
-%{_datadir}/almalinux-release
+%{_datadir}/almalinux-release/*
 %{_prefix}/lib/os-release
 %{_prefix}/lib/systemd/system-preset/*
 
 %changelog
-* Wed May 22 2024 Andrew Lukoshko <alukoshko@almalinux.org> - 8.10-1
-- 8.10 stable release
-
-* Thu Nov 16 2023 Andrew Lukoshko <alukoshko@almalinux.org> - 8.9-1
-- 8.9 stable release
-
-* Mon Oct 16 2023 Andrew Lukoshko <alukoshko@almalinux.org> - 8.8-3
-- Split AlmaLinux OS 8 GPG public keys to fix microdnf
-
-* Tue Oct 10 2023 Andrew Lukoshko <alukoshko@almalinux.org> - 8.8-2
-- Add new AlmaLinux OS 8 GPG key
-
-* Tue May 16 2023 Andrew Lukoshko <alukoshko@almalinux.org> - 8.8-1
-- 8.8 stable release
-
-* Sat Nov 19 2022 Andrew Lukoshko <alukoshko@almalinux.org> - 8.7-3
-- Fixed ownership of dirs (albz#328)
-
-* Wed Nov 09 2022 Andrew Lukoshko <alukoshko@almalinux.org> - 8.7-2
-- Add stream dnf variable for CentOS SIG repos compatibility
-
-* Mon Nov 07 2022 Andrew Lukoshko <alukoshko@almalinux.org> - 8.7-1
-- 8.7 stable release
-- Add SAP and SAPHANA repos
-
-* Wed Jun 22 2022 Andrew Lukoshko <alukoshko@almalinux.org> - 8.6-2
-- Add more compatibility variables to /etc/os-release
-
-* Thu May 19 2022 Andrew Lukoshko <alukoshko@almalinux.org> - 8.6-1
-- Bump release
-
 * Tue May 10 2022 Andrew Lukoshko <alukoshko@almalinux.org> - 8.6-0.1
 - 8.6 stable release
 

almalinux-sap.repo

@@ -1,28 +0,0 @@
-# almalinux-sap.repo
-
-[sap]
-name=AlmaLinux $releasever - SAP
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/sap
-# baseurl=https://repo.almalinux.org/almalinux/$releasever/SAP/$basearch/os/
-enabled=0
-gpgcheck=1
-countme=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
-
-## Sources
-[sap-source]
-name=AlmaLinux $releasever - SAP Sources
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/sap-source
-# baseurl=https://repo.almalinux.org/vault/$releasever/SAP/Source/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
-
-## Debuginfo
-[sap-debuginfo]
-name=AlmaLinux $releasever - SAP Debuginfo
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/sap-debuginfo
-# baseurl=https://repo.almalinux.org/vault/$releasever/SAP/debug/$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux

almalinux-saphana.repo

@@ -1,28 +0,0 @@
-# almalinux-saphana.repo
-
-[saphana]
-name=AlmaLinux $releasever - SAP HANA
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/saphana
-# baseurl=https://repo.almalinux.org/almalinux/$releasever/SAPHANA/$basearch/os/
-enabled=0
-gpgcheck=1
-countme=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
-
-## Sources
-[saphana-source]
-name=AlmaLinux $releasever - SAP HANA Sources
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/saphana-source
-# baseurl=https://repo.almalinux.org/vault/$releasever/SAPHANA/Source/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
-
-## Debuginfo
-[saphana-debuginfo]
-name=AlmaLinux $releasever - SAP HANA Debuginfo
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/saphana-debuginfo
-# baseurl=https://repo.almalinux.org/vault/$releasever/SAPHANA/debug/$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux