--- builds_bin/update_repos	2010/02/12 18:52:06	1.53
+++ builds_bin/update_repos	2010/02/24 18:14:55	1.54
@@ -28,7 +28,6 @@ my @archs = ( 'i386', 'x86_64' );
 
 my $distrepo = { '7' => { active    => 1,
 			  centos    => 4,
-			  fedora    => 3,
 			  repo      => '/releases/7/',
 			  os        => 'RPMS/',
 			  builds    => '/builds/smeserver-7-core/',
@@ -37,7 +36,6 @@ my $distrepo = { '7' => { active    => 1
 			},
 		 '8' => { active    => 1,
 			  centos    => 5,
-			  fedora    => 6,
 			  repo      => '/releases/testing/8/',
 			  os        => '',
 			  builds    => '/builds/smeserver-8-core/',
@@ -56,10 +54,8 @@ my $repos = { "${repotag}os"
 	      "${repotag}dev"             => { prio => 11, inc => 0, ver => 1, rel => 1, devel => 1 },
 	      'centos'                    => { prio => 10, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 },
 	      'epel'                      => { prio =>  9, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 },
-	      'fedora-extras'             => { prio =>  8, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 },
 	      'rpmforge'                  => { prio =>  7, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 },
 	      'atrpms'                    => { prio =>  6, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 },
-	      'fedora'                    => { prio =>  5, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 },
 	      'builds'                    => { prio =>  4, inc => 0, ver => 0, rel => 0, orig => 1 },
 	      'community'                 => { prio =>  2, inc => 0, ver => 0, rel => 0, orig => 1 },
 	      'stage'                     => { prio =>  1, inc => 0, ver => 0, rel => 0, stage => 1, os => 1 },
@@ -80,15 +76,12 @@ my $baserepo = { "~S${repotag}os/~A/$osd
 		 '/mirrors/centos/~C/extras/~A/RPMS/' => 'centos',
 		 '/mirrors/fedora/epel/~C/~A/' => 'epel',
 		 '/mirrors/fedora/epel/testing/~C/~A/' => 'epel',
-		 '/mirrors/fedora/extras/~F/~A/' => 'fedora-extras',
 		 '/mirrors/rpmforge/dag/redhat/el~C/en/~A/dag/RPMS/' => 'rpmforge',
 		 '/mirrors/rpmforge/dag/source/' => 'rpmforge',
 		 '/mirrors/atrpms/el~C-~A/atrpms/stable/' => 'atrpms',
 		 '/mirrors/atrpms/el~C-~A/atrpms/testing/' => 'atrpms',
 		 '/mirrors/atrpms/src/el~C-~A/atrpms/stable/' => 'atrpms',
 		 '/mirrors/atrpms/src/el~C-~A/atrpms/testing/' => 'atrpms',
-		 '/mirrors/fedora/core/~F/~A/os/Fedora/RPMS/' => 'fedora',
-		 '/mirrors/fedora/core/updates/~F/~A/' => 'fedora',
 	       };
 
 if ( $opts{q} ) {
@@ -100,14 +93,11 @@ if ( $opts{q} ) {
 
 my $skippkg = { '7' => { 'centos'        => { map { $_ => 1 } ( 'horde', 'imp-h3', 'ingo-h3', 'turba-h3' ) },
 			 'epel'          => { map { $_ => 1 } ( 'clamav', 'fping', 'ocsinventory', 'perl-Compress-Bzip2', 'perl-Compress-Raw-Zlib', 'perl-Compress-Raw-Bzip2', 'perl-Crypt-OpenSSL-Bignum', 'perl-Crypt-OpenSSL-Random', 'perl-Crypt-OpenSSL-RSA', 'perl-DateTime', 'perl-Razor-Agent', 'perl-Text-Iconv', 'proftpd' ) },
-			 'fedora-extras' => { map { $_ => 1 } ( 'ddclient', 'hddtemp', 'pam_abl', 'perl-Compress-Bzip2', 'perl-Error', 'perl-HTML-Format', 'perl-MIME-Types', 'perl-Net-IP', 'perl-Archive-Zip', 'perl-Class-Singleton', 'perl-Razor-Agent', 'perl-Test-Inline', 'perl-Text-Autoformat', 'perl-Text-Iconv', 'perl-Text-Reform', 'perl-XML-RSS' ) },
 			 'rpmforge'      => { map { $_ => 1 } ( 'perl-Test-Inline' ) },
 			 'atrpms'        => { map { $_ => 1 } ( 'check4updates', 'dovecot', 'trac', 'yum' ) },
 		       },
 		'8' => { 'centos'        => { map { $_ => 1 } ( 'horde', 'imp-h3', 'ingo-h3', 'turba-h3' ) },
-			 'fedora'        => { map { $_ => 1 } ( 'kernel', 'kernel-xen', 'libgsf' ) },
 			 'epel'          => { map { $_ => 1 } ( 'clamav', 'horde', 'perl-Compress-Bzip2', 'perl-Compress-Raw-Zlib', 'perl-Compress-Raw-Bzip2', 'perl-Crypt-OpenSSL-Bignum', 'perl-Crypt-OpenSSL-Random', 'perl-Crypt-OpenSSL-RSA', 'perl-Razor-Agent', 'proftpd', 'smolt' ) },
-			 'fedora-extras' => { map { $_ => 1 } ( 'dstat', 'gocr', 'horde', 'oidentd', 'perl-Compress-Bzip2', 'perl-Crypt-OpenSSL-Bignum', 'perl-Crypt-OpenSSL-Random', 'perl-Crypt-OpenSSL-RSA', 'perl-Test-Inline', 'perl-Razor-Agent', 'smolt' ) },
 			 'rpmforge'      => { map { $_ => 1 } ( 'perl-Test-Inline' ) },
 		       },
 	      };
@@ -131,7 +121,6 @@ foreach my $ver ( sort { $a <=> $b } key
 	$bdir =~ s/~S/$distrepo->{$ver}->{repo}/;
 	$bdir =~ s/~s/$ver/;
 	$bdir =~ s/~C/$distrepo->{$ver}->{centos}/;
-	$bdir =~ s/~F/$distrepo->{$ver}->{fedora}/;
 	for my $arch ( @archs, 'SRPMS/' ) {
 	    my $adir = $bdir;
 	    if ( $arch eq 'SRPMS/' ) {