fix

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

@@ -7,4 +7,5 @@ enable lightdm.service
 enable slim.service
 enable lxdm.service
 enable kdm.service
+enable sddm.service
 enable xdm.service

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

SOURCES/Rocky-AppStream.repo

@@ -14,4 +14,5 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=AppStre
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/AppStream/$basearch/os/
 gpgcheck=1
 enabled=1
+countme=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial

SOURCES/Rocky-BaseOS.repo

@@ -14,4 +14,5 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=BaseOS-
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/BaseOS/$basearch/os/
 gpgcheck=1
 enabled=1
+countme=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial

SOURCES/Rocky-Devel.repo

@@ -7,4 +7,5 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=Devel-$
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/Devel/$basearch/os/
 gpgcheck=1
 enabled=0
+countme=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial

SOURCES/Rocky-Extras.repo

@@ -14,4 +14,5 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=extras-
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/extras/$basearch/os/
 gpgcheck=1
 enabled=1
+countme=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial

SOURCES/Rocky-HighAvailability.repo

@@ -14,4 +14,5 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=HighAva
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/HighAvailability/$basearch/os/
 gpgcheck=1
 enabled=0
+countme=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial

SOURCES/Rocky-NFV.repo

@@ -14,4 +14,5 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=NFV-$re
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/nfv/$basearch/os/
 gpgcheck=1
 enabled=0
+countme=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial

SOURCES/Rocky-Plus.repo

@@ -14,4 +14,5 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=rockypl
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/plus/$basearch/os/
 gpgcheck=1
 enabled=0
+countme=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial

SOURCES/Rocky-PowerTools.repo

@@ -14,4 +14,5 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=PowerTo
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/PowerTools/$basearch/os/
 gpgcheck=1
 enabled=0
+countme=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial

SOURCES/Rocky-RT.repo

@@ -14,4 +14,5 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=RT-$rel
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/RT/$basearch/os/
 gpgcheck=1
 enabled=0
+countme=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial

SOURCES/Rocky-ResilientStorage.repo

@@ -14,4 +14,5 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=Resilie
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/ResilientStorage/$basearch/os/
 gpgcheck=1
 enabled=0
+countme=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial

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   6
+%define rocky_rel 3
 %define upstream_rel %{major}.%{minor}
 %define rpm_license  BSD-3-Clause
 
@@ -138,18 +138,20 @@ VERSION_ID="%{major}.%{minor}"
 PLATFORM_ID="platform:el%{major}"
 PRETTY_NAME="%{distro_name} %{major}.%{minor} (%{distro_code})"
 ANSI_COLOR="0;32"
-CPE_NAME="cpe:/o:rocky:rocky:%{major}.%{minor}:GA"
+CPE_NAME="cpe:/o:rocky:rocky:%{base_release_version}:GA"
 HOME_URL="https://rockylinux.org/"
 BUG_REPORT_URL="https://bugs.rockylinux.org/"
 ROCKY_SUPPORT_PRODUCT="%{distro_name}"
 ROCKY_SUPPORT_PRODUCT_VERSION="%{major}"
+REDHAT_SUPPORT_PRODUCT="%{distro_name}"
+REDHAT_SUPPORT_PRODUCT_VERSION="%{major}"
 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:rocky:rocky:%{major}.%{minor}:GA" > %{buildroot}%{_sysconfdir}/system-release-cpe
+echo "cpe:/o:rocky:rocky:%{base_release_version}:GA" > %{buildroot}%{_sysconfdir}/system-release-cpe
 
 # create /etc/issue and /etc/issue.net
 echo '\S' > %{buildroot}%{_sysconfdir}/issue
@@ -162,12 +164,13 @@ install -d -m 0755 %{buildroot}%{_sysconfdir}/rpm
 cat > %{buildroot}%{_sysconfdir}/rpm/macros.dist << EOF
 # dist macros.
 
+%%__bootstrap ~bootstrap
 %%rocky_ver %{major}
 %%rocky %{major}
 %%centos_ver %{major}
 %%centos %{major}
 %%rhel %{major}
-%%dist .el%{major}
+%%dist %%{!?distprefix0:%%{?distprefix}}%%{expand:%%{lua:for i=0,9999 do print("%%{?distprefix" .. i .."}") end}}.el%{major}%%{?with_bootstrap:%{__bootstrap}}
 %%el%{major} 1
 EOF
 
@@ -185,6 +188,7 @@ install -m 0644 %{SOURCE302} %{buildroot}/%{_prefix}/lib/systemd/system-preset/
 # dnf stuff
 install -d -m 0755 %{buildroot}%{_sysconfdir}/dnf/vars
 echo "pub/rocky" > %{buildroot}%{_sysconfdir}/dnf/vars/contentdir
+echo "pub/sig" > %{buildroot}%{_sysconfdir}/dnf/vars/sigcontentdir
 
 # Copy out GPG keys
 install -d -m 0755 %{buildroot}%{_sysconfdir}/pki/rpm-gpg
@@ -230,11 +234,31 @@ install -p -m 0644 %{SOURCE1226} %{buildroot}%{_sysconfdir}/yum.repos.d/
 %license LICENSE
 %config(noreplace) %{_sysconfdir}/yum.repos.d/Rocky-*.repo
 %config(noreplace) %{_sysconfdir}/dnf/vars/contentdir
+%config(noreplace) %{_sysconfdir}/dnf/vars/sigcontentdir
 
 %files -n rocky-gpg-keys
 %{_sysconfdir}/pki/rpm-gpg/
 
 %changelog
+* Fri May 20 2022 Louis Abel <label@rockylinux.org> - 8.6-3
+- Add pub/sig var for dnf
+
+* Tue Mar 29 2022 Louis Abel <label@rockylinux.org> - 8.6-2
+- 8.6 prepatory release
+- Add REDHAT_SUPPORT_PRODUCT to /etc/os-release
+
+* Mon Feb 14 2022 Louis Abel <label@rockylinux.org> - 8.5-4
+- Add bootstrap to macros to match EL9
+
+* Tue Dec 21 2021 Louis Abel <label@rockylinux.org> - 8.5-3
+- Add countme=1 to base repositories
+
+* Sat Dec 11 2021 Louis Abel <label@rockylinux.org> - 8.5-2
+- Fix CPE to match upstreamed Rocky data
+
+* 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