From 1d0d3c34af1e17dd1ee2aa90bb95d9d9231943a4 Mon Sep 17 00:00:00 2001
From: Andrew Lukoshko <andrew.lukoshko@gmail.com>
Date: Mon, 7 Nov 2022 14:31:12 +0100
Subject: [PATCH] 8.7 stable release

---
 90-default.preset      |  3 +++
 almalinux-release.spec | 29 ++++++++++++++++++++---------
 almalinux-sap.repo     | 28 ++++++++++++++++++++++++++++
 almalinux-saphana.repo | 28 ++++++++++++++++++++++++++++
 4 files changed, 79 insertions(+), 9 deletions(-)
 create mode 100644 almalinux-sap.repo
 create mode 100644 almalinux-saphana.repo

diff --git a/90-default.preset b/90-default.preset
index d242391..7b67ab3 100644
--- a/90-default.preset
+++ b/90-default.preset
@@ -194,3 +194,6 @@ 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=2106814
+enable clevis-luks-askpass.path
diff --git a/almalinux-release.spec b/almalinux-release.spec
index 1d433f0..7d19437 100644
--- a/almalinux-release.spec
+++ b/almalinux-release.spec
@@ -1,14 +1,14 @@
 %define debug_package %{nil}
 %define product_family AlmaLinux
-%define release_name Sky Tiger
+%define release_name Stone Smilodon
 %define contentdir almalinux
 %define infra_var stock
 %define base_release_version 8
-%define full_release_version 8.6
+%define full_release_version 8.7
 %define dist_release_version 8
-%define upstream_rel_long 8.6-0.1
-%define upstream_rel 8.6
-%define almalinux_rel 2
+%define upstream_rel_long 8.7-0.3
+%define upstream_rel 8.7
+%define almalinux_rel 1
 %define dist .el%{dist_release_version}
 
 # The anaconda scripts in %%{_libexecdir} can create false requirements
@@ -49,9 +49,12 @@ 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
-Source305:      almalinux-rt.repo
-Source306:      almalinux-nfv.repo
+Source310:      almalinux-rt.repo
+Source311:      almalinux-nfv.repo
 
 %description
 %{product_family} release files
@@ -121,11 +124,13 @@ 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 %{SOURCE305} %{buildroot}/etc/yum.repos.d
-install -m 644 %{SOURCE306} %{buildroot}/etc/yum.repos.d
+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
@@ -181,6 +186,8 @@ rm -rf %{buildroot}
 %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
@@ -198,6 +205,10 @@ rm -rf %{buildroot}
 %{_prefix}/lib/systemd/system-preset/*
 
 %changelog
+* 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
 
diff --git a/almalinux-sap.repo b/almalinux-sap.repo
new file mode 100644
index 0000000..ba71bff
--- /dev/null
+++ b/almalinux-sap.repo
@@ -0,0 +1,28 @@
+# 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
diff --git a/almalinux-saphana.repo b/almalinux-saphana.repo
new file mode 100644
index 0000000..f1616ad
--- /dev/null
+++ b/almalinux-saphana.repo
@@ -0,0 +1,28 @@
+# 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