Thu Jan 4 16:11:24 UTC 2007

Author: jcwillia

Update of /cvs/fedora/mock/etc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10993/etc

Modified Files:
	Makefile fedora-1-i386-core.cfg fedora-2-i386-core.cfg 
	fedora-3-i386-core.cfg fedora-3-x86_64-core.cfg 
	fedora-4-i386-core.cfg fedora-4-ppc-core.cfg 
	fedora-4-x86_64-core.cfg fedora-5-i386-core.cfg 
	fedora-5-ppc-core.cfg fedora-5-x86_64-core.cfg 
	fedora-devel-i386-core.cfg fedora-devel-ppc-core.cfg 
	fedora-devel-x86_64-core.cfg redhat-73-i386.cfg 
	redhat-9-i386.cfg 
Added Files:
	fedora-6-i386-core.cfg fedora-6-ppc-core.cfg 
	fedora-6-x86_64-core.cfg 
Log Message:
merged mock-0-6-branch fixes into HEAD


Index: fedora-6-i386-core.cfg
===================================================================
RCS file: fedora-6-i386-core.cfg
diff -N fedora-6-i386-core.cfg

--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ fedora-6-i386-core.cfg	4 Jan 2007 16:10:54 -0000	1.2
@@ -0,0 +1,44 @@
+#!/usr/bin/python -tt
+
+import os
+config_opts['root'] = 'fedora-6-i386-core'
+config_opts['target_arch'] = 'i386'
+
+
+config_opts['yum.conf'] = """
+[main]
+cachedir=/var/cache/yum
+debuglevel=1
+reposdir=/dev/null
+logfile=/var/log/yum.log
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+
+# repos
+
+[core]
+name=core
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-6&arch=i386
+
+[updates-released]
+name=updates
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc6&arch=i386
+
+[groups]
+name=groups
+baseurl=http://buildsys.fedoraproject.org/buildgroups/6/i386/
+
+[extras]
+name=extras
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-6&arch=i386
+
+[local]
+name=local
+baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-6-extras/
+exclude=*.x86_64 *.ppc
+"""
+
+
+


Index: fedora-6-ppc-core.cfg
===================================================================
RCS file: fedora-6-ppc-core.cfg
diff -N fedora-6-ppc-core.cfg
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ fedora-6-ppc-core.cfg	4 Jan 2007 16:10:54 -0000	1.2
@@ -0,0 +1,44 @@
+#!/usr/bin/python -tt
+import os
+config_opts['root'] = 'fedora-6-ppc-core'
+config_opts['target_arch'] = 'ppc'
+
+
+config_opts['yum.conf'] = """
+[main]
+cachedir=/var/cache/yum
+debuglevel=1
+reposdir=/dev/null
+logfile=/var/log/yum.log
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+exclude=*.ppc64
+
+# repos
+
+[core]
+name=core
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-6&arch=ppc
+
+[updates-released]
+name=updates
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc6&arch=ppc
+
+[groups]
+name=groups
+baseurl=http://buildsys.fedoraproject.org/buildgroups/6/ppc/
+
+[extras]
+name=extras
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-6&arch=ppc
+
+[local]
+name=local
+baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-6-extras/
+exclude=*.i386 *.x86_64
+"""
+
+
+


Index: fedora-6-x86_64-core.cfg
===================================================================
RCS file: fedora-6-x86_64-core.cfg
diff -N fedora-6-x86_64-core.cfg
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ fedora-6-x86_64-core.cfg	4 Jan 2007 16:10:54 -0000	1.2
@@ -0,0 +1,45 @@
+#!/usr/bin/python -tt
+import os
+
+config_opts['root'] = 'fedora-6-x86_64-core'
+config_opts['target_arch'] = 'x86_64'
+
+
+config_opts['yum.conf'] = """
+[main]
+cachedir=/var/cache/yum
+debuglevel=1
+reposdir=/dev/null
+logfile=/var/log/yum.log
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+exclude=[ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefhijklmnopqrstuvwxyz]*.i*86 g[abcdefghijkmnopqrstuvwxyz]*.i?86 glib2.i?86 glib.i?86 *-devel.i?86
+
+# repos
+
+[core]
+name=core
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-6&arch=x86_64
+
+[updates-released]
+name=updates
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc6&arch=x86_64
+
+[groups]
+name=groups
+baseurl=http://buildsys.fedoraproject.org/buildgroups/6/x86_64/
+
+[extras]
+name=extras
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-6&arch=x86_64
+
+[local]
+name=local
+baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-6-extras/
+exclude=*.i386 *.ppc
+"""
+
+
+


Index: Makefile
===================================================================
RCS file: /cvs/fedora/mock/etc/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile	21 Jun 2006 21:53:20 -0000	1.5
+++ Makefile	4 Jan 2007 16:10:54 -0000	1.6
@@ -9,7 +9,3 @@
 	for item in *.cfg; do \
 		install -m 644 $$item $(DESTDIR)/etc/mock/$$item; \
 	done
