25 changed files with 656 additions and 516 deletions
--- a/50-redhat.conf
+++ b/50-redhat.conf
@ -0,0 +1,7 @@
+# https://bugzilla.redhat.com/show_bug.cgi?id=1689346
+kernel.kptr_restrict = 1
+
+# Source route verification
+net.ipv4.conf.default.rp_filter = 1
+net.ipv4.conf.*.rp_filter = 1
+-net.ipv4.conf.all.rp_filter
--- a/85-display-manager.preset
+++ b/85-display-manager.preset
@ -6,5 +6,6 @@ enable gdm.service
 enable lightdm.service
 enable slim.service
 enable lxdm.service
+enable sddm.service
 enable kdm.service
 enable xdm.service
--- a/90-default-user.preset
+++ b/90-default-user.preset
@ -0,0 +1,22 @@
+# Enable the D-Bus service (including its socket for socket activation)
+# unconditionally. It is used throughout Fedora and required on all machines.
+# https://src.fedoraproject.org/rpms/fedora-release/pull-request/4
+# https://fedoraproject.org/w/index.php?title=Starting_services_by_default&oldid=377748
+enable dbus.socket
+enable dbus-broker.service
+
+# Socket-activated pipewire service for individual user sessions
+# https://bugzilla.redhat.com/show_bug.cgi?id=1592434
+enable pipewire.socket
+
+# Enable the PipeWire PulseAudio compatibility socket interface
+# https://bugzilla.redhat.com/show_bug.cgi?id=1904239
+# https://bugzilla.redhat.com/show_bug.cgi?id=1907906
+# https://fedoraproject.org/wiki/Changes/DefaultPipeWire
+enable pipewire-pulse.socket
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1976006
+enable pipewire-media-session.service
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=2022717
+enable wireplumber.service
--- a/90-default.preset
+++ b/90-default.preset
@ -30,10 +30,25 @@ enable sysklogd.*

 # Network facing
 enable firewalld.service
-enable libvirtd.service
 enable xinetd.service
 enable ladvd.service

+# Virtualization driver specific daemons. Start by defalt at boot for VM
+# autostart, but shutdown after 2 mins and socket activated thereafter
+enable virtqemud.service
+
+# Compatibility with libvirtd sockets for old clients and expose TCP sockets
+enable virtproxyd.socket
+
+# Secondary drivers providing supporting functionality to main virtualization
+# drivers, socket activated only when required
+enable virtinterfaced.socket
+enable virtnetworkd.socket
+enable virtnodedevd.socket
+enable virtnwfilterd.socket
+enable virtsecretd.socket
+enable virtstoraged.socket
+
 # Storage
 enable multipathd.service
 enable libstoragemgmt.service
@ -116,6 +131,8 @@ enable upower.service
 enable udisks2.service
 enable packagekit-offline-update.service
 enable PackageKit.service
+# https://bugzilla.redhat.com/show_bug.cgi?id=2011240
+enable power-profiles-daemon.service

 # Initial Setup reconfiguration service
 enable initial-setup-reconfiguration.service
@ -165,17 +182,29 @@ enable mlocate-updatedb.timer
 # https://bugzilla.redhat.com/show_bug.cgi?id=1805466
 enable nvmefc-boot-connections.service

-# https://bugzilla.redhat.com/show_bug.cgi?id=1683101
-enable nfs-convert.service
-
 # OSTree based systems need to remount /sysroot and
 # /var as rw via ostree-remount.service
 # ignored by non-OSTree based systems
 # https://bugzilla.redhat.com/show_bug.cgi?id=1848453
 enable ostree-remount.service

-# enable greenboot services
-# https://bugzilla.redhat.com/show_bug.cgi?id=1935177
+# DBus needed by Anaconda
+enable dbus.socket
+enable dbus-broker.service
+
+# Enable iscsi service files
+# https://bugzilla.redhat.com/show_bug.cgi?id=1930458
+enable iscsi.service
+enable iscsid.socket
+enable iscsiuio.socket
+enable iscsi-onboot.service
+
+# Enable logrotate.timer
+# https://bugzilla.redhat.com/show_bug.cgi?id=1977865
+enable logrotate.timer 
+
+# Enable greenboot
+# https://bugzilla.redhat.com/show_bug.cgi?id=2005552
 enable greenboot-grub2-set-counter.service
 enable greenboot-grub2-set-success.service
 enable greenboot-healthcheck.service
@ -184,16 +213,14 @@ enable greenboot-status.service
 enable greenboot-task-runner.service
 enable redboot-auto-reboot.service
 enable redboot-task-runner.service
+# https://bugzilla.redhat.com/show_bug.cgi?id=2108625
+enable greenboot-service-monitor.service

-# enable dbus services
-# https://bugzilla.redhat.com/show_bug.cgi?id=1941642
-# https://projects.engineering.redhat.com/browse/RHELBLD-6131
-enable dbus.socket
-enable dbus-daemon.service
+# https://bugzilla.redhat.com/show_bug.cgi?id=2013299
+enable low-memory-monitor.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=2049627
+enable switcheroo-control.service

-# https://bugzilla.redhat.com/show_bug.cgi?id=2106814
+# https://bugzilla.redhat.com/show_bug.cgi?id=2106811
 enable clevis-luks-askpass.path
--- a/6
+++ b/6
@ -1,10 +1,8 @@
-AlmaLinux 8 EULA
+AlmaLinux 9 EULA

