--- builds_bin/update_repos	2007/12/11 06:24:14	1.31
+++ builds_bin/update_repos	2007/12/23 22:24:41	1.35
@@ -49,7 +49,7 @@ my $repos = { 'smeos'              => {
 	      'smeupdates-testing' => { prio => 16, inc => 1, ver => 1, rel => 1 },
 	      'smeextras'          => { prio => 15, inc => 0, ver => 1, rel => 1 },
 	      'smeaddons'          => { prio => 14, inc => 0, ver => 1, rel => 1 },
-	      'smecontribs'        => { prio => 13, inc => 0, ver => 1, rel => 2 },
+	      'smecontribs'        => { prio => 13, inc => 0, ver => 1, rel => 1 },
 	      'smetest'            => { prio => 12, inc => 0, ver => 2, rel => 2, devel => 2 },
 	      'smedev'             => { prio => 11, inc => 0, ver => 2, rel => 2, devel => 1 },
 	      'centos'             => { prio => 10, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 },
@@ -97,13 +97,13 @@ if ( $opts{q} ) {
 }
 
 my $skippkg = { '7' => { 'centos'        => { map { $_ => 1 } ( 'horde', 'imp-h3', 'ingo-h3', 'turba-h3', 'vim' ) },
-			 'epel'          => { map { $_ => 1 } ( 'perl-Razor-Agent' ) },
+			 'epel'          => { map { $_ => 1 } ( 'clamav', 'perl-Razor-Agent' ) },
 			 'rpmforge'      => { map { $_ => 1 } ( 'perl-Test-Inline' ) },
 			 'atrpms'        => { map { $_ => 1 } ( 'dovecot', 'trac', 'yum' ) },
 		       },
 		'8' => { 'centos'        => { map { $_ => 1 } ( 'horde', 'imp-h3', 'ingo-h3', 'turba-h3' ) },
 			 'fedora'        => { map { $_ => 1 } ( 'kernel-xen' ) },
-			 'epel'          => { map { $_ => 1 } ( 'perl-Razor-Agent', 'smolt' ) },
+			 'epel'          => { map { $_ => 1 } ( 'clamav', 'perl-Razor-Agent', 'smolt' ) },
 			 'fedora-extras' => { map { $_ => 1 } ( 'dstat', 'gocr', 'horde', 'oidentd', 'perl-Test-Inline', 'perl-Razor-Agent', 'smolt' ) },
 			 'rpmforge'      => { map { $_ => 1 } ( 'perl-Test-Inline' ) },
 		       },
@@ -147,6 +147,7 @@ foreach my $smever ( sort { $a <=> $b }
     find( { wanted => sub { process_rpm($_, $smever, 'contribs'); }, no_chdir => 1, follow_fast => 1 }, $distrepo->{$smever}->{'contribs'} );
 
     foreach my $base ( sort keys %$rpms ) {
+	next unless $rpms->{$base}->{rpms};
 	my %track = ();
 	my %seen = ();
 	my %counts = ();
@@ -242,6 +243,8 @@ foreach my $smever ( sort { $a <=> $b }
 		    if ( $track{repo} eq $cmp->{repo} ) {
 			if ( verrel($cmp, $cmp->{repo}, \%counts) ) {
 			    $cmp->{delete}++ unless $repos->{$cmp->{repo}}->{base};
+			} elsif ( $cmp->{src} ) {
+			    $cmp->{delete}++ unless $repos->{$cmp->{repo}}->{base};
 			} else {
 			    $track{svr} = $cmp->{svr};
 			}
@@ -271,9 +274,9 @@ foreach my $smever ( sort { $a <=> $b }
 		    }
 		}
 	    } elsif ( scalar keys %pkgs && $opts{s} ) {
-		print "\n * missing source (", $pkg->{repo}, ", ", $pkg->{svr}, ")\n";
+		print "\n * missing source (sme$smever, ", $pkg->{repo}, ", ", $pkg->{svr}, ")\n";
 	    }
-	    print "\n * missing originals (", $pkg->{repo}, ", ", $pkg->{svr}, ")\n" if $opts{o} && scalar keys %orig != scalar keys %pkgs;
+	    print "\n * missing originals (sme$smever, ", $pkg->{repo}, ", ", $pkg->{svr}, ")\n" if $opts{o} && scalar keys %orig != scalar keys %pkgs;
 	}
 
 	foreach my $r ( keys %$acnt ) {
@@ -305,7 +308,7 @@ foreach my $smever ( sort { $a <=> $b }
 
 	    my $src = $pkg->{rpm}->filename;
 	    if ( $pkg->{nosig} ) {
-		print "sign package (", $pkg->{repo}, ", ", basename($pkg->{rpm}->filename), ")\n";
+		print "sign package (", basename($pkg->{rpm}->filename), ")\n";
 		unless ( $opts{t} ) {
 		    qx(cat $HOME/.rpmpass | setsid rpm --addsign $src >& /dev/null);
 		    if ($?) {
@@ -349,7 +352,7 @@ foreach my $smever ( sort { $a <=> $b }
 		}
 		qx(rm -f $src) if exists $pkg->{delete} && ! $opts{t};
 	    } elsif ( $pkg->{delete} ) {
-		print "delete from ", $pkg->{repo}, " (", basename($pkg->{rpm}->filename), ")\n";
+		print "delete from ", $pkg->{repo}, " (", $pkg->{arch}, ", ", basename($pkg->{rpm}->filename), ")\n";
 		qx(rm -f $src) unless $opts{t};
 		$repochg{$pkg->{repo}}++ unless $repos->{$pkg->{repo}}->{base} || $repos->{$pkg->{repo}}->{stage};
 	    }
@@ -368,7 +371,7 @@ foreach my $smever ( sort { $a <=> $b }
 	    print "rebuild $repo/$arch\n";
 	    unless ( $opts{t} ) {
 		if ( -f "$dir/repodata/comps.xml" ) {
-		    qx(createrepo -g $dir/repodata/comps.xml $dir);
+		    qx(createrepo -g repodata/comps.xml $dir);
 		} else {
 		    qx(createrepo $dir);
 		}
@@ -438,6 +441,11 @@ sub process_rpm {
     return if $skippkg->{$smever}->{$repo} && $skippkg->{$smever}->{$repo}->{$src};
     return if $repos->{$repo}->{base} && $nosig;
     if ( $nosig && ! -f "$HOME/.rpmpass" ) { print " * missing signature (" .$pkg->filename . ")\n"; return; }
+    my $arch = 'unknown';
+    $arch = 'SRPMS' if $pkg->filename =~ m{[/-](SRPMS?|src|source)/};
+    $arch = 'x86_64' if $pkg->filename =~ m{[/-]x86_64/};
+    $arch = 'i386' if $pkg->filename =~ m{[/-](i[356]86)/};
+    $arch = 'noarch' if $pkg->filename =~ m{[/-]noarch/};
 
     my $rpmhash = { base  => $src,
 		    name  => $pkg->name,
@@ -445,6 +453,7 @@ sub process_rpm {
 		    nvra  => $pkg->name.'-'.$pkg->version.'-'.$pkg->release.'.'.( $pkg->is_source_package ? 'src' : $pkg->tag('ARCH') ),
 		    svr   => $src.'-'.$version.'-'.$release,
 		    src   => $pkg->is_source_package,
+		    arch  => $arch,
 		    ver   => $version,
 		    rel   => $release,
 		    rpm   => $pkg,