From dbff4805bb10e5bfa18c2cd138c49cb07d23c052 Mon Sep 17 00:00:00 2001
From: Michael E Brown <michael_e_brown@dell.com>
Date: Fri, 6 Jul 2007 15:25:23 -0500
Subject: change default to groupinstall buildsys-build per new default. Update
 legacy configs to specify old buildsys-build rpm install since they dont have
 the new group.

---
 etc/fedora-4-i386-epel.cfg   | 1 +
 etc/fedora-4-ppc-epel.cfg    | 1 +
 etc/fedora-4-x86_64-epel.cfg | 1 +
 etc/fedora-5-i386-epel.cfg   | 1 +
 etc/fedora-5-ppc-epel.cfg    | 1 +
 etc/fedora-5-x86_64-epel.cfg | 1 +
 etc/fedora-6-i386-core.cfg   | 1 +
 etc/fedora-6-ppc-core.cfg    | 1 +
 etc/fedora-6-x86_64-core.cfg | 1 +
 etc/fedora-7-i386.cfg        | 1 +
 etc/fedora-7-ppc.cfg         | 1 +
 etc/fedora-7-ppc64.cfg       | 1 +
 etc/fedora-7-x86_64.cfg      | 1 +
 mock.py                      | 2 +-
 14 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/etc/fedora-4-i386-epel.cfg b/etc/fedora-4-i386-epel.cfg
index 398acc3..516abea 100644
--- a/etc/fedora-4-i386-epel.cfg
+++ b/etc/fedora-4-i386-epel.cfg
@@ -2,6 +2,7 @@
 import os
 config_opts['root'] = 'epel-4-i386'
 config_opts['target_arch'] = 'i386'
+config_opts['chroot_setup_cmd'] = 'install buildsys-build'
 
 config_opts['yum.conf'] = """
 [main]
diff --git a/etc/fedora-4-ppc-epel.cfg b/etc/fedora-4-ppc-epel.cfg
index de52211..f0d72ad 100644
--- a/etc/fedora-4-ppc-epel.cfg
+++ b/etc/fedora-4-ppc-epel.cfg
@@ -2,6 +2,7 @@
 import os
 config_opts['root'] = 'epel-4-ppc'
 config_opts['target_arch'] = 'ppc'
+config_opts['chroot_setup_cmd'] = 'install buildsys-build'
 
 config_opts['yum.conf'] = """
 [main]
diff --git a/etc/fedora-4-x86_64-epel.cfg b/etc/fedora-4-x86_64-epel.cfg
index 14a4a41..86a130b 100644
--- a/etc/fedora-4-x86_64-epel.cfg
+++ b/etc/fedora-4-x86_64-epel.cfg
@@ -2,6 +2,7 @@
 import os
 config_opts['root'] = 'epel-4-x86_64'
 config_opts['target_arch'] = 'x86_64'
+config_opts['chroot_setup_cmd'] = 'install buildsys-build'
 
 config_opts['yum.conf'] = """
 [main]
diff --git a/etc/fedora-5-i386-epel.cfg b/etc/fedora-5-i386-epel.cfg
index bdf6db5..915dda1 100644
--- a/etc/fedora-5-i386-epel.cfg
+++ b/etc/fedora-5-i386-epel.cfg
@@ -2,6 +2,7 @@
 import os
 config_opts['root'] = 'epel-5-i386'
 config_opts['target_arch'] = 'i386'
+config_opts['chroot_setup_cmd'] = 'install buildsys-build'
 
 config_opts['yum.conf'] = """
 [main]
diff --git a/etc/fedora-5-ppc-epel.cfg b/etc/fedora-5-ppc-epel.cfg
index 32f4c5f..5665868 100644
--- a/etc/fedora-5-ppc-epel.cfg
+++ b/etc/fedora-5-ppc-epel.cfg
@@ -2,6 +2,7 @@
 import os
 config_opts['root'] = 'epel-5-ppc'
 config_opts['target_arch'] = 'ppc'
+config_opts['chroot_setup_cmd'] = 'install buildsys-build'
 
 config_opts['yum.conf'] = """
 [main]
diff --git a/etc/fedora-5-x86_64-epel.cfg b/etc/fedora-5-x86_64-epel.cfg
index c3c7be5..87b11e5 100644
--- a/etc/fedora-5-x86_64-epel.cfg
+++ b/etc/fedora-5-x86_64-epel.cfg
@@ -2,6 +2,7 @@
 import os
 config_opts['root'] = 'epel-5-x86_64'
 config_opts['target_arch'] = 'x86_64'
+config_opts['chroot_setup_cmd'] = 'install buildsys-build'
 
 config_opts['yum.conf'] = """
 [main]
