import imports/r9/rocky-release-9.0-1.21.el9

SOURCES/Contributors

@@ -30,6 +30,7 @@ a chance. Thank you.
   @alangm
   @lumarel
   Al Bowles (@raktajino)
+  Peter Ajamian (@pj)
 
 # Rocky Linux Teams and Operations #
 
@@ -58,6 +59,7 @@ Release Engineering/Core:
 Security:
   Rob Felsburg
   Benjamin Agner
+  Scott Shinn
 
 Documentation:
   Wale Soyinka

SOURCES/rocky-devel.repo

@@ -3,8 +3,8 @@
 # devel and no-package-left-behind
 
 [devel]
-name=Rocky Linux $releasever - Devel WARNING! FOR BUILDROOT ONLY
-#mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=Devel-$releasever&rltype=$rltype
+name=Rocky Linux $releasever - Devel WARNING! FOR BUILDROOT ONLY DO NOT LEAVE ENABLED
+#mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=devel-$releasever&rltype=$rltype
 baseurl=http://dl.rockylinux.org/$contentdir/$releasever/devel/$basearch/os/
 gpgcheck=1
 enabled=0
@@ -12,12 +12,3 @@ countme=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
        file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9-Testing
 
-[nplb]
-name=Rocky Linux $releasever - NPLB - WARNING! DO NOT LEAVE PERMANENTLY ENABLED
-#mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=nplb-$releasever&rltype=$rltype
-baseurl=http://dl.rockylinux.org/$contentdir/$releasever/nplb/$basearch/os/
-gpgcheck=1
-enabled=0
-countme=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9-Testing

SPECS/rocky-release.spec

@@ -20,7 +20,7 @@
 %define distro_code  Blue Onyx
 %define major        9
 %define minor        0
-%define rocky_rel    1%{?rllh:.%{rllh}}%{!?rllh:.18}
+%define rocky_rel    1%{?rllh:.%{rllh}}%{!?rllh:.21}
 %define rpm_license  BSD-3-Clause
 %define dist         .el%{major}
 
@@ -275,7 +275,7 @@ install -d -m 0755 %{buildroot}%{_prefix}/lib/systemd/user-preset/
 
 install -m 0644 %{SOURCE300} %{buildroot}/%{_prefix}/lib/systemd/system-preset/
 install -m 0644 %{SOURCE301} %{buildroot}/%{_prefix}/lib/systemd/system-preset/
-install -m 0644 %{SOURCE302} %{buildroot}/%{_prefix}/lib/systemd/system-preset/
+install -m 0644 %{SOURCE302} %{buildroot}/%{_prefix}/lib/systemd/user-preset/
 
 # same behavior for both presets
 install -m 0644 %{SOURCE303} %{buildroot}/%{_prefix}/lib/systemd/system-preset/
@@ -364,7 +364,8 @@ install -p -m 0644 %{SOURCE102} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/
 %if %{with rllookahead}
 install -m 0644 %{SOURCE400} %{buildroot}/%{_prefix}/lib/systemd/system-preset/85-display-manager.preset
 install -m 0644 %{SOURCE401} %{buildroot}/%{_prefix}/lib/systemd/system-preset/90-default.preset
-install -m 0644 %{SOURCE402} %{buildroot}/%{_prefix}/lib/systemd/system-preset/90-default-user.preset
+install -m 0644 %{SOURCE402} %{buildroot}/%{_prefix}/lib/systemd/user-preset/90-default-user.preset
+
 install -m 0644 %{SOURCE403} %{buildroot}/%{_prefix}/lib/systemd/system-preset/99-default-disable.preset
 install -m 0644 %{SOURCE403} %{buildroot}/%{_prefix}/lib/systemd/user-preset/99-default-disable.preset
 install -m 0644 %{SOURCE404} %{buildroot}/%{_prefix}/lib/sysctl.d/50-redhat.conf
@@ -415,7 +416,7 @@ install -m 0644 %{SOURCE404} %{buildroot}/%{_prefix}/lib/sysctl.d/50-redhat.conf
 %{_datadir}/pki/sb-certs/*
 
 %changelog
-* Sun May 01 2022 Louis Abel <label@rockylinux.org> - 9.0-1.18
+* Sun Jun 12 2022 Louis Abel <label@rockylinux.org> - 9.0-1.21
 - Backport current SB certs for now
 - Add logrotate timer and switcheroo
 - Add missing macros
@@ -429,6 +430,7 @@ install -m 0644 %{SOURCE404} %{buildroot}/%{_prefix}/lib/sysctl.d/50-redhat.conf
 - List both GPG keys in repo files
 - Fix rlpkg macro for gpg keys
 - Add sig content dir
+- Remove nplb as devel is technically it
 
 * Mon Jan 10 2022 Louis Abel <label@rockylinux.org> - 9.0-1.1
 - Add LOGO to /etc/os-release