-AlmaLinux 8 comes with no guarantees or warranties of any sorts, 
+AlmaLinux 9 comes with no guarantees or warranties of any sorts, 
 either written or implied.

 The Distribution is released as GPLv2. Individual packages in the
 distribution come with their own licences. A copy of the GPLv2 license
 is included with the distribution media.
-
-
--- a/0
+++ b/0
--- a/58
+++ b/58
@ -1,58 +0,0 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1
-
-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
-72EHtteVBoVn0eg6
-=rEWJ
-----END PGP PUBLIC KEY BLOCK-----
--- a/52
+++ b/52
@ -0,0 +1,52 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+1WKL
+=jk2t
+-----END PGP PUBLIC KEY BLOCK-----
--- a/almalinux-appstream.repo
+++ b/almalinux-appstream.repo
@ -0,0 +1,30 @@
+[appstream]
+name=AlmaLinux 9.1-beta - AppStream
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.1-beta/appstream
+# baseurl=https://repo.almalinux.org/almalinux/9.1-beta/AppStream/$basearch/os/
+enabled=1
+gpgcheck=1
+countme=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=1
+
+[appstream-debug]
+name=AlmaLinux 9.1-beta - AppStream - Debug
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.1-beta/appstream-debug
+# baseurl=https://repo.almalinux.org/vault/9.1-beta/AppStream/debug/$basearch/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
+
+[appstream-source]
+name=AlmaLinux 9.1-beta - AppStream - Source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.1-beta/appstream-source
+# baseurl=https://repo.almalinux.org/vault/9.1-beta/AppStream/Source/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
--- a/almalinux-baseos.repo
+++ b/almalinux-baseos.repo
@ -0,0 +1,30 @@
+[baseos]
+name=AlmaLinux 9.1-beta - BaseOS
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.1-beta/baseos
+# baseurl=https://repo.almalinux.org/almalinux/9.1-beta/BaseOS/$basearch/os/
+enabled=1
+gpgcheck=1
+countme=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=1
+
+[baseos-debug]
+name=AlmaLinux 9.1-beta - BaseOS - Debug
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.1-beta/baseos-debug
+# baseurl=https://repo.almalinux.org/vault/9.1-beta/BaseOS/debug/$basearch/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
+
+[baseos-source]
+name=AlmaLinux 9.1-beta - BaseOS - Source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.1-beta/baseos-source
+# baseurl=https://repo.almalinux.org/vault/9.1-beta/BaseOS/Source/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
--- a/almalinux-crb.repo
+++ b/almalinux-crb.repo
@ -0,0 +1,30 @@
+[crb]
+name=AlmaLinux 9.1-beta - CRB
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.1-beta/crb
+# baseurl=https://repo.almalinux.org/almalinux/9.1-beta/CRB/$basearch/os/
+enabled=0
+gpgcheck=1
+countme=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
+
+[crb-debug]
+name=AlmaLinux 9.1-beta - CRB - Debug
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.1-beta/crb-debug
+# baseurl=https://repo.almalinux.org/vault/9.1-beta/CRB/debug/$basearch/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
+
+[crb-source]
+name=AlmaLinux 9.1-beta - CRB - Source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.1-beta/crb-source
+# baseurl=https://repo.almalinux.org/vault/9.1-beta/CRB/Source/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
--- a/almalinux-extras.repo
+++ b/almalinux-extras.repo
@ -0,0 +1,30 @@
+[extras]
+name=AlmaLinux 9.1-beta - Extras
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.1-beta/extras
+# baseurl=https://repo.almalinux.org/almalinux/9.1-beta/extras/$basearch/os/
+enabled=1
+gpgcheck=1
+countme=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
+
+[extras-debug]
+name=AlmaLinux 9.1-beta - Extras - Debug
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.1-beta/extras-debug
+# baseurl=https://repo.almalinux.org/vault/9.1-beta/extras/debug/$basearch/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
+
+[extras-source]
+name=AlmaLinux 9.1-beta - Extras - Source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.1-beta/extras-source
+# baseurl=https://repo.almalinux.org/vault/9.1-beta/extras/Source/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
--- a/almalinux-ha.repo
+++ b/almalinux-ha.repo
@ -1,28 +0,0 @@
-# almalinux-ha.repo
-
-[ha]
-name=AlmaLinux $releasever - HighAvailability
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/ha
-# baseurl=https://repo.almalinux.org/almalinux/$releasever/HighAvailability/$basearch/os/
-enabled=0
-gpgcheck=1
-countme=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
-
-## Sources
-[ha-source]
-name=AlmaLinux $releasever - HighAvailability Source
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/ha-source
-# baseurl=https://repo.almalinux.org/vault/$releasever/HighAvailability/Source/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
-
-## Debuginfo
-[ha-debuginfo]
-name=AlmaLinux $releasever - HighAvailability debuginfo
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/ha-debuginfo
-# baseurl=https://repo.almalinux.org/vault/$releasever/HighAvailability/debug/$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
--- a/almalinux-highavailability.repo
+++ b/almalinux-highavailability.repo
@ -0,0 +1,30 @@
+[highavailability]
+name=AlmaLinux 9.1-beta - HighAvailability
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.1-beta/highavailability
+# baseurl=https://repo.almalinux.org/almalinux/9.1-beta/HighAvailability/$basearch/os/
+enabled=0
+gpgcheck=1
+countme=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
+
+[highavailability-debug]
+name=AlmaLinux 9.1-beta - HighAvailability - Debug
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.1-beta/highavailability-debug
+# baseurl=https://repo.almalinux.org/vault/9.1-beta/HighAvailability/debug/$basearch/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
+
+[highavailability-source]
+name=AlmaLinux 9.1-beta - HighAvailability - Source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.1-beta/highavailability-source
+# baseurl=https://repo.almalinux.org/vault/9.1-beta/HighAvailability/Source/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
--- a/almalinux-nfv.repo
+++ b/almalinux-nfv.repo
@ -1,27 +1,30 @@
-# almalinux-nfv.repo
-
 [nfv]
