1 files changed, 12 insertions, 36 deletions
diff --git a/mock/el6xscl54.cfg b/mock/el6xscl54.cfg
index 42c65fb..a209ae2 100644
--- a/mock/el6xscl54.cfg
+++ b/mock/el6xscl54.cfg
@@ -1,22 +1,24 @@
-config_opts['root'] = 'el6xphp54'
+config_opts['root'] = 'scl54el6x'
 config_opts['target_arch'] = 'x86_64'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build php54-build'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build scl-utils-build php54-build'
 config_opts['dist'] = 'el6'  # only useful for --resultdir variable subst
 
 config_opts['plugin_conf']['ccache_enable'] = True
 config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
 config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.el6x/"
 
-config_opts['basedir'] = '/dev/shm/el6xphp54'
-config_opts['resultdir'] = "/var/lib/mock/el6xphp54"
+config_opts['basedir'] = '/dev/shm/'
+config_opts['resultdir'] = "/var/lib/mock/scl54el6x"
 config_opts['cleanup_on_success'] = True
 config_opts['cleanup_on_failure'] = False
 
 config_opts['createrepo_on_rpms'] = True
 config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm'
 
+config_opts['macros']['%scl_vendor']="remi"
+config_opts['macros']['%_scl_prefix']="/opt/remi"
 config_opts['macros']['%_smp_mflags']="-j6"
-config_opts['macros']['%vendor']="Collet Remi"
+config_opts['macros']['%vendor']="Remi Collet"
 config_opts['macros']['%packager']="http://blog.famillecollet.com/"
 config_opts['macros']['%dist']=".el6.remi"
 config_opts['macros']['%rhel']="6"
@@ -25,7 +27,6 @@ config_opts['macros']['%_with_oci8']="1"
 config_opts['macros']['%runselftest']="1"
 config_opts['macros']['%nophptag']="1"
 
-
 config_opts['yum.conf'] = """
 [main]
 cachedir=/var/cache/yum
@@ -61,24 +62,6 @@ enabled=0
 mirrorlist=http://mirrorlist.centos.org/?release=6&arch=x86_64&repo=os
 failovermethod=priority
 
-[scl-utils]
-name=Copr repo for scl-utils owned by msuchy
-baseurl=http://copr-be.cloud.fedoraproject.org/results/msuchy/scl-utils/epel-6-x86_64/
-gpgcheck=0
-enabled=1
-
-[php54]
-name=Copr repo for php54 owned by rhscl
-baseurl=http://copr-be.cloud.fedoraproject.org/results/rhscl/php54/epel-6-x86_64/
-gpgcheck=0
-enabled=1
-
-[php54more]
-name=Copr repo for php54more owned by remi
-baseurl=http://copr-be.cloud.fedoraproject.org/results/remi/php54more/epel-6-x86_64/
-gpgcheck=0
-enabled=1
-
 [updates]
 name=updates
 enabled=0
@@ -99,7 +82,7 @@ failovermethod=priority
 [remi]
 name=remi public
 baseurl=file:/home/rpmbuild/site/rpms/enterprise/6/remi/x86_64/
-enabled=0
+enabled=1
 
 [remi-test]
 name=remi public
@@ -114,12 +97,12 @@ enabled=1
 [rpmfusion-free]
 name=rpmfusion-free
 mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-6&arch=x86_64
-enabled=0
+enabled=1
 
 [rpmfusion-free-updates]
 name=rpmfusion-free-updates
 mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-updates-released-6&arch=x86_64
-enabled=0
+enabled=1
 
 [local]
 name=local
@@ -129,14 +112,7 @@ enabled=0
 
 [result]
 name=result
-baseurl=file:/var/lib/mock/el6xphp54/
-enabled=1
-
-[python27]
-name=python27
-#baseurl=http://people.redhat.com/bkabrda/python27-rhel-6/
-baseurl=file:/home/rpmbuild/site/rpms/priv/python27-rhel-6/
-enabled=1
+baseurl=file:/var/lib/mock/scl54el6x/
+enabled=0
 
 """
-