--- builds_bin/update_repos	2009/12/01 16:17:48	1.52
+++ builds_bin/update_repos	2010/02/12 18:52:06	1.53
@@ -26,23 +26,23 @@ my $repotag = 'sme';
 
 my @archs = ( 'i386', 'x86_64' );
 
-my $distrepo = { '7' => { active   => 1,
-			  centos   => 4,
-			  fedora   => 3,
-			  repo     => '/releases/7/',
-			  os       => 'RPMS/',
-			  builds   => '/builds/smeserver-7-core/',
-			  contribs => '/builds/smeserver-7-contribs/',
-			  stage    => '/stage/7/',
+my $distrepo = { '7' => { active    => 1,
+			  centos    => 4,
+			  fedora    => 3,
+			  repo      => '/releases/7/',
+			  os        => 'RPMS/',
+			  builds    => '/builds/smeserver-7-core/',
+			  community => '/builds/smeserver-7-contribs/',
+			  stage     => '/stage/7/',
 			},
-		 '8' => { active   => 1,
-			  centos   => 5,
-			  fedora   => 6,
-			  repo     => '/releases/testing/8/',
-			  os       => '',
-			  builds   => '/builds/smeserver-8-core/',
-			  contribs => '/builds/smeserver-8-contribs/',
-			  stage    => '/stage/8/',
+		 '8' => { active    => 1,
+			  centos    => 5,
+			  fedora    => 6,
+			  repo      => '/releases/testing/8/',
+			  os        => '',
+			  builds    => '/builds/smeserver-8-core/',
+			  community => '/builds/smeserver-8-contribs/',
+			  stage     => '/stage/8/',
 			},
 	       };
 
@@ -61,7 +61,7 @@ my $repos = { "${repotag}os"
 	      '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 },
-	      'contribs'                  => { prio =>  2, 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 },
 	    };
 
@@ -105,7 +105,7 @@ my $skippkg = { '7' => { 'centos'
 			 'atrpms'        => { map { $_ => 1 } ( 'check4updates', 'dovecot', 'trac', 'yum' ) },
 		       },
 		'8' => { 'centos'        => { map { $_ => 1 } ( 'horde', 'imp-h3', 'ingo-h3', 'turba-h3' ) },
-			 'fedora'        => { map { $_ => 1 } ( 'kernel', 'kernel-xen' ) },
+			 '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' ) },
@@ -147,7 +147,7 @@ foreach my $ver ( sort { $a <=> $b } key
 	}
     }
     find( { wanted => sub { process_rpm($_, $ver, 'builds'); }, no_chdir => 1, follow_fast => 1 }, $distrepo->{$ver}->{'builds'} );
-    find( { wanted => sub { process_rpm($_, $ver, 'contribs'); }, no_chdir => 1, follow_fast => 1 }, $distrepo->{$ver}->{'contribs'} );
+    find( { wanted => sub { process_rpm($_, $ver, 'community'); }, no_chdir => 1, follow_fast => 1 }, $distrepo->{$ver}->{'community'} ) if $distrepo->{$ver}->{'community'};
 
     foreach my $base ( sort keys %$rpms ) {
 	next unless $rpms->{$base}->{rpms};
@@ -168,6 +168,7 @@ foreach my $ver ( sort { $a <=> $b } key
 		($tmp = $pkg->{svr}) =~ s{\.el\d\.at$}{}                 && $rpms->{$base}->{vers}->{$tmp} && last SRC;
 		($tmp = $pkg->{svr}) =~ s{\.el\d(\.rf)$}{$1}             && $rpms->{$base}->{vers}->{$tmp} && last SRC;
 		($tmp = $pkg->{svr}) =~ s{\.el\d\.rf$}{.el5}             && $rpms->{$base}->{vers}->{$tmp} && last SRC;
+		($tmp = $pkg->{svr}) =~ s{(\.el\d)\.rf$}{$1}             && $rpms->{$base}->{vers}->{$tmp} && last SRC;
 		($tmp = $pkg->{svr}) =~ s{(\d+)\.\d+\.el\d(\.rf)$}{$1$2} && $rpms->{$base}->{vers}->{$tmp} && last SRC;
 		($tmp = $pkg->{svr}) =~ s{\.el\d\.rf$}{.dag}             && $rpms->{$base}->{vers}->{$tmp} && last SRC;
 		($tmp = $pkg->{svr}) =~ s{(\d+)\.\d+\.el\d\.rf$}{$1.dag} && $rpms->{$base}->{vers}->{$tmp} && last SRC;
@@ -424,7 +425,8 @@ foreach my $ver ( sort { $a <=> $b } key
 	}
     }
     unless ( $opts{t} ) {
-	finddepth(sub{rmdir}, $distrepo->{$ver}->{$_}) foreach ('builds','contribs');
+	finddepth(sub{rmdir}, $distrepo->{$ver}->{builds}) if -d "$distrepo->{$ver}->{builds}";
+	finddepth(sub{rmdir}, $distrepo->{$ver}->{community}) if -d "$distrepo->{$ver}->{community}";
     }
 }