-name=AlmaLinux $releasever - Real Time for NFV
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/nfv
-# baseurl=https://repo.almalinux.org/almalinux/$releasever/NFV/$basearch/os/
+name=AlmaLinux 9.1-beta - NFV
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.1-beta/nfv
+# baseurl=https://repo.almalinux.org/almalinux/9.1-beta/NFV/$basearch/os/
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+countme=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0

-## Sources
-[nfv-source]
-name=AlmaLinux $releasever - Real Time for NFV Sources
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/nfv-source
-# baseurl=https://repo.almalinux.org/vault/$releasever/NFV/Source/
+[nfv-debug]
+name=AlmaLinux 9.1-beta - NFV - Debug
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.1-beta/nfv-debug
+# baseurl=https://repo.almalinux.org/vault/9.1-beta/NFV/debug/$basearch/
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0

-## Debuginfo
-[nfv-debuginfo]
-name=AlmaLinux $releasever - Real Time for NFV Debuginfo
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/nfv-debuginfo
-# baseurl=https://repo.almalinux.org/vault/$releasever/NFV/debug/$basearch/
+[nfv-source]
+name=AlmaLinux 9.1-beta - NFV - Source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.1-beta/nfv-source
+# baseurl=https://repo.almalinux.org/vault/9.1-beta/NFV/Source/
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
--- a/almalinux-plus.repo
+++ b/almalinux-plus.repo
@ -1,28 +1,30 @@
-# almalinux-plus.repo
-
 [plus]
-name=AlmaLinux $releasever - Plus
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/plus
-# baseurl=https://repo.almalinux.org/almalinux/$releasever/plus/$basearch/os/
+name=AlmaLinux 9.1-beta - Plus
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.1-beta/plus
+# baseurl=https://repo.almalinux.org/almalinux/9.1-beta/plus/$basearch/os/
 enabled=0
 gpgcheck=1
 countme=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0

-## Sources
-[plus-source]
-name=AlmaLinux $releasever - Plus Source
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/plus-source
-# baseurl=https://repo.almalinux.org/vault/$releasever/plus/Source/
+[plus-debug]
+name=AlmaLinux 9.1-beta - Plus - Debug
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.1-beta/plus-debug
+# baseurl=https://repo.almalinux.org/vault/9.1-beta/plus/debug/$basearch/
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0

-## Debuginfo
-[plus-debuginfo]
-name=AlmaLinux $releasever - Plus debuginfo
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/plus-debuginfo
-# baseurl=https://repo.almalinux.org/vault/$releasever/plus/debug/$basearch/
+[plus-source]
+name=AlmaLinux 9.1-beta - Plus - Source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.1-beta/plus-source
+# baseurl=https://repo.almalinux.org/vault/9.1-beta/plus/Source/
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
--- a/almalinux-powertools.repo
+++ b/almalinux-powertools.repo
@ -1,28 +0,0 @@
-# almalinux-powertools.repo
-
-[powertools]
-name=AlmaLinux $releasever - PowerTools
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/powertools
-# baseurl=https://repo.almalinux.org/almalinux/$releasever/PowerTools/$basearch/os/
-enabled=0
-gpgcheck=1
-countme=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
-
-## Sources
-[powertools-source]
-name=AlmaLinux $releasever - PowerTools Source
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/powertools-source
-# baseurl=https://repo.almalinux.org/vault/$releasever/PowerTools/Source/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
-
-## Debuginfo
-[powertools-debuginfo]
-name=AlmaLinux $releasever - PowerTools debuginfo
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/powertools-debuginfo
-# baseurl=https://repo.almalinux.org/vault/$releasever/PowerTools/debug/$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
--- a/almalinux-release.spec
+++ b/almalinux-release.spec
@ -1,257 +1,318 @@
-%define debug_package %{nil}
-%define product_family AlmaLinux
-%define release_name Stone Smilodon
-%define contentdir almalinux
-%define infra_var stock
-%define base_release_version 8
-%define full_release_version 8.7
-%define dist_release_version 8
-%define upstream_rel_long 8.7-0.3
-%define upstream_rel 8.7
-%define almalinux_rel 3
-%define dist .el%{dist_release_version}
-
-# The anaconda scripts in %%{_libexecdir} can create false requirements
-%global __requires_exclude_from %{_libexecdir}
+%global distro  AlmaLinux
+%global release_name Lime Lynx
+%global major   9
+%global minor   1
+
+%global beta Beta

 Name:           almalinux-release
-Version:        %{upstream_rel}
-Release:        %{almalinux_rel}%{?dist}
-Summary:        %{product_family} release file
-Group:          System Environment/Base
+Version:        %{major}.%{minor}
+Release:        1.8%{?dist}
+Summary:        %{distro} release files
 License:        GPLv2
-Provides:       almalinux-release = %{version}-%{release}
+URL:            https://almalinux.org
+
 Provides:       centos-release = %{version}-%{release}
