From dcad83336cb158d9f0454beaaa29cb0a8d0a0318 Mon Sep 17 00:00:00 2001
From: nazunalika <tucklesepk@gmail.com>
Date: Sat, 1 May 2021 09:44:14 -0700
Subject: [PATCH] add resilient storage as a variant
---
SPECS/rocky-release.spec | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/SPECS/rocky-release.spec b/SPECS/rocky-release.spec
index 6c7cd9a..0710373 100644
--- a/SPECS/rocky-release.spec
+++ b/SPECS/rocky-release.spec
@@ -9,7 +9,7 @@
%define distro Rocky Linux
%define major 8
%define minor 3
-%define rocky_rel 11
+%define rocky_rel 12
%define upstream_rel %{major}.%{minor}
%define base_release_version %{major}
@@ -69,7 +69,7 @@ Source1203: Rocky-Extras.repo
# Rocky Add-ons
Source1210: Rocky-HighAvailability.repo
-#Source1211: Rocky-ResilientStorage.repo
+Source1211: Rocky-ResilientStorage.repo
# Rocky Special Stuff
Source1220: Rocky-Media.repo
@@ -183,7 +183,7 @@ install -m 0644 %{SOURCE302} %{buildroot}/%{_prefix}/lib/systemd/system-preset/
# dnf stuff
install -d -m 0755 %{buildroot}%{_sysconfdir}/dnf/vars
echo "stock" > %{buildroot}%{_sysconfdir}/dnf/vars/infra
-echo "pub/rocky/linux" > %{buildroot}%{_sysconfdir}/dnf/vars/contentdir
+echo "pub/rocky" > %{buildroot}%{_sysconfdir}/dnf/vars/contentdir
# Copy out GPG keys
install -d -m 0755 %{buildroot}%{_sysconfdir}/pki/rpm-gpg
@@ -197,6 +197,7 @@ install -p -m 0644 %{SOURCE1201} %{buildroot}%{_sysconfdir}/yum.repos.d/
install -p -m 0644 %{SOURCE1202} %{buildroot}%{_sysconfdir}/yum.repos.d/
install -p -m 0644 %{SOURCE1203} %{buildroot}%{_sysconfdir}/yum.repos.d/
install -p -m 0644 %{SOURCE1210} %{buildroot}%{_sysconfdir}/yum.repos.d/
+install -p -m 0644 %{SOURCE1211} %{buildroot}%{_sysconfdir}/yum.repos.d/
install -p -m 0644 %{SOURCE1220} %{buildroot}%{_sysconfdir}/yum.repos.d/
install -p -m 0644 %{SOURCE1222} %{buildroot}%{_sysconfdir}/yum.repos.d/
install -p -m 0644 %{SOURCE1223} %{buildroot}%{_sysconfdir}/yum.repos.d/
@@ -228,6 +229,10 @@ install -p -m 0644 %{SOURCE1223} %{buildroot}%{_sysconfdir}/yum.repos.d/
%{_sysconfdir}/pki/rpm-gpg/
%changelog
+* Sat May 01 2021 Louis Abel <label@rockylinux.org> - 8.3-12
+- Add resilient storage varient
+- Fix vars
+
* Wed Apr 28 2021 Louis Abel <label@rockylinux.org> - 8.3-11
- Fix repo URL's where needed
- Change contentdir var
--
GitLab