From 9581cac21b33909250489641585480377637d4a4 Mon Sep 17 00:00:00 2001
From: nazunalika <tucklesepk@gmail.com>
Date: Sat, 6 Mar 2021 19:02:59 -0700
Subject: [PATCH] koji changes

---
 container.conf        | 4 ++--
 extras.conf           | 2 +-
 plus.conf             | 2 +-
 r8-armhfp.conf        | 6 +++---
 r8-cloud.conf         | 4 ++--
 r8-devel.conf         | 2 +-
 r8-developmental.conf | 4 ++--
 r8.conf               | 8 ++++----
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/container.conf b/container.conf
index 9c8846a..c6a0591 100644
--- a/container.conf
+++ b/container.conf
@@ -21,7 +21,7 @@ pkgset_source = "koji"
 koji_profile = "mbox"
 
 # PKGSET - KOJI
-pkgset_koji_tag = "dist-r8-compose"
+pkgset_koji_tag = "dist-rocky8-compose"
 pkgset_koji_inherit = False
 pkgset_koji_module_tag = "modular-updates-candidate"
 
@@ -43,7 +43,7 @@ createrepo_checksum = "sha256"
 createrepo_use_xz = True
 createrepo_num_threads = 8
 createrepo_num_workers = 4
-createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky 8', '--revision=8.0']
+createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.0']
 
 # CHECKSUMS
 media_checksums = ['sha256']
diff --git a/extras.conf b/extras.conf
index 5a6785f..c3bf5a7 100644
--- a/extras.conf
+++ b/extras.conf
@@ -9,7 +9,7 @@ create_jigdo = False
 
 pkgset_source='koji'
 
-pkgset_koji_tag='dist-r8-extras-compose'
+pkgset_koji_tag='dist-rocky8-extras-compose'
 gather_method = {
     '^.*': {                # For all variants
         'comps': 'deps',    # resolve dependencies for packages from comps file
diff --git a/plus.conf b/plus.conf
index 974d940..5925a85 100644
--- a/plus.conf
+++ b/plus.conf
@@ -9,7 +9,7 @@ create_jigdo = False
 
 pkgset_source='koji'
 
-pkgset_koji_tag='dist-r8-plus'
+pkgset_koji_tag='dist-rocky8-plus'
 gather_method = {
     '^.*': {                # For all variants
         'comps': 'deps',    # resolve dependencies for packages from comps file
diff --git a/r8-armhfp.conf b/r8-armhfp.conf
index 9718101..0cdf7e9 100644
--- a/r8-armhfp.conf
+++ b/r8-armhfp.conf
@@ -36,7 +36,7 @@ tree_arches = ['armhfp']
 
 # RUNROOT SETTINGS
 runroot_channel = 'image'
-runroot_tag = 'dist-r8-build'
+runroot_tag = 'dist-rocky8-build'
 runroot_method = 'koji'
 
 # PKGSET
@@ -44,7 +44,7 @@ pkgset_source = "koji"
 koji_profile = "armhfp-mbox"
 
 # PKGSET - KOJI
-pkgset_koji_tag = "dist-r8-compose"
+pkgset_koji_tag = "dist-rocky8-compose"
 pkgset_koji_inherit = False
 pkgset_koji_module_tag = "modular-updates-candidate"
 
@@ -73,7 +73,7 @@ createrepo_checksum = "sha256"
 createrepo_use_xz = True
 createrepo_num_threads = 8
 createrepo_num_workers = 4
-createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky 8', '--revision=8.1']
+createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.1']
 
 # CHECKSUMS
 media_checksums = ['sha256']
diff --git a/r8-cloud.conf b/r8-cloud.conf
index 751a7eb..f08b757 100644
--- a/r8-cloud.conf
+++ b/r8-cloud.conf
@@ -22,7 +22,7 @@ pkgset_source = "koji"
 koji_profile = "mbox"
 
 # PKGSET - KOJI
-pkgset_koji_tag = "dist-r8-compose"
+pkgset_koji_tag = "dist-rocky8-compose"
 pkgset_koji_inherit = False
 pkgset_koji_module_tag = "modular-updates-candidate"
 
@@ -42,7 +42,7 @@ createrepo_checksum = "sha256"
 createrepo_use_xz = True
 createrepo_num_threads = 8
 createrepo_num_workers = 4
-createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky 8', '--revision=8.0']
+createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.0']
 
 # CHECKSUMS
 media_checksums = ['sha256']
diff --git a/r8-devel.conf b/r8-devel.conf
index 064bfbf..03b8353 100644
--- a/r8-devel.conf
+++ b/r8-devel.conf
@@ -45,7 +45,7 @@ pkgset_source = "koji"
 koji_profile = "mbox"
 
 # PKGSET - KOJI
-pkgset_koji_tag = "dist-r8-compose"
+pkgset_koji_tag = "dist-rocky8-compose"
 pkgset_koji_inherit = False
 pkgset_koji_module_tag = "modular-updates-candidate"
 
diff --git a/r8-developmental.conf b/r8-developmental.conf
index 64225b0..ad580a5 100644
--- a/r8-developmental.conf
+++ b/r8-developmental.conf
@@ -22,7 +22,7 @@ sigkeys = ['6D745A60']
 
 # RUNROOT SETTINGS
 runroot_channel = 'image'
-runroot_tag = 'dist-r8-build'
+runroot_tag = 'dist-rocky8-build'
 runroot_method = 'koji'
 
 # PKGSET
@@ -30,7 +30,7 @@ pkgset_source = "koji"
 koji_profile = "mbox"
 
 # PKGSET - KOJI
-pkgset_koji_tag = "dist-r8-compose"
+pkgset_koji_tag = "dist-rocky8-compose"
 pkgset_koji_inherit = False
 pkgset_koji_module_tag = "modular-updates-candidate"
 
diff --git a/r8.conf b/r8.conf
index 5632753..43179db 100644
--- a/r8.conf
+++ b/r8.conf
@@ -39,7 +39,7 @@ tree_arches = ['aarch64', 'i386', 'x86_64']
 
 # RUNROOT SETTINGS
 runroot_channel = 'image'
-runroot_tag = 'dist-r8-build'
+runroot_tag = 'dist-rocky8-build'
 runroot_method = 'koji'
 
 # PKGSET
@@ -47,9 +47,9 @@ pkgset_source = "koji"
 koji_profile = "mbox"
 
 # PKGSET - KOJI
-pkgset_koji_tag = "dist-r8-compose"
+pkgset_koji_tag = "dist-rocky8-compose"
 pkgset_koji_inherit = False
-pkgset_koji_module_tag = "dist-r8-module-compose"
+pkgset_koji_module_tag = "dist-rocky8-module-compose"
 pkgset_allow_reuse = False
 
 filter_system_release_packages = False
@@ -77,7 +77,7 @@ createrepo_checksum = "sha256"
 createrepo_use_xz = True
 createrepo_num_threads = 8
 createrepo_num_workers = 4
-createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky 8', '--revision=8.3']
+createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.3']
 
 # CHECKSUMS
 media_checksums = ['sha256']