--- builds_bin/update_repos	2010/04/08 20:03:57	1.56
+++ builds_bin/update_repos	2010/08/15 16:27:13	1.59
@@ -96,9 +96,10 @@ my $skippkg = { '7' => { 'centos'
 			 'rpmforge'      => { map { $_ => 1 } ( 'mod_auth_tkt', 'perl-Test-Inline', 'spamassassin' ) },
 			 'atrpms'        => { map { $_ => 1 } ( 'check4updates', 'dovecot', 'trac', 'yum' ) },
 		       },
-		'8' => { 'centos'        => { map { $_ => 1 } ( 'horde', 'imp-h3', 'ingo-h3', 'turba-h3' ) },
+		'8' => { 'atrpms'        => { map { $_ => 1 } ( 'gnupg' ) },
+			 'centos'        => { map { $_ => 1 } ( 'horde', 'imp-h3', 'ingo-h3', 'turba-h3' ) },
 			 'epel'          => { map { $_ => 1 } ( 'clamav', 'horde', 'libtalloc', 'libtdb', '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' ) },
-			 'rpmforge'      => { map { $_ => 1 } ( 'mod_auth_tkt', 'perl-Test-Inline', 'spamassassin' ) },
+			 'rpmforge'      => { map { $_ => 1 } ( 'libtalloc', 'mod_auth_tkt', 'perl-Test-Inline', 'spamassassin' ) },
 		       },
 	      };
 
@@ -124,7 +125,7 @@ foreach my $ver ( sort { $a <=> $b } key
 	for my $arch ( @archs, 'SRPMS/' ) {
 	    my $adir = $bdir;
 	    if ( $arch eq 'SRPMS/' ) {
-		$adir =~ s/~A.*/$arch/ if $arch eq 'SRPMS/';
+		$adir =~ s/~A.*/$arch/;
 	    } else {
 		$adir =~ s/~A/$arch/;
 	    }
@@ -156,15 +157,18 @@ 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\.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{\.el\d\.rf$}{.el5}             && $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{(\d+)\.\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;
 		($tmp = $pkg->{svr}) =~ s{\.el\d$}{}                     && $rpms->{$base}->{vers}->{$tmp} && last SRC;
+		($tmp = $pkg->{svr}) =~ s{\.el\d_}{_}                    && $rpms->{$base}->{vers}->{$tmp} && last SRC;
 		($tmp = $pkg->{svr}) =~ s{(-\d+)\.\d+\.el\d$}{$1}        && $rpms->{$base}->{vers}->{$tmp} && last SRC;
 		($tmp = $pkg->{svr}) =~ s{\.centos\d$}{}                 && $rpms->{$base}->{vers}->{$tmp} && last SRC;
-		($tmp = $pkg->{svr}) =~ s{\.el\d\.$disttag$}{}                && $rpms->{$base}->{vers}->{$tmp} && last SRC;
+		($tmp = $pkg->{svr}) =~ s{\.at$}{}                       && $rpms->{$base}->{vers}->{$tmp} && last SRC;
+		($tmp = $pkg->{svr}) =~ s{\.el\d\.$disttag$}{}           && $rpms->{$base}->{vers}->{$tmp} && last SRC;
 	    }
 	    if ( $rpms->{$base}->{vers}->{$tmp} ) {
 		foreach $tmp ( @{$rpms->{$base}->{vers}->{$tmp}} ) {
@@ -387,6 +391,21 @@ foreach my $ver ( sort { $a <=> $b } key
 		}
 	    }
 	}
+
+	if ( $rpms->{$base}->{srpms} ) {
+	    foreach my $pkg ( sort { $b->{rpm} cmp $a->{rpm} } @{$rpms->{$base}->{srpms}} ) {
+		next if $pkg->{done} || $repos->{$pkg->{repo}}->{orig} || $repos->{$pkg->{repo}}->{base};
+		$pkg->{delete}++;
+		my $src = $pkg->{rpm}->filename;
+		if ( ! $print && ($pkg->{delete} || $pkg->{repos} || $pkg->{nosig} ) ) {
+		    print "\n$base ($disttag$ver)\n", "=" x length("$base ($disttag$ver)"), "\n";
+		    $print++;
+		}
+		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};
+	    }
+	}
     }
 
     if ( %repochg ) {
@@ -400,11 +419,19 @@ foreach my $ver ( sort { $a <=> $b } key
 	    chomp $dir;
 	    print "rebuild $repo/$arch\n";
 	    unless ( $opts{t} ) {
-		if ( -f "$dir/repodata/comps.xml" ) {
-		    qx(createrepo --update --database --exclude *.src.rpm --exclude *-debuginfo-*.rpm --groupfile repodata/comps.xml $dir);
-		} else {
-		    qx(createrepo --update --database --exclude *.src.rpm --exclude *-debuginfo-*.rpm $dir);
-		}
+                if ( $dir =~ m{test/|-testing/} ) {
+                    if ( -f "$dir/repodata/comps.xml" ) {
+                        qx(createrepo --update --database --exclude *smeserver-release*.rpm --exclude *.src.rpm --exclude *-debuginfo-*.rpm --groupfile repodata/comps.xml $dir);
+                    } else {
+                        qx(createrepo --update --database --exclude *smeserver-release*.rpm --exclude *.src.rpm --exclude *-debuginfo-*.rpm $dir);
+                    }
+                } else {
+                    if ( -f "$dir/repodata/comps.xml" ) {
+                        qx(createrepo --update --database --exclude *.src.rpm --exclude *-debuginfo-*.rpm --groupfile repodata/comps.xml $dir);
+                    } else {
+                        qx(createrepo --update --database --exclude *.src.rpm --exclude *-debuginfo-*.rpm $dir);
+                    }
+                }
 		qx(repoview $dir);
 		qx(rm -rf $dir/.olddata) if -d "$dir/.olddata";
 		qx(rm -rf $dir/.repodata) if -d "$dir/.repodata";