From 039f0e1cf82798df6b5d85a2ff3c1e8b16e08ffd Mon Sep 17 00:00:00 2001
From: nazunalika <tucklesepk@gmail.com>
Date: Wed, 28 Apr 2021 18:44:13 -0700
Subject: [PATCH] update release and repo url's

---
 SOURCES/Rocky-AppStream.repo         | 2 +-
 SOURCES/Rocky-BaseOS.repo            | 2 +-
 SOURCES/Rocky-ContinuousRelease.repo | 2 +-
 SOURCES/Rocky-Debuginfo.repo         | 2 +-
 SOURCES/Rocky-Devel.repo             | 2 +-
 SOURCES/Rocky-Extras.repo            | 2 +-
 SOURCES/Rocky-FastTrack.repo         | 2 +-
 SOURCES/Rocky-HighAvailability.repo  | 2 +-
 SOURCES/Rocky-Plus.repo              | 2 +-
 SOURCES/Rocky-PowerTools.repo        | 2 +-
 SOURCES/Rocky-ResilientStorage.repo  | 2 +-
 SOURCES/Rocky-Sources.repo           | 8 ++++----
 SPECS/rocky-release.spec             | 8 ++++++--
 13 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/SOURCES/Rocky-AppStream.repo b/SOURCES/Rocky-AppStream.repo
index e405722..17d0355 100644
--- a/SOURCES/Rocky-AppStream.repo
+++ b/SOURCES/Rocky-AppStream.repo
@@ -11,7 +11,7 @@
 [appstream]
 name=Rocky Linux $releasever - AppStream
 mirrorlist=http://mirrorlist.rockylinux.org/?release=$releasever&arch=$basearch&repo=AppStream&infra=$infra
-#baseurl=http://mirror.rockylinux.org/$contentdir/$releasever/AppStream/$basearch/os/
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/AppStream/$basearch/os/
 gpgcheck=1
 enabled=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
diff --git a/SOURCES/Rocky-BaseOS.repo b/SOURCES/Rocky-BaseOS.repo
index 137da48..fbdf57d 100644
--- a/SOURCES/Rocky-BaseOS.repo
+++ b/SOURCES/Rocky-BaseOS.repo
@@ -11,7 +11,7 @@
 [baseos]
 name=Rocky Linux $releasever - BaseOS
 mirrorlist=http://mirrorlist.rockylinux.org/?release=$releasever&arch=$basearch&repo=BaseOS&infra=$infra
-#baseurl=http://mirror.rockylinux.org/$contentdir/$releasever/BaseOS/$basearch/os/
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/BaseOS/$basearch/os/
 gpgcheck=1
 enabled=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
diff --git a/SOURCES/Rocky-ContinuousRelease.repo b/SOURCES/Rocky-ContinuousRelease.repo
index 2605eb5..9c1948b 100644
--- a/SOURCES/Rocky-ContinuousRelease.repo
+++ b/SOURCES/Rocky-ContinuousRelease.repo
@@ -18,7 +18,7 @@
 [cr]
 name=Rocky Linux $releasever - ContinuousRelease
 mirrorlist=http://mirrorlist.rockylinux.org/?release=$releasever&arch=$basearch&repo=cr&infra=$infra
-#baseurl=http://mirror.rockylinux.org/$contentdir/$releasever/cr/$basearch/os/
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/cr/$basearch/os/
 gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
diff --git a/SOURCES/Rocky-Debuginfo.repo b/SOURCES/Rocky-Debuginfo.repo
index 42e8bd0..fb0d0c1 100644
--- a/SOURCES/Rocky-Debuginfo.repo
+++ b/SOURCES/Rocky-Debuginfo.repo
@@ -5,7 +5,7 @@
 
 [debuginfo]
 name=Rocky Linux $releasever - Debuginfo
-baseurl=http://debuginfo.rockylinux.org/$releasever/$basearch/
+baseurl=http://dl.rockylinux.org/$contentdir/debuginfo/$releasever/$basearch/
 gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
diff --git a/SOURCES/Rocky-Devel.repo b/SOURCES/Rocky-Devel.repo
index 592890c..03ba323 100644
--- a/SOURCES/Rocky-Devel.repo
+++ b/SOURCES/Rocky-Devel.repo
@@ -11,7 +11,7 @@
 [devel]
 name=Rocky Linux $releasever - Devel WARNING! FOR BUILDROOT USE ONLY!
 mirrorlist=http://mirrorlist.rockylinux.org/?release=$releasever&arch=$basearch&repo=Devel&infra=$infra
-#baseurl=http://mirror.rockylinux.org/$contentdir/$releasever/Devel/$basearch/os/
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/Devel/$basearch/os/
 gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
diff --git a/SOURCES/Rocky-Extras.repo b/SOURCES/Rocky-Extras.repo
index 43ca713..c49a847 100644
--- a/SOURCES/Rocky-Extras.repo
+++ b/SOURCES/Rocky-Extras.repo
@@ -11,7 +11,7 @@
 [extras]
 name=Rocky Linux $releasever - Extras
 mirrorlist=http://mirrorlist.rockylinux.org/?release=$releasever&arch=$basearch&repo=extras&infra=$infra
-#baseurl=http://mirror.rockylinux.org/$contentdir/$releasever/extras/$basearch/os/
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/extras/$basearch/os/
 gpgcheck=1
 enabled=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
diff --git a/SOURCES/Rocky-FastTrack.repo b/SOURCES/Rocky-FastTrack.repo
index 04ecbfb..7af2f0c 100644
--- a/SOURCES/Rocky-FastTrack.repo
+++ b/SOURCES/Rocky-FastTrack.repo
@@ -11,7 +11,7 @@
 [fasttrack]
 name=Rocky Linux $releasever - FastTrack
 mirrorlist=http://mirrorlist.rockylinux.org/?release=$releasever&arch=$basearch&repo=fasttrack&infra=$infra