diff --git a/etc/fedora-6-i386-core.cfg b/etc/fedora-6-i386-core.cfg
index a136110..fdecd47 100644
--- a/etc/fedora-6-i386-core.cfg
+++ b/etc/fedora-6-i386-core.cfg
@@ -3,6 +3,7 @@
 import os
 config_opts['root'] = 'fedora-6-i386-core'
 config_opts['target_arch'] = 'i386'
+config_opts['chroot_setup_cmd'] = 'install buildsys-build'
 
 
 config_opts['yum.conf'] = """
diff --git a/etc/fedora-6-ppc-core.cfg b/etc/fedora-6-ppc-core.cfg
index b802cb6..bc157f8 100644
--- a/etc/fedora-6-ppc-core.cfg
+++ b/etc/fedora-6-ppc-core.cfg
@@ -2,6 +2,7 @@
 import os
 config_opts['root'] = 'fedora-6-ppc-core'
 config_opts['target_arch'] = 'ppc'
+config_opts['chroot_setup_cmd'] = 'install buildsys-build'
 
 
 config_opts['yum.conf'] = """
diff --git a/etc/fedora-6-x86_64-core.cfg b/etc/fedora-6-x86_64-core.cfg
index 26f86b6..827b631 100644
--- a/etc/fedora-6-x86_64-core.cfg
+++ b/etc/fedora-6-x86_64-core.cfg
@@ -3,6 +3,7 @@ import os
 
 config_opts['root'] = 'fedora-6-x86_64-core'
 config_opts['target_arch'] = 'x86_64'
+config_opts['chroot_setup_cmd'] = 'install buildsys-build'
 
 
 config_opts['yum.conf'] = """
diff --git a/etc/fedora-7-i386.cfg b/etc/fedora-7-i386.cfg
index 2a40e57..aff4b7c 100644
--- a/etc/fedora-7-i386.cfg
+++ b/etc/fedora-7-i386.cfg
@@ -3,6 +3,7 @@
 import os
 config_opts['root'] = 'fedora-7-i386'
 config_opts['target_arch'] = 'i386'
+config_opts['chroot_setup_cmd'] = 'install buildsys-build'
 
 
 config_opts['yum.conf'] = """
diff --git a/etc/fedora-7-ppc.cfg b/etc/fedora-7-ppc.cfg
index 3559e5f..5320468 100644
--- a/etc/fedora-7-ppc.cfg
+++ b/etc/fedora-7-ppc.cfg
@@ -2,6 +2,7 @@
 import os
 config_opts['root'] = 'fedora-7-ppc'
 config_opts['target_arch'] = 'ppc'
+config_opts['chroot_setup_cmd'] = 'install buildsys-build'
 
 
 config_opts['yum.conf'] = """
diff --git a/etc/fedora-7-ppc64.cfg b/etc/fedora-7-ppc64.cfg
index 8fa05d4..c7b2c67 100644
--- a/etc/fedora-7-ppc64.cfg
+++ b/etc/fedora-7-ppc64.cfg
@@ -2,6 +2,7 @@
 import os
 config_opts['root'] = 'fedora-7-ppc64'
 config_opts['target_arch'] = 'ppc64'
+config_opts['chroot_setup_cmd'] = 'install buildsys-build'
 
 
 config_opts['yum.conf'] = """
diff --git a/etc/fedora-7-x86_64.cfg b/etc/fedora-7-x86_64.cfg
index 5e116d5..caa3341 100644
--- a/etc/fedora-7-x86_64.cfg
+++ b/etc/fedora-7-x86_64.cfg
@@ -3,6 +3,7 @@ import os
 
 config_opts['root'] = 'fedora-7-x86_64'
 config_opts['target_arch'] = 'x86_64'
+config_opts['chroot_setup_cmd'] = 'install buildsys-build'
 
 
 config_opts['yum.conf'] = """
diff --git a/mock.py b/mock.py
index 68ddf62..743d965 100644
--- a/mock.py
+++ b/mock.py
@@ -874,7 +874,7 @@ def setup_default_config_opts(config_opts):
     config_opts['chown'] = '/usr/sbin/mock-helper chown'
     config_opts['rpmbuild_timeout'] = 0
     config_opts['runuser'] = '/sbin/runuser'
-    config_opts['chroot_setup_cmd'] = 'install buildsys-build'
+    config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
     config_opts['chrootuser'] = 'mockbuild'
     config_opts['chrootgroup'] = 'mockbuild'
     config_opts['use_host_resolv'] = True
-- 
cgit