-Provides:       almalinux-release(upstream) = %{upstream_rel}
-Provides:       centos-release(upstream) = %{upstream_rel}
-Provides:       redhat-release = %{upstream_rel_long}
-Provides:       system-release = %{upstream_rel_long}
-Provides:       system-release(releasever) = %{base_release_version}
-Provides:       base-module(platform:el%{base_release_version})
-
-Provides:       almalinux-release-eula
+
+# Required for a lorax run (to generate install media)
+Requires:       almalinux-repos = %{version}-%{release}
 Provides:       centos-release-eula
 Provides:       redhat-release-eula

-Source1:        85-display-manager.preset
-Source2:        90-default.preset
-Source3:        99-default-disable.preset
-Source10:       RPM-GPG-KEY-AlmaLinux
+# required by epel-release
+Provides:       redhat-release = %{version}-%{release}

-##Source100:      rootfs-expand
+# required by dnf
+# 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}
+
+# required by libdnf
+# https://github.com/rpm-software-management/libdnf/blob/0.48.0/libdnf/module/ModulePackage.cpp#L472
+Provides:       base-module(platform:el%{major})

 Source200:      EULA
-Source201:      GPL
-##Source202:      Contributors
+Source201:      LICENSE
+
+Source300:      85-display-manager.preset
+Source301:      90-default.preset
+Source302:      90-default-user.preset
+Source303:      99-default-disable.preset
+Source304:      50-redhat.conf
+
+Source400:      alsecureboot001.cer
+# kernel signing certificate
+Source401:      alsecureboot001.cer
+# grub2 signing certificate
+Source402:      alsecureboot001.cer
+# Fwupd signing certificate
+Source403:      alsecureboot001.cer
+
+Source500:      almalinux-appstream.repo
+Source501:      almalinux-baseos.repo
+Source502:      almalinux-crb.repo
+Source503:      almalinux-extras.repo
+Source504:      almalinux-highavailability.repo
+Source505:      almalinux-resilientstorage.repo
+Source506:      almalinux-sap.repo
+Source507:      almalinux-saphana.repo
+# No plus repo in betas
+# Source508:      almalinux-plus.repo
+# Only for x86_64
+Source510:      almalinux-nfv.repo
+Source511:      almalinux-rt.repo

-Source300:      almalinux.repo
-Source301:      almalinux-ha.repo
-Source302:      almalinux-powertools.repo
-Source303:      almalinux-resilientstorage.repo
-Source304:      almalinux-plus.repo
-Source305:      almalinux-sap.repo
-Source306:      almalinux-saphana.repo
+Source600:      RPM-GPG-KEY-AlmaLinux-9
+
+%package -n almalinux-sb-certs
+Summary: %{distro} public secureboot certificates
+Group: System Environment/Base
+Provides: system-sb-certs = %{version}-%{release}
+Provides: redhat-sb-certs = %{version}-%{release}
+
+%package -n almalinux-repos
+Summary:        %{distro} package repositories
+Requires:       almalinux-release = %{version}-%{release}
+Requires:       almalinux-gpg-keys = %{version}-%{release}
+
+%package -n almalinux-gpg-keys
+Summary:        %{distro} RPM keys

-# Only for x86_64
-Source310:      almalinux-rt.repo
-Source311:      almalinux-nfv.repo

 %description
-%{product_family} release files
+%{distro} release files.

-%prep
-echo OK
+%description -n almalinux-sb-certs
+%{distro} secureboot certificates

-%build
-echo OK
+%description -n almalinux-repos
+This package provides the package repository files for %{distro}.
+
+%description -n almalinux-gpg-keys
+This package provides the RPM signature keys for %{distro}.

-%install
-rm -rf %{buildroot}

-# create skeleton
-mkdir -p %{buildroot}/etc
-mkdir -p %{buildroot}%{_prefix}/lib
+%install
+# copy license and contributors doc here for %%license and %%doc macros
+mkdir -p ./docs
+cp %{SOURCE201} ./docs

 # create /etc/system-release and /etc/redhat-release
-echo "%{product_family} release %{full_release_version}%{?beta: %{beta}} (%{release_name})" > %{buildroot}/etc/almalinux-release
-echo "Derived from Red Hat Enterprise Linux %{upstream_rel} (Source)" > %{buildroot}/etc/almalinux-release-upstream
-ln -s almalinux-release %{buildroot}/etc/system-release
-ln -s almalinux-release %{buildroot}/etc/redhat-release
-ln -s almalinux-release %{buildroot}/etc/centos-release
+install -d -m 0755 %{buildroot}%{_sysconfdir}
+echo "%{distro} release %{major}.%{minor}%{?beta: %{beta}} (%{release_name})" > %{buildroot}%{_sysconfdir}/almalinux-release
+ln -s almalinux-release %{buildroot}%{_sysconfdir}/system-release
+ln -s almalinux-release %{buildroot}%{_sysconfdir}/redhat-release

 # Create the os-release file
-cat << EOF >>%{buildroot}%{_prefix}/lib/os-release
-NAME="%{product_family}"
-VERSION="%{full_release_version} (%{release_name})"
+install -d -m 0755 %{buildroot}%{_prefix}/lib
+cat > %{buildroot}%{_prefix}/lib/os-release << EOF
+NAME="%{distro}"
+VERSION="%{major}.%{minor}%{?beta: %{beta}} (%{release_name})"
 ID="almalinux"
 ID_LIKE="rhel centos fedora"