-#baseurl=http://mirror.rockylinux.org/$contentdir/$releasever/fasttrack/$basearch/os/
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/fasttrack/$basearch/os/
 gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
diff --git a/SOURCES/Rocky-HighAvailability.repo b/SOURCES/Rocky-HighAvailability.repo
index 5c5898b..e4e46b4 100644
--- a/SOURCES/Rocky-HighAvailability.repo
+++ b/SOURCES/Rocky-HighAvailability.repo
@@ -11,7 +11,7 @@
 [ha]
 name=Rocky Linux $releasever - HighAvailability
 mirrorlist=http://mirrorlist.rockylinux.org/?release=$releasever&arch=$basearch&repo=HighAvailability&infra=$infra
-#baseurl=http://mirror.rockylinux.org/$contentdir/$releasever/HighAvailability/$basearch/os/
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/HighAvailability/$basearch/os/
 gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
diff --git a/SOURCES/Rocky-Plus.repo b/SOURCES/Rocky-Plus.repo
index f2c423e..5e24ddf 100644
--- a/SOURCES/Rocky-Plus.repo
+++ b/SOURCES/Rocky-Plus.repo
@@ -11,7 +11,7 @@
 [plus]
 name=Rocky Linux $releasever - Plus
 mirrorlist=http://mirrorlist.rockylinux.org/?release=$releasever&arch=$basearch&repo=rockyplus&infra=$infra
-#baseurl=http://mirror.rockylinux.org/$contentdir/$releasever/rockyplus/$basearch/os/
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/rockyplus/$basearch/os/
 gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
diff --git a/SOURCES/Rocky-PowerTools.repo b/SOURCES/Rocky-PowerTools.repo
index 2eb1aa1..0b16749 100644
--- a/SOURCES/Rocky-PowerTools.repo
+++ b/SOURCES/Rocky-PowerTools.repo
@@ -11,7 +11,7 @@
 [powertools]
 name=Rocky Linux $releasever - PowerTools
 mirrorlist=http://mirrorlist.rockylinux.org/?release=$releasever&arch=$basearch&repo=PowerTools&infra=$infra
-#baseurl=http://mirror.rockylinux.org/$contentdir/$releasever/PowerTools/$basearch/os/
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/PowerTools/$basearch/os/
 gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
diff --git a/SOURCES/Rocky-ResilientStorage.repo b/SOURCES/Rocky-ResilientStorage.repo
index a8041d3..1f90816 100644
--- a/SOURCES/Rocky-ResilientStorage.repo
+++ b/SOURCES/Rocky-ResilientStorage.repo
@@ -11,7 +11,7 @@
 [resilient-storage]
 name=Rocky Linux $releasever - ResilientStorage
 mirrorlist=http://mirrorlist.rockylinux.org/?release=$releasever&arch=$basearch&repo=ResilientStorage&infra=$infra
-#baseurl=http://mirror.rockylinux.org/$contentdir/$releasever/ResilientStorage/$basearch/os/
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/ResilientStorage/$basearch/os/
 gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
diff --git a/SOURCES/Rocky-Sources.repo b/SOURCES/Rocky-Sources.repo
index b479789..eea8ed4 100644
--- a/SOURCES/Rocky-Sources.repo
+++ b/SOURCES/Rocky-Sources.repo
@@ -3,28 +3,28 @@
 
 [baseos-source]
 name=Rocky Linux $releasever - BaseOS - Source
-baseurl=http://vault.rockylinux.org/$contentdir/$releasever/BaseOS/Source/
+baseurl=http://dl.rockylinux.org/$contentdir/sources/$releasever/BaseOS/Source/
 gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
 
 [appstream-source]
 name=Rocky Linux $releasever - AppStream - Source
-baseurl=http://vault.rockylinux.org/$contentdir/$releasever/AppStream/Source/
+baseurl=http://dl.rockylinux.org/$contentdir/sources/$releasever/AppStream/Source/
 gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
 
 [extras-source]
 name=Rocky Linux $releasever - Extras - Source
-baseurl=http://vault.rockylinux.org/$contentdir/$releasever/extras/Source/
+baseurl=http://dl.rockylinux.org/$contentdir/sources/$releasever/extras/Source/
 gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
 
 [plus-source]
 name=Rocky Linux $releasever - Plus - Source
-baseurl=http://vault.rockylinux.org/$contentdir/$releasever/rockyplus/Source/
+baseurl=http://dl.rockylinux.org/$contentdir/sources/$releasever/rockyplus/Source/
 gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
diff --git a/SPECS/rocky-release.spec b/SPECS/rocky-release.spec
index 3a250b4..a705f2a 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 9
+%define rocky_rel 10
 %define upstream_rel %{major}.%{minor}
 
 %define base_release_version %{major}
@@ -184,7 +184,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 "rocky" > %{buildroot}%{_sysconfdir}/dnf/vars/contentdir
+echo "pub/rocky/linux" > %{buildroot}%{_sysconfdir}/dnf/vars/contentdir
 
 # Copy out GPG keys
 install -d -m 0755 %{buildroot}%{_sysconfdir}/pki/rpm-gpg
@@ -230,6 +230,10 @@ install -p -m 0644 %{SOURCE1223} %{buildroot}%{_sysconfdir}/yum.repos.d/
 %{_sysconfdir}/pki/rpm-gpg/
 
 %changelog
+* Wed Apr 28 2021 Louis Abel <label@rockylinux.org> - 8.3-10
+- Fix repo URL's where needed
+- Change contentdir var
+
 * Sun Apr 25 2021 Louis Abel <label@rockylinux.org> - 8.3-9
 - Remove and add os-release references