diff options
| author | Jesse Keating <jkeating@redhat.com> | 2008-05-20 10:41:20 -0400 |
|---|---|---|
| committer | Jesse Keating <jkeating@redhat.com> | 2008-05-20 10:41:20 -0400 |
| commit | 752c25f0a7d80a3705624946779d805ff352675b (patch) | |
| tree | 5445d2a8f797980500beec270359410b11d8adbc | |
| parent | bc8a3bcd9a989ef94dbc79d571b840df1c9902f7 (diff) | |
| parent | 7ab8dfe62ad84ba9426a1cbf17a3d967278e23d9 (diff) | |
| download | mock-752c25f0a7d80a3705624946779d805ff352675b.tar.gz mock-752c25f0a7d80a3705624946779d805ff352675b.tar.xz mock-752c25f0a7d80a3705624946779d805ff352675b.zip | |
Merge branch 'master' of ssh://git.fedorahosted.org/git/mock
| -rw-r--r-- | mock.spec.in | 6 | ||||
| -rwxr-xr-x | py/mock.py | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/mock.spec.in b/mock.spec.in index b61bebb..4796359 100644 --- a/mock.spec.in +++ b/mock.spec.in @@ -27,6 +27,12 @@ Mock takes a srpm and builds it in a chroot %prep %setup -q +%if "%{?dist}" == ".fc8" +pushd etc/mock +sed -i -e 's/^#exclude=/exclude=/' -e '/^# The above is not/d' \ + fedora-9-x86_64.cfg fedora-rawhide-x86_64.cfg +popd +%endif %build %configure @@ -253,7 +253,7 @@ def setup_default_config_opts(config_opts, unprivUid): config_opts['useradd'] = \ '/usr/sbin/useradd -o -m -u %(uid)s -g %(gid)s -d %(home)s -n %(user)s' config_opts['use_host_resolv'] = True - config_opts['chroot_setup_cmd'] = 'install buildsys-build' + config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build' config_opts['target_arch'] = 'i386' config_opts['rpmbuild_arch'] = None # <-- None means set automatically from target_arch config_opts['yum.conf'] = '' |