-	for arch in i386 ppc x86_64 ; do \
-		ln -sv fedora-6-$$arch-core.cfg  $(DESTDIR)/etc/mock/fedora-development-$$arch-core.cfg; \
-	done
-


Index: fedora-1-i386-core.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/fedora-1-i386-core.cfg,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fedora-1-i386-core.cfg	17 Aug 2006 18:23:55 -0000	1.5
+++ fedora-1-i386-core.cfg	4 Jan 2007 16:10:54 -0000	1.6
@@ -3,8 +3,8 @@
 config_opts['root'] = 'fedora-1-i386-core'
 config_opts['target_arch'] = 'i386'
 config_opts['runuser'] = '/bin/su'
-
 config_opts['yum.conf'] = """
+
 [main]
 cachedir=/var/cache/yum
 debuglevel=1


Index: fedora-2-i386-core.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/fedora-2-i386-core.cfg,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fedora-2-i386-core.cfg	17 Aug 2006 18:23:55 -0000	1.5
+++ fedora-2-i386-core.cfg	4 Jan 2007 16:10:54 -0000	1.6
@@ -4,6 +4,7 @@
 config_opts['target_arch'] = 'i386'
 config_opts['runuser'] = '/bin/su'
 
+
 config_opts['yum.conf'] = """
 [main]
 cachedir=/var/cache/yum


Index: fedora-3-i386-core.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/fedora-3-i386-core.cfg,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fedora-3-i386-core.cfg	13 Jun 2006 04:28:03 -0000	1.7
+++ fedora-3-i386-core.cfg	4 Jan 2007 16:10:54 -0000	1.8
@@ -19,11 +19,11 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-3
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/3/i386/os
 
 [updates-released]
 name=updates
-mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc3
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/3/i386
 
 
 [groups]
@@ -32,11 +32,12 @@
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-3
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/3/i386
 
 [local]
 name=local
 baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-3-extras/
+exclude=*.x86_64 *.ppc
 """
 
 


Index: fedora-3-x86_64-core.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/fedora-3-x86_64-core.cfg,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fedora-3-x86_64-core.cfg	13 Jun 2006 04:28:03 -0000	1.7
+++ fedora-3-x86_64-core.cfg	4 Jan 2007 16:10:54 -0000	1.8
@@ -19,12 +19,12 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-3
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/3/x86_64/os
 
 
 [updates-released]
 name=updates
-mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc3
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/3/x86_64
 
 [groups]
 name=groups
@@ -32,11 +32,12 @@
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-3
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/3/x86_64
 
 [local]
 name=local
 baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-3-extras/
+exclude=*.i386 *.ppc
 """
 
 


Index: fedora-4-i386-core.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/fedora-4-i386-core.cfg,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fedora-4-i386-core.cfg	13 Jun 2006 04:28:03 -0000	1.8
+++ fedora-4-i386-core.cfg	4 Jan 2007 16:10:54 -0000	1.9
@@ -20,11 +20,11 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-4
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/4/i386/os
 
 [updates-released]
 name=updates
-mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc4
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/4/i386
 
 
 [groups]
@@ -33,12 +33,12 @@
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-4
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/4/i386
 
 [local]
 name=local
 baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-4-extras/
-
+exclude=*.x86_64 *.ppc
 """
 
 


Index: fedora-4-ppc-core.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/fedora-4-ppc-core.cfg,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fedora-4-ppc-core.cfg	13 Jun 2006 04:28:03 -0000	1.9
+++ fedora-4-ppc-core.cfg	4 Jan 2007 16:10:54 -0000	1.10
@@ -20,11 +20,11 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-4
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/4/ppc/os
 
 [updates-released]
 name=updates
-mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc4
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/4/ppc
 
 [groups]
 name=groups
@@ -32,12 +32,12 @@
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-4
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/4/ppc
 
 [local]
 name=local
 baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-4-extras/
-
+exclude=*.i386 *.x86_64
 """
 
 


Index: fedora-4-x86_64-core.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/fedora-4-x86_64-core.cfg,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fedora-4-x86_64-core.cfg	13 Jun 2006 04:28:03 -0000	1.8
+++ fedora-4-x86_64-core.cfg	4 Jan 2007 16:10:54 -0000	1.9
@@ -20,12 +20,12 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-4
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/4/x86_64/os
 
 
 [updates-released]
 name=updates
-mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc4
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/4/x86_64
 
 [groups]
 name=groups
@@ -33,12 +33,13 @@
 
 [extras]
 name=extras
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/4/x86_64
 mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-4
 
 [local]
 name=local
 baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-4-extras/
