added Jesse Keating's arch specific mods

14 files changed, 48 insertions, 35 deletions

diff --git a/etc/fedora-3-i386-core.cfg b/etc/fedora-3-i386-core.cfg
index 418f444..5693f59 100644
--- a/etc/fedora-3-i386-core.cfg
+++ b/etc/fedora-3-i386-core.cfg
@@ -19,11 +19,11 @@ assumeyes=1
 
 [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,7 +32,7 @@ baseurl=http://buildsys.fedoraproject.org/buildgroups/3/i386/
 
 [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
diff --git a/etc/fedora-3-x86_64-core.cfg b/etc/fedora-3-x86_64-core.cfg
index 13405eb..1128218 100644
--- a/etc/fedora-3-x86_64-core.cfg
+++ b/etc/fedora-3-x86_64-core.cfg
@@ -19,12 +19,12 @@ exclude=[ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefhijklmnopqrstuvwxyz]*.i*86 g[abcdefghij
 
 [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,7 +32,7 @@ baseurl=http://buildsys.fedoraproject.org/buildgroups/3/x86_64/
 
 [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
diff --git a/etc/fedora-4-i386-core.cfg b/etc/fedora-4-i386-core.cfg
index be41b91..81b1ec5 100644
--- a/etc/fedora-4-i386-core.cfg
+++ b/etc/fedora-4-i386-core.cfg
@@ -20,11 +20,11 @@ assumeyes=1
 
 [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,7 +33,7 @@ baseurl=http://buildsys.fedoraproject.org/buildgroups/4/i386/
 
 [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
diff --git a/etc/fedora-4-ppc-core.cfg b/etc/fedora-4-ppc-core.cfg
index 890c651..5814c37 100644
--- a/etc/fedora-4-ppc-core.cfg
+++ b/etc/fedora-4-ppc-core.cfg
@@ -20,11 +20,11 @@ exclude=*.ppc64
 
 [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,7 +32,7 @@ baseurl=http://buildsys.fedoraproject.org/buildgroups/4/ppc/
 
 [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
diff --git a/etc/fedora-4-x86_64-core.cfg b/etc/fedora-4-x86_64-core.cfg
index edc41a4..456ee21 100644
--- a/etc/fedora-4-x86_64-core.cfg
+++ b/etc/fedora-4-x86_64-core.cfg
@@ -20,12 +20,12 @@ exclude=[ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefhijklmnopqrstuvwxyz]*.i*86 g[abcdefghij
 
 [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,6 +33,7 @@ baseurl=http://buildsys.fedoraproject.org/buildgroups/4/x86_64/
 
 [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]
diff --git a/etc/fedora-5-i386-core.cfg b/etc/fedora-5-i386-core.cfg
index 2f9847a..4f4d20b 100644
--- a/etc/fedora-5-i386-core.cfg
+++ b/etc/fedora-5-i386-core.cfg
@@ -20,11 +20,11 @@ assumeyes=1
 
 [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,7 +32,7 @@ baseurl=http://buildsys.fedoraproject.org/buildgroups/5/i386/
 
 [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
diff --git a/etc/fedora-5-ppc-core.cfg b/etc/fedora-5-ppc-core.cfg
index 5a1d22b..a8dd99e 100644
--- a/etc/fedora-5-ppc-core.cfg
+++ b/etc/fedora-5-ppc-core.cfg
@@ -20,11 +20,11 @@ exclude=*.ppc64
 
 [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,7 +32,7 @@ baseurl=http://buildsys.fedoraproject.org/buildgroups/5/ppc/
 
 [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
diff --git a/etc/fedora-5-x86_64-core.cfg b/etc/fedora-5-x86_64-core.cfg
index 3f85bea..aa4a4d1 100644
--- a/etc/fedora-5-x86_64-core.cfg
+++ b/etc/fedora-5-x86_64-core.cfg
@@ -21,11 +21,11 @@ exclude=[ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefhijklmnopqrstuvwxyz]*.i*86 g[abcdefghij
 
 [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,7 +33,7 @@ baseurl=http://buildsys.fedoraproject.org/buildgroups/5/x86_64/
 
 [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
diff --git a/etc/fedora-6-i386-core.cfg b/etc/fedora-6-i386-core.cfg
index d0677b1..9478e79 100644
--- a/etc/fedora-6-i386-core.cfg
+++ b/etc/fedora-6-i386-core.cfg
@@ -20,7 +20,11 @@ assumeyes=1
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-6
+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
@@ -28,7 +32,7 @@ baseurl=http://buildsys.fedoraproject.org/buildgroups/6/i386/
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-6
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-6&arch=i386
 
 [local]
 name=local
diff --git a/etc/fedora-6-ppc-core.cfg b/etc/fedora-6-ppc-core.cfg
index 156ee8f..4c5296e 100644
--- a/etc/fedora-6-ppc-core.cfg
+++ b/etc/fedora-6-ppc-core.cfg
@@ -20,7 +20,11 @@ exclude=*.ppc64
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-6
+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
@@ -28,7 +32,7 @@ baseurl=http://buildsys.fedoraproject.org/buildgroups/6/ppc/
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-6
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-6&arch=ppc
 
 [local]
 name=local
diff --git a/etc/fedora-6-x86_64-core.cfg b/etc/fedora-6-x86_64-core.cfg
index ce9eed6..e1fd464 100644
--- a/etc/fedora-6-x86_64-core.cfg
+++ b/etc/fedora-6-x86_64-core.cfg
@@ -21,7 +21,11 @@ exclude=[ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefhijklmnopqrstuvwxyz]*.i*86 g[abcdefghij
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-6
+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
@@ -29,7 +33,7 @@ baseurl=http://buildsys.fedoraproject.org/buildgroups/6/x86_64/
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-6
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-6&arch=x86_64
 
 [local]
 name=local
diff --git a/etc/fedora-devel-i386-core.cfg b/etc/fedora-devel-i386-core.cfg
index 21110cc..0132116 100644
--- a/etc/fedora-devel-i386-core.cfg
+++ b/etc/fedora-devel-i386-core.cfg
@@ -20,7 +20,7 @@ assumeyes=1
 
 [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,7 +28,7 @@ baseurl=http://buildsys.fedoraproject.org/buildgroups/development/i386/
 
 [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
diff --git a/etc/fedora-devel-ppc-core.cfg b/etc/fedora-devel-ppc-core.cfg
index 2e3f5cc..cf68beb 100644
--- a/etc/fedora-devel-ppc-core.cfg
+++ b/etc/fedora-devel-ppc-core.cfg
@@ -20,7 +20,7 @@ exclude=*.ppc64
 
 [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,7 +28,7 @@ baseurl=http://buildsys.fedoraproject.org/buildgroups/development/ppc/
 
 [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
diff --git a/etc/fedora-devel-x86_64-core.cfg b/etc/fedora-devel-x86_64-core.cfg
index ba67d77..4cbd388 100644
--- a/etc/fedora-devel-x86_64-core.cfg
+++ b/etc/fedora-devel-x86_64-core.cfg
@@ -21,7 +21,7 @@ exclude=[ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefhijklmnopqrstuvwxyz]*.i*86 g[abcdefghij
 
 [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,7 +29,7 @@ baseurl=http://buildsys.fedoraproject.org/buildgroups/development/x86_64/
 
 [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