From dadf44424ce3215563875be60b87cc6a55cc146c Mon Sep 17 00:00:00 2001
From: nazunalika <tucklesepk@gmail.com>
Date: Tue, 5 Oct 2021 01:01:18 -0700
Subject: [PATCH] 8.5 Prepatory Commit

This commit is specifically to be ready for the 8.5 release. As such,
these are the changes made:

* The default preset has renames and a large amount of additions to
  be in line with RHEL upstream
* Spec file reflects 8.5 - This means there should be no more changes
  to the release package during 8.4
* In addition, the sddm display manager has been added to the display
  manager preset

As a reminder, this branch should no longer accept changes for 8.4 for
the month of October.
---
 SOURCES/85-display-manager.preset |  1 +
 SOURCES/90-default.preset         | 40 +++++++++++++++++++++++++++++--
 SPECS/rocky-release.spec          |  7 ++++--
 3 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/SOURCES/85-display-manager.preset b/SOURCES/85-display-manager.preset
index c1d3069..999823d 100644
--- a/SOURCES/85-display-manager.preset
+++ b/SOURCES/85-display-manager.preset
@@ -7,4 +7,5 @@ enable lightdm.service
 enable slim.service
 enable lxdm.service
 enable kdm.service
+enable sddm.service
 enable xdm.service
diff --git a/SOURCES/90-default.preset b/SOURCES/90-default.preset
index ec83002..d242391 100644
--- a/SOURCES/90-default.preset
+++ b/SOURCES/90-default.preset
@@ -93,7 +93,7 @@ enable rngd.service
 
 # Other stuff
 enable abrtd.service
-enable abrt-ccpp.service
+enable abrt-journal-core.service
 enable abrt-oops.service
 enable abrt-xorg.service
 enable abrt-vmcore.service
@@ -114,7 +114,6 @@ enable accounts-daemon.service
 enable rtkit-daemon.service
 enable upower.service
 enable udisks2.service
-enable polkit.service
 enable packagekit-offline-update.service
 enable PackageKit.service
 
@@ -158,3 +157,40 @@ enable device_cio_free.service
 # Enable the stratis daemon for managing stratis storage
 # https://bugzilla.redhat.com/show_bug.cgi?id=1632510
 enable stratisd.service
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1817591
+enable mlocate-updatedb.timer
+
+# nvme auto connect
+# 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
+enable greenboot-grub2-set-counter.service
+enable greenboot-grub2-set-success.service
+enable greenboot-healthcheck.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
+
+# 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
+
+# enable nfs-client.target
+# https://bugzilla.redhat.com/show_bug.cgi?id=1967515
+enable nfs-client.target
diff --git a/SPECS/rocky-release.spec b/SPECS/rocky-release.spec
index 17b936f..9943d8d 100644
--- a/SPECS/rocky-release.spec
+++ b/SPECS/rocky-release.spec
@@ -9,8 +9,8 @@
 %define distro_name  Rocky Linux
 %define distro_code  Green Obsidian
 %define major   8
-%define minor   4
-%define rocky_rel 35
+%define minor   5
+%define rocky_rel 1
 %define upstream_rel %{major}.%{minor}
 %define rpm_license  BSD-3-Clause
 
@@ -235,6 +235,9 @@ install -p -m 0644 %{SOURCE1226} %{buildroot}%{_sysconfdir}/yum.repos.d/
 %{_sysconfdir}/pki/rpm-gpg/
 
 %changelog
+* Tue Oct 05 2021 Louis Abel <label@rockylinux.org> - 8.5-1
+- 8.5 prepatory release
+
 * Mon Sep 13 2021 Louis Abel <label@rockylinux.org> - 8.4-35
 - Add missing CentOS provides and symlinks
 - Add centos macros for some builds to complete successfully without relying