-
+exclude=*.i386 *.ppc
 """
 
 


Index: fedora-5-i386-core.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/fedora-5-i386-core.cfg,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fedora-5-i386-core.cfg	13 Jun 2006 04:12:42 -0000	1.8
+++ fedora-5-i386-core.cfg	4 Jan 2007 16:10:54 -0000	1.9
@@ -20,11 +20,11 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-5
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-5&arch=i386
 
 [updates-released]
 name=updates
-mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc5
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc5&arch=i386
 
 [groups]
 name=groups
@@ -32,12 +32,12 @@
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-5
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=i386
 
 [local]
 name=local
 baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-5-extras/
-
+exclude=*.x86_64 *.ppc
 """
 
 


Index: fedora-5-ppc-core.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/fedora-5-ppc-core.cfg,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fedora-5-ppc-core.cfg	13 Jun 2006 04:12:42 -0000	1.9
+++ fedora-5-ppc-core.cfg	4 Jan 2007 16:10:54 -0000	1.10
@@ -20,11 +20,11 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-5
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-5&arch=ppc
 
 [updates-released]
 name=updates
-mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc5
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc5&arch=ppc
 
 [groups]
 name=groups
@@ -32,12 +32,12 @@
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-5
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=ppc
 
 [local]
 name=local
 baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-5-extras/
-
+exclude=*.i386 *.x86_64
 """
 
 


Index: fedora-5-x86_64-core.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/fedora-5-x86_64-core.cfg,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fedora-5-x86_64-core.cfg	13 Jun 2006 04:28:03 -0000	1.9
+++ fedora-5-x86_64-core.cfg	4 Jan 2007 16:10:54 -0000	1.10
@@ -21,11 +21,11 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-5
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-5&arch=x86_64
 
 [updates-released]
 name=updates
-mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc5
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc5&arch=x86_64
 
 [groups]
 name=groups
@@ -33,12 +33,12 @@
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-5
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=x86_64
 
 [local]
 name=local
 baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-5-extras/
-
+exclude=*.i386 *.ppc
 """
 
 


Index: fedora-devel-i386-core.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/fedora-devel-i386-core.cfg,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fedora-devel-i386-core.cfg	13 Jun 2006 04:28:03 -0000	1.4
+++ fedora-devel-i386-core.cfg	4 Jan 2007 16:10:54 -0000	1.5
@@ -20,7 +20,7 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-rawhide
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=i386
 
 [groups]
 name=groups
@@ -28,12 +28,12 @@
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-devel
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-devel&arch=i386
 
 [local]
 name=local
 baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-development-extras/
-
+exclude=*.x86_64 *.ppc
 """
 
 


Index: fedora-devel-ppc-core.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/fedora-devel-ppc-core.cfg,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fedora-devel-ppc-core.cfg	13 Jun 2006 04:28:03 -0000	1.4
+++ fedora-devel-ppc-core.cfg	4 Jan 2007 16:10:54 -0000	1.5
@@ -20,7 +20,7 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-rawhide
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=ppc
 
 [groups]
 name=groups
@@ -28,12 +28,12 @@
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-devel
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-devel&arch=ppc
 
 [local]
 name=local
 baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-development-extras/
-
+exclude=*.i386 *.x86_64
 """
 
 


Index: fedora-devel-x86_64-core.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/fedora-devel-x86_64-core.cfg,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fedora-devel-x86_64-core.cfg	13 Jun 2006 04:28:03 -0000	1.4
+++ fedora-devel-x86_64-core.cfg	4 Jan 2007 16:10:54 -0000	1.5
@@ -21,7 +21,7 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-rawhide
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=x86_64
 
 [groups]
 name=groups
@@ -29,12 +29,12 @@
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-devel
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-devel&arch=x86_64
 
 [local]
 name=local
 baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-development-extras/
-
+exclude=*.i386 *.ppc
 """
 
 


Index: redhat-73-i386.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/redhat-73-i386.cfg,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- redhat-73-i386.cfg	7 Jun 2006 12:36:11 -0000	1.4
+++ redhat-73-i386.cfg	4 Jan 2007 16:10:54 -0000	1.5
@@ -2,7 +2,7 @@
 import os
 config_opts['root'] = 'redhat-73-i386'
 config_opts['target_arch'] = 'i386'
-
+config_opts['runuser'] = '/bin/su'
 
 config_opts['yum.conf'] = """
 [main]


Index: redhat-9-i386.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/redhat-9-i386.cfg,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- redhat-9-i386.cfg	7 Jun 2006 12:36:11 -0000	1.4
+++ redhat-9-i386.cfg	4 Jan 2007 16:10:54 -0000	1.5
@@ -2,6 +2,7 @@
 import os
 config_opts['root'] = 'redhat-9-i386'
 config_opts['target_arch'] = 'i386'
+config_opts['runuser'] = '/bin/su'
 
 
 config_opts['yum.conf'] = """


