config file changes to point to mirrors

9 files changed, 32 insertions, 39 deletions

diff --git a/etc/fedora-3-i386-core.cfg b/etc/fedora-3-i386-core.cfg
index 66691a9..418f444 100644
--- a/etc/fedora-3-i386-core.cfg
+++ b/etc/fedora-3-i386-core.cfg
@@ -19,24 +19,24 @@ assumeyes=1
 
 [core]
 name=core
-baseurl=http://newmirror.linux.duke.edu/pub/fedora/linux/core/3/i386/os/
+mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-3
 
 [updates-released]
 name=updates
-baseurl=http://newmirror.linux.duke.edu/pub/fedora/linux/core/updates/3/i386/
+mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc3
+
 
 [groups]
 name=groups
-baseurl=http://fedoraproject.org/buildgroups/3/i386/
+baseurl=http://buildsys.fedoraproject.org/buildgroups/3/i386/
 
 [extras]
 name=extras
-baseurl=http://fedoraproject.org/extras/3/i386
+mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-3
 
 [local]
 name=local
 baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-3-extras/
-
 """
 
 
diff --git a/etc/fedora-3-x86_64-core.cfg b/etc/fedora-3-x86_64-core.cfg
index 1a3a339..13405eb 100644
--- a/etc/fedora-3-x86_64-core.cfg
+++ b/etc/fedora-3-x86_64-core.cfg
@@ -14,31 +14,29 @@ retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
-exclude=*.i386 *.i686 *.athlon *.i586 *.486
-includepkgs=glibc.i686
-
+exclude=[ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefhijklmnopqrstuvwxyz]*.i*86 g[abcdefghijkmnopqrstuvwxyz]*.i?86 glib2.i?86 glib.i?86 *-devel.i?86
 # repos
 
 [core]
 name=core
-baseurl=http://newmirror.linux.duke.edu/pub/fedora/linux/core/3/x86_64/os/
+mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-3
+
 
 [updates-released]
 name=updates
-baseurl=http://newmirror.linux.duke.edu/pub/fedora/linux/core/updates/3/x86_64/
+mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc3
 
 [groups]
 name=groups
-baseurl=http://fedoraproject.org/buildgroups/3/x86_64/
+baseurl=http://buildsys.fedoraproject.org/buildgroups/3/x86_64/
 
 [extras]
 name=extras
-baseurl=http://fedoraproject.org/extras/3/x86_64/
+mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-3
 
 [local]
 name=local
 baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-3-extras/
-
 """
 
 
diff --git a/etc/fedora-4-i386-core.cfg b/etc/fedora-4-i386-core.cfg
index 32a135e..be41b91 100644
--- a/etc/fedora-4-i386-core.cfg
+++ b/etc/fedora-4-i386-core.cfg
@@ -24,16 +24,16 @@ mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-4
 
 [updates-released]
 name=updates
-baseurl=http://newmirror.linux.duke.edu/pub/fedora/linux/core/updates/4/i386/
+mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc4
 
 
 [groups]
 name=groups
-baseurl=http://fedoraproject.org/buildgroups/4/i386/
+baseurl=http://buildsys.fedoraproject.org/buildgroups/4/i386/
 
 [extras]
 name=extras
-baseurl=http://fedoraproject.org/extras/4/i386
+mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-4
 
 [local]
 name=local
diff --git a/etc/fedora-4-ppc-core.cfg b/etc/fedora-4-ppc-core.cfg
index 71972a0..890c651 100644
--- a/etc/fedora-4-ppc-core.cfg
+++ b/etc/fedora-4-ppc-core.cfg
@@ -24,15 +24,15 @@ mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-4
 
 [updates-released]
 name=updates
-baseurl=http://newmirror.linux.duke.edu/pub/fedora/linux/core/updates/4/ppc/
+mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc4
 
 [groups]
 name=groups
-baseurl=http://fedoraproject.org/buildgroups/4/ppc/
+baseurl=http://buildsys.fedoraproject.org/buildgroups/4/ppc/
 
 [extras]
 name=extras
-baseurl=http://fedoraproject.org/extras/4/ppc/
+mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-4
 
 [local]
 name=local