-VERSION_ID="%{full_release_version}"
-PLATFORM_ID="platform:el%{base_release_version}"
-PRETTY_NAME="%{product_family} %{full_release_version}%{?beta: %{beta}} (%{release_name})"
+VERSION_ID="%{major}.%{minor}"
+PLATFORM_ID="platform:el%{major}"
+PRETTY_NAME="%{distro} %{major}.%{minor}%{?beta: %{beta}} (%{release_name})"
 ANSI_COLOR="0;34"
 LOGO="fedora-logo-icon"
-CPE_NAME="cpe:/o:almalinux:almalinux:%{base_release_version}::baseos"
+CPE_NAME="cpe:/o:almalinux:almalinux:%{major}::baseos"
 HOME_URL="https://almalinux.org/"
 DOCUMENTATION_URL="https://wiki.almalinux.org/"
 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}}"
+ALMALINUX_MANTISBT_PROJECT="AlmaLinux-%{major}"
+ALMALINUX_MANTISBT_PROJECT_VERSION="%{major}.%{minor}"
+REDHAT_SUPPORT_PRODUCT="%{distro}"
+REDHAT_SUPPORT_PRODUCT_VERSION="%{major}.%{minor}%{?beta: %{beta}}"
 EOF

 # Create the symlink for /etc/os-release
 ln -s ../usr/lib/os-release %{buildroot}%{_sysconfdir}/os-release

-# write cpe to /etc/system-release-cpe
-echo "cpe:/o:almalinux:almalinux:%{base_release_version}::baseos" | tr [A-Z] [a-z] > %{buildroot}/etc/system-release-cpe
+# write cpe to /etc/system/release-cpe
+echo "cpe:/o:almalinux:almalinux:%{major}::baseos" > %{buildroot}%{_sysconfdir}/system-release-cpe

-# create /etc/issue and /etc/issue.net
-echo '\S' > %{buildroot}/etc/issue
-echo 'Kernel \r on an \m' >> %{buildroot}/etc/issue
-cp %{buildroot}/etc/issue %{buildroot}/etc/issue.net
-echo >> %{buildroot}/etc/issue
-
-# copy GPG keys
-mkdir -p -m 755 %{buildroot}/etc/pki/rpm-gpg
-install -m 644 %{SOURCE10} %{buildroot}/etc/pki/rpm-gpg
-
-# copy yum repos
-mkdir -p -m 755 %{buildroot}/etc/yum.repos.d
-install -m 644 %{SOURCE300} %{buildroot}/etc/yum.repos.d
-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 %{SOURCE311} %{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
+# create /etc/issue, /etc/issue.net and /etc/issue.d
+echo '\S' > %{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

 # set up the dist tag macros
-install -d -m 755 %{buildroot}/etc/rpm
-cat >> %{buildroot}/etc/rpm/macros.dist << EOF
+mkdir -p %{buildroot}%{_rpmmacrodir}
+cat > %{buildroot}%{_rpmmacrodir}/macros.dist << EOF
 # dist macros.

-%%almalinux_ver %{base_release_version}
-%%almalinux %{base_release_version}
-%%centos_ver %{base_release_version}
-%%centos %{base_release_version}
-%%rhel %{base_release_version}
-%%dist .el%{base_release_version}
-%%el%{base_release_version} 1
+%%__bootstrap ~bootstrap
+%%almalinux_ver %{major}
+%%almalinux %{major}
+%%centos_ver %{major}
+%%centos %{major}
+%%rhel %{major}
+%%dist %%{!?distprefix0:%%{?distprefix}}%%{expand:%%{lua:for i=0,9999 do print("%%{?distprefix" .. i .."}") end}}.el%{major}%%{?with_bootstrap:%{__bootstrap}}
+%%el%{major} 1
 EOF

 # use unbranded datadir
-mkdir -p -m 755 %{buildroot}/%{_datadir}/almalinux-release
-ln -s almalinux-release %{buildroot}/%{_datadir}/redhat-release
-install -m 644 %{SOURCE200} %{buildroot}/%{_datadir}/almalinux-release
-
-# use unbranded docdir
-mkdir -p -m 755 %{buildroot}/%{_docdir}/almalinux-release
-ln -s almalinux-release %{buildroot}/%{_docdir}/redhat-release
-install -m 644 %{SOURCE201} %{buildroot}/%{_docdir}/almalinux-release
+install -d -m 0755 %{buildroot}%{_datadir}/almalinux-release
+ln -s almalinux-release %{buildroot}%{_datadir}/redhat-release
+install -p -m 0644 %{SOURCE200} %{buildroot}%{_datadir}/almalinux-release/

 # copy systemd presets
-mkdir -p %{buildroot}/%{_prefix}/lib/systemd/system-preset/
-install -m 0644 %{SOURCE1} %{buildroot}/%{_prefix}/lib/systemd/system-preset/
-install -m 0644 %{SOURCE2} %{buildroot}/%{_prefix}/lib/systemd/system-preset/
-install -m 0644 %{SOURCE3} %{buildroot}/%{_prefix}/lib/systemd/system-preset/
+install -d -m 0755 %{buildroot}%{_prefix}/lib/systemd/system-preset/
+install -d -m 0755 %{buildroot}%{_prefix}/lib/systemd/user-preset
+install -p -m 0644 %{SOURCE300} %{buildroot}%{_prefix}/lib/systemd/system-preset/
+install -p -m 0644 %{SOURCE301} %{buildroot}%{_prefix}/lib/systemd/system-preset/
+install -p -m 0644 %{SOURCE302} %{buildroot}%{_prefix}/lib/systemd/user-preset/
+
+# installing the same file for both system and user presets to set the same behavior for both
+install -p -m 0644 %{SOURCE303} %{buildroot}%{_prefix}/lib/systemd/system-preset/
+install -p -m 0644 %{SOURCE303} %{buildroot}%{_prefix}/lib/systemd/user-preset/
+
+# copy sysctl presets
+mkdir -p %{buildroot}/%{_prefix}/lib/sysctl.d/
+install -m 0644 %{SOURCE304} %{buildroot}/%{_prefix}/lib/sysctl.d/
+
+# Create stub yum repos
+mkdir %{buildroot}%{_sysconfdir}/yum.repos.d
+touch %{buildroot}%{_sysconfdir}/yum.repos.d/redhat.repo
+
+# Copy secureboot certificates
+install -d -m 0755 %{buildroot}%{_sysconfdir}/pki/sb-certs/
+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 %{SOURCE402} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-grub2-aarch64.cer
+install -m 644 %{SOURCE403} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-fwupd-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 %{SOURCE402} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-grub2-x86_64.cer
+install -m 644 %{SOURCE403} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-fwupd-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 %{SOURCE402} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-grub2-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
+
+# Link x86_64 certs
+ln -sr %{buildroot}%{_datadir}%{_datadir}/pki/sb-certs/secureboot-ca-x86_64.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-ca-x86_64.cer
+ln -sr %{buildroot}%{_datadir}%{_datadir}/pki/sb-certs/secureboot-kernel-x86_64.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-kernel-x86_64.cer
+ln -sr %{buildroot}%{_datadir}%{_datadir}/pki/sb-certs/secureboot-grub2-x86_64.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-grub2-x86_64.cer
+ln -sr %{buildroot}%{_datadir}%{_datadir}/pki/sb-certs/secureboot-fwupd-x86_64.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-fwupd-x86_64.cer
+
+# Link aarch64 certs
+ln -sr %{buildroot}%{_datadir}%{_datadir}/pki/sb-certs/secureboot-ca-aarch64.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-ca-aarch64.cer
+ln -sr %{buildroot}%{_datadir}%{_datadir}/pki/sb-certs/secureboot-kernel-aarch64.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-kernel-aarch64.cer
+ln -sr %{buildroot}%{_datadir}%{_datadir}/pki/sb-certs/secureboot-grub2-aarch64.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-grub2-aarch64.cer
+ln -sr %{buildroot}%{_datadir}%{_datadir}/pki/sb-certs/secureboot-fwupd-aarch64.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-fwupd-aarch64.cer
+
+# Link ppc64le certs
+ln -sr %{buildroot}%{_datadir}%{_datadir}/pki/sb-certs/secureboot-ca-ppc64le.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-ca-ppc64le.cer
+ln -sr %{buildroot}%{_datadir}%{_datadir}/pki/sb-certs/secureboot-kernel-ppc64le.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-kernel-ppc64le.cer
+ln -sr %{buildroot}%{_datadir}%{_datadir}/pki/sb-certs/secureboot-grub2-ppc64le.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-grub2-ppc64le.cer
+
+# Link s390x certs
+ln -sr %{buildroot}%{_datadir}%{_datadir}/pki/sb-certs/secureboot-ca-s390x.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-ca-s390x.cer
+ln -sr %{buildroot}%{_datadir}%{_datadir}/pki/sb-certs/secureboot-kernel-s390x.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-kernel-s390x.cer

+# copy yum repos
+install -d -m 0755 %{buildroot}%{_sysconfdir}/yum.repos.d
+install -p -m 0644 %{SOURCE500} %{buildroot}%{_sysconfdir}/yum.repos.d/
+install -p -m 0644 %{SOURCE501} %{buildroot}%{_sysconfdir}/yum.repos.d/
+install -p -m 0644 %{SOURCE502} %{buildroot}%{_sysconfdir}/yum.repos.d/
+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/
+# install -p -m 0644 %{SOURCE508} %{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/
+install -p -m 0644 %{SOURCE511} %{buildroot}%{_sysconfdir}/yum.repos.d/
+%endif
+
+# dnf variables for CentOS SIG repos compatibility
+install -d -m 0755 %{buildroot}%{_sysconfdir}/dnf/vars
+echo "%{major}-stream" > %{buildroot}%{_sysconfdir}/dnf/vars/stream
+
+# copy GPG keys
+install -d -m 0755 %{buildroot}%{_sysconfdir}/pki/rpm-gpg
+install -p -m 0644 %{SOURCE600} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/

-%clean
-rm -rf %{buildroot}

 %files
-%defattr(0644,root,root,0755)
-/etc/redhat-release
-/etc/system-release
-/etc/centos-release
-##/etc/centos-release-upstream
-/etc/almalinux-release
-/etc/almalinux-release-upstream
-/etc/dnf/vars/*
-/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
-%endif
-%config(noreplace) /etc/os-release
-%config /etc/system-release-cpe
-%config(noreplace) /etc/issue
-%config(noreplace) /etc/issue.net
-/etc/rpm/macros.dist
-%{_docdir}/redhat-release
-%{_docdir}/almalinux-release
+%license docs/LICENSE
+%{_sysconfdir}/redhat-release
+%{_sysconfdir}/system-release
+%{_sysconfdir}/almalinux-release
+%config(noreplace) %{_sysconfdir}/os-release
+%config %{_sysconfdir}/system-release-cpe
+%config(noreplace) %{_sysconfdir}/issue
+%config(noreplace) %{_sysconfdir}/issue.net
+%dir %{_sysconfdir}/issue.d
+%dir %{_sysconfdir}/yum.repos.d
+%ghost %{_sysconfdir}/yum.repos.d/redhat.repo
+%{_rpmmacrodir}/macros.dist
 %{_datadir}/redhat-release
 %{_datadir}/almalinux-release
 %{_prefix}/lib/os-release
 %{_prefix}/lib/systemd/system-preset/*
+%{_prefix}/lib/systemd/user-preset/*
+%{_prefix}/lib/sysctl.d/50-redhat.conf
+
+%files -n almalinux-sb-certs
+# Note to future packagers:
+# resetting the symlinks in /etc/pki/sb-certs on upgrade is the intended behavior here
+%dir %{_sysconfdir}/pki/sb-certs
+%dir %{_datadir}/pki/sb-certs/
+%{_sysconfdir}/pki/sb-certs/*.cer
+%{_datadir}/pki/sb-certs/*.cer
+
+%files -n almalinux-repos
+%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-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
+#config(noreplace) %{_sysconfdir}/yum.repos.d/almalinux-plus.repo
+%ifarch x86_64
+%config(noreplace) %{_sysconfdir}/yum.repos.d/almalinux-nfv.repo
+%config(noreplace) %{_sysconfdir}/yum.repos.d/almalinux-rt.repo
+%endif
+%config(noreplace) %{_sysconfdir}/dnf/vars/stream

-%changelog
-* 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
-
-* Thu Mar 31 2022 Andrew Lukoshko <alukoshko@almalinux.org> - 8.6-0.0
- 8.6 beta release
- Add RT and NFV repos for x86_64
-
-* Tue Dec 28 2021 Andrew Lukoshko <alukoshko@almalinux.org> - 8.5-1.1
- Add RS repo
-
-* Thu Oct 07 2021 Andrew Lukoshko <alukoshko@almalinux.org> - 8.5-1
- 8.5 beta release
+%files -n almalinux-gpg-keys
+%{_sysconfdir}/pki/rpm-gpg

-* Thu Jul 29 2021 Andrew Lukoshko <alukoshko@almalinux.org> - 8.4-3
- disable fastestmirror dnf plugin for all repos

-* Thu May 20 2021 Andrew Lukoshko <alukoshko@almalinux.org> - 8.4-2
- 8.4 stable release
- Disable PowerTools repo by default and move it to separate file
+%changelog
+* Fri Oct 07 2022 Andrew Lukoshko <alukoshko@almalinux.org> - 9.1-1.8
+- 9.1 beta

-* Fri Apr 16 2021 Andrew Lukoshko <alukoshko@almalinux.org> - 8.4-1
- 8.4 beta release
+* Wed Jun 22 2022 Andrew Lukoshko <alukoshko@almalinux.org> - 9.0-4
+- Fix AlmaLinux version in EULA

-* Wed Mar 24 2021 Andrei Lukoshko <alukoshko@almalinux.org> - 8.3-4
- 8.3 stable release
+* Mon May 23 2022 Andrew Lukoshko <alukoshko@almalinux.org> - 9.0-3
+- 9.0 stable
+- Split repo files
+- Add SAP and SAPHANA repos

-* Wed Feb 10 2021 Andrei Lukoshko <alukoshko@cloudlinux.com> - 8.3-3
- Switch repos to mirrorlists and enable fastestmirror plugin
- Use full release version for ALMALINUX_MANTISBT_PROJECT_VERSION
- Add HighAvailability repo
+* Thu Apr 21 2022 Andrew Lukoshko <alukoshko@almalinux.org> - 9.0-2
+- Update repo URLs
+- Remove centos-stream-release from provides

-* Wed Jan 27 2021 Anatholy Scryabin <ascryabin@cloudlinux.com> - 8.3-2
- Initial build for AlmaLinux
+* Mon Jan 24 2022 Andrew Lukoshko <alukoshko@almalinux.org> - 9.0-1
+- Initial release for 9.0 beta
--- a/almalinux-resilientstorage.repo
+++ b/almalinux-resilientstorage.repo
@ -1,28 +1,30 @@
-# almalinux-resilientstorage.repo
-
 [resilientstorage]
-name=AlmaLinux $releasever - ResilientStorage
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/resilientstorage
-# baseurl=https://repo.almalinux.org/almalinux/$releasever/ResilientStorage/$basearch/os/
+name=AlmaLinux 9.1-beta - ResilientStorage
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.1-beta/resilientstorage
+# baseurl=https://repo.almalinux.org/almalinux/9.1-beta/ResilientStorage/$basearch/os/
 enabled=0
 gpgcheck=1
 countme=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0

-## Sources
-[resilientstorage-source]
-name=AlmaLinux $releasever - ResilientStorage Source
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/resilientstorage-source
-# baseurl=https://repo.almalinux.org/vault/$releasever/ResilientStorage/Source/
+[resilientstorage-debug]
+name=AlmaLinux 9.1-beta - ResilientStorage - Debug
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.1-beta/resilientstorage-debug
+# baseurl=https://repo.almalinux.org/vault/9.1-beta/ResilientStorage/debug/$basearch/
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0

-## Debuginfo
-[resilientstorage-debuginfo]
-name=AlmaLinux $releasever - ResilientStorage debuginfo
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/resilientstorage-debuginfo
-# baseurl=https://repo.almalinux.org/vault/$releasever/ResilientStorage/debug/$basearch/
+[resilientstorage-source]
+name=AlmaLinux 9.1-beta - ResilientStorage - Source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.1-beta/resilientstorage-source
+# baseurl=https://repo.almalinux.org/vault/9.1-beta/ResilientStorage/Source/
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
--- a/almalinux-rt.repo
+++ b/almalinux-rt.repo
@ -1,27 +1,30 @@
-# almalinux-rt.repo
-
 [rt]
-name=AlmaLinux $releasever - Real Time
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/rt
-# baseurl=https://repo.almalinux.org/almalinux/$releasever/RT/$basearch/os/
+name=AlmaLinux 9.1-beta - RT
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.1-beta/rt
+# baseurl=https://repo.almalinux.org/almalinux/9.1-beta/RT/$basearch/os/
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+countme=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0

-## Sources
-[rt-source]
-name=AlmaLinux $releasever - Real Time Sources
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/rt-source
-# baseurl=https://repo.almalinux.org/vault/$releasever/RT/Source/
+[rt-debug]
+name=AlmaLinux 9.1-beta - RT - Debug
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.1-beta/rt-debug
+# baseurl=https://repo.almalinux.org/vault/9.1-beta/RT/debug/$basearch/
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0

-## Debuginfo
-[rt-debuginfo]
-name=AlmaLinux $releasever - Real Time Debuginfo
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/rt-debuginfo
-# baseurl=https://repo.almalinux.org/vault/$releasever/RT/debug/$basearch/
+[rt-source]
+name=AlmaLinux 9.1-beta - RT - Source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.1-beta/rt-source
+# baseurl=https://repo.almalinux.org/vault/9.1-beta/RT/Source/
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
--- a/almalinux-sap.repo
+++ b/almalinux-sap.repo
@ -1,28 +1,30 @@
-# 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/
+name=AlmaLinux 9.1-beta - SAP
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.1-beta/sap
+# baseurl=https://repo.almalinux.org/almalinux/9.1-beta/SAP/$basearch/os/
 enabled=0
 gpgcheck=1
 countme=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0

-## 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/
+[sap-debug]
+name=AlmaLinux 9.1-beta - SAP - Debug
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.1-beta/sap-debug
+# baseurl=https://repo.almalinux.org/vault/9.1-beta/SAP/debug/$basearch/
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0

-## 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/
+[sap-source]
+name=AlmaLinux 9.1-beta - SAP - Source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.1-beta/sap-source
+# baseurl=https://repo.almalinux.org/vault/9.1-beta/SAP/Source/
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
--- a/almalinux-saphana.repo
+++ b/almalinux-saphana.repo
@ -1,28 +1,30 @@
-# 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/
+name=AlmaLinux 9.1-beta - SAPHANA
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.1-beta/saphana
+# baseurl=https://repo.almalinux.org/almalinux/9.1-beta/SAPHANA/$basearch/os/
 enabled=0
 gpgcheck=1
 countme=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0

-## 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/
+[saphana-debug]
+name=AlmaLinux 9.1-beta - SAPHANA - Debug
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.1-beta/saphana-debug
+# baseurl=https://repo.almalinux.org/vault/9.1-beta/SAPHANA/debug/$basearch/
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0

-## 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/
+[saphana-source]
+name=AlmaLinux 9.1-beta - SAPHANA - Source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.1-beta/saphana-source
+# baseurl=https://repo.almalinux.org/vault/9.1-beta/SAPHANA/Source/
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
--- a/almalinux.repo
+++ b/almalinux.repo
@ -1,78 +0,0 @@
-# almalinux.repo
-
-[baseos]
-name=AlmaLinux $releasever - BaseOS
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/baseos
-# baseurl=https://repo.almalinux.org/almalinux/$releasever/BaseOS/$basearch/os/
-enabled=1
-gpgcheck=1
-countme=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
-
-[appstream]
-name=AlmaLinux $releasever - AppStream
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/appstream
-# baseurl=https://repo.almalinux.org/almalinux/$releasever/AppStream/$basearch/os/
-enabled=1
-gpgcheck=1
-countme=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
-
-[extras]
-name=AlmaLinux $releasever - Extras
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/extras
-# baseurl=https://repo.almalinux.org/almalinux/$releasever/extras/$basearch/os/
-enabled=1
-gpgcheck=1
-countme=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
-
-## Sources
-[baseos-source]
-name=AlmaLinux $releasever - BaseOS Source
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/baseos-source
-# baseurl=https://repo.almalinux.org/vault/$releasever/BaseOS/Source/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
-
-[appstream-source]
-name=AlmaLinux $releasever - AppStream Source
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/appstream-source
-# baseurl=https://repo.almalinux.org/vault/$releasever/AppStream/Source/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
-
-[extras-source]
-name=AlmaLinux $releasever - Extras Source
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/extras-source
-# baseurl=https://repo.almalinux.org/vault/$releasever/extras/Source/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
-
-## Debuginfo
-[baseos-debuginfo]
-name=AlmaLinux $releasever - BaseOS debuginfo
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/baseos-debuginfo
-# baseurl=https://repo.almalinux.org/vault/$releasever/BaseOS/debug/$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
-
-[appstream-debuginfo]
-name=AlmaLinux $releasever - AppStream debuginfo
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/appstream-debuginfo
-# baseurl=https://repo.almalinux.org/vault/$releasever/AppStream/debug/$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
-
-[extras-debuginfo]
-name=AlmaLinux $releasever - Extras debuginfo
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/extras-debuginfo
-# baseurl=https://repo.almalinux.org/vault/$releasever/extras/debug/$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
--- a/alsecureboot001.cer
+++ b/alsecureboot001.cer
--- a/0
+++ b/0