--- builds_bin/update_repos	2010/02/24 18:14:55	1.54
+++ builds_bin/update_repos	2010/07/24 15:28:38	1.58
@@ -93,12 +93,13 @@ 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' ) },
-			 'rpmforge'      => { map { $_ => 1 } ( 'perl-Test-Inline' ) },
+			 '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' ) },
-			 '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' ) },
-			 'rpmforge'      => { map { $_ => 1 } ( 'perl-Test-Inline' ) },
+		'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 } ( 'libtalloc', 'mod_auth_tkt', 'perl-Test-Inline', 'spamassassin' ) },
 		       },
 	      };
 
@@ -260,20 +261,18 @@ foreach my $ver ( sort { $a <=> $b } key
 			    my $dest = $repos->{$track{repo}}->{prio} > $repos->{$devel2}->{prio} ? $track{repo} : $devel2;
 			    $dest = pkgdest($cmp, $devel1, $dest, $rpms->{$base}->{rpms});
 			    $dest = $devel1 if verrel($cmp, $dest, \%counts);
-			    if ( $cmp->{src} && ! $reposrc{$dest} ) {
-				$cmp->{delete}++;
-			    } elsif ( $repos->{$dest}->{prio} >= $repos->{$track{repo}}->{prio} && ! verrel($cmp, $dest, \%counts) ) {
-				unless ( $repos->{$cmp->{repo}}->{base} ) {
-				    my $tag = sprintf '%s%s/%s-%s', $distrepo->{$ver}->{$cmp->{repo}}, $cmp->{name}, $cmp->{ver}, $cmp->{rel};
-				    qx(touch $tag/PUSHED) if ! $opts{t} && -d $tag && ! -f "$tag/PUSHED";
+			    unless ( $cmp->{src} && ! $reposrc{$dest} ) {
+                                if ( $repos->{$dest}->{prio} >= $repos->{$track{repo}}->{prio} && ! verrel($cmp, $dest, \%counts) ) {
+                                    unless ( $repos->{$cmp->{repo}}->{base} ) {
+                                        my $tag = sprintf '%s%s/%s-%s', $distrepo->{$ver}->{$cmp->{repo}}, $cmp->{name}, $cmp->{ver}, $cmp->{rel};
+                                        qx(touch $tag/PUSHED) if ! $opts{t} && -d $tag && ! -f "$tag/PUSHED";
+                                    }
+                                    push @{$cmp->{repos}}, $dest;
+                                    $cmp->{oldrepo} = $cmp->{repo} unless $cmp->{oldrepo};
+                                    $cmp->{repo} = $dest;
+                                    $reposrc{$cmp->{repo}}->{srpm} = $cmp if $cmp->{src};
+                                    $orig{$cmp->{nvra}}++;
 				}
-				push @{$cmp->{repos}}, $dest;
-				$cmp->{oldrepo} = $cmp->{repo} unless $cmp->{oldrepo};
-				$cmp->{repo} = $dest;
-				$reposrc{$cmp->{repo}}->{srpm} = $cmp if $cmp->{src};
-				$orig{$cmp->{nvra}}++;
-			    } else {
-				$cmp->{delete}++;
 			    }
 			} else {
 			    $cmp->{delete}++;
@@ -402,11 +401,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";