diff --git a/etc/fedora-4-x86_64-core.cfg b/etc/fedora-4-x86_64-core.cfg
index 39b5ce2..edc41a4 100644
--- a/etc/fedora-4-x86_64-core.cfg
+++ b/etc/fedora-4-x86_64-core.cfg
@@ -15,9 +15,7 @@ retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
-exclude=*.i386 *.486 *.586 *.i686 *.athlon
-includepkgs=glibc.i686
-
+exclude=[ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefhijklmnopqrstuvwxyz]*.i*86 g[abcdefghijkmnopqrstuvwxyz]*.i?86 glib2.i?86 glib.i?86 *-devel.i?86
 # repos
 
 [core]
@@ -27,16 +25,15 @@ mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-4
 
 [updates-released]
 name=updates
-baseurl=http://newmirror.linux.duke.edu/pub/fedora/linux/core/updates/4/x86_64/
-
+mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc4
 
 [groups]
 name=groups
-baseurl=http://fedoraproject.org/buildgroups/4/x86_64/
+baseurl=http://buildsys.fedoraproject.org/buildgroups/4/x86_64/
 
 [extras]
 name=extras
-baseurl=http://fedoraproject.org/extras/4/x86_64/
+mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-4
 
 [local]
 name=local
diff --git a/etc/fedora-5-x86_64-core.cfg b/etc/fedora-5-x86_64-core.cfg
index c69f8cc..3f85bea 100644
--- a/etc/fedora-5-x86_64-core.cfg
+++ b/etc/fedora-5-x86_64-core.cfg
@@ -15,8 +15,7 @@ retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
-exclude=*.i386 *.486 *.586 *.i686 *.athlon
-includepkgs=glibc.i686
+exclude=[ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefhijklmnopqrstuvwxyz]*.i*86 g[abcdefghijkmnopqrstuvwxyz]*.i?86 glib2.i?86 glib.i?86 *-devel.i?86
 
 # repos
 
diff --git a/etc/fedora-devel-i386-core.cfg b/etc/fedora-devel-i386-core.cfg
index b7a5996..21110cc 100644
--- a/etc/fedora-devel-i386-core.cfg
+++ b/etc/fedora-devel-i386-core.cfg
@@ -20,15 +20,15 @@ assumeyes=1
 
 [core]
 name=core
-baseurl=http://newmirror.linux.duke.edu/pub/fedora/linux/core/development/i386
+mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-rawhide
 
 [groups]
 name=groups
-baseurl=http://fedoraproject.org/buildgroups/development/i386/
+baseurl=http://buildsys.fedoraproject.org/buildgroups/development/i386/
 
 [extras]
 name=extras
-baseurl=http://fedoraproject.org/extras/development/i386
+mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-devel
 
 [local]
 name=local
diff --git a/etc/fedora-devel-ppc-core.cfg b/etc/fedora-devel-ppc-core.cfg
index c5d4e05..2e3f5cc 100644
--- a/etc/fedora-devel-ppc-core.cfg
+++ b/etc/fedora-devel-ppc-core.cfg
@@ -20,15 +20,15 @@ exclude=*.ppc64
 
 [core]
 name=core
-baseurl=http://newmirror.linux.duke.edu/pub/fedora/linux/core/development/ppc
+mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-rawhide
 
 [groups]
 name=groups
-baseurl=http://fedoraproject.org/buildgroups/development/ppc/
+baseurl=http://buildsys.fedoraproject.org/buildgroups/development/ppc/
 
 [extras]
 name=extras
-baseurl=http://fedoraproject.org/extras/development/ppc/
+mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-devel
 
 [local]
 name=local
diff --git a/etc/fedora-devel-x86_64-core.cfg b/etc/fedora-devel-x86_64-core.cfg
index beae3a8..ba67d77 100644
--- a/etc/fedora-devel-x86_64-core.cfg
+++ b/etc/fedora-devel-x86_64-core.cfg
@@ -15,22 +15,21 @@ retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
-exclude=*.i386 *.486 *.586 *.i686 *.athlon
-includepkgs=glibc.i686
+exclude=[ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefhijklmnopqrstuvwxyz]*.i*86 g[abcdefghijkmnopqrstuvwxyz]*.i?86 glib2.i?86 glib.i?86 *-devel.i?86
 
 # repos
 
 [core]
 name=core
-baseurl=http://newmirror.linux.duke.edu/pub/fedora/linux/core/development/x86_64
+mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-rawhide
 
 [groups]
 name=groups
-baseurl=http://fedoraproject.org/buildgroups/development/x86_64/
+baseurl=http://buildsys.fedoraproject.org/buildgroups/development/x86_64/
 
 [extras]
 name=extras
-baseurl=http://fedoraproject.org/extras/development/x86_64/
+mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-devel
 
 [local]
 name=local