--- builds_bin/update_repos	2011/10/04 19:48:59	1.67
+++ builds_bin/update_repos	2012/07/27 18:07:11	1.70
@@ -28,21 +28,21 @@ my @archs = ( 'i386', 'x86_64' );
 
 my $distrepo = { '7' => { active    => 1,
 			  centos    => 4,
-			  repo      => '/releases/7/',
+			  repo      => '/build/smeserver/repo/7/',
 			  os        => 'RPMS/',
-			  builds    => '/builds/smeserver-7-core/',
-			  community => '/builds/smeserver-7-contribs/',
-			  stage     => '/stage/7/',
+			  builds    => '/build/builds/smeserver-7-core/',
+			  community => '/build/builds/smeserver-7-contribs/',
+			  stage     => '/build/smeserver/stage/7/',
 			  sign      => 1,
 			  checksum  => 'sha',
 			},
 		 '8' => { active    => 1,
 			  centos    => 5,
-			  repo      => '/releases/testing/8/',
+			  repo      => '/build/smeserver/repo/8/',
 			  os        => '',
-			  builds    => '/builds/smeserver-8-core/',
-			  community => '/builds/smeserver-8-contribs/',
-			  stage     => '/stage/8/',
+			  builds    => '/build/builds/smeserver-8-core/',
+			  community => '/build/builds/smeserver-8-contribs/',
+			  stage     => '/build/smeserver/stage/8/',
 			  sign      => 1,
 			  checksum  => 'sha',
 			},
@@ -73,7 +73,7 @@ my $baserepo = { "~S${repotag}os/~A/$osd
 		 "~S${repotag}contribs/~A/RPMS/" => "${repotag}contribs",
 		 "~S${repotag}test/~A/RPMS/" => "${repotag}test",
 		 "~S${repotag}dev/~A/RPMS/" => "${repotag}dev",
-		 "/stage/~s/~A/$osdir/~O" => 'stage',
+		 "/build/smeserver/stage/~s/~A/$osdir/~O" => 'stage',
 		 '/mirrors/centos/~C/fasttrack/~A/RPMS/' => 'centos',
 		 '/mirrors/centos/~C/updates/~A/RPMS/' => 'centos',
 		 '/mirrors/centos/~C/os/~A/CentOS/~O' => 'centos',
@@ -102,12 +102,12 @@ 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' ) },
-			 'rpmforge'      => { map { $_ => 1 } ( 'dovecot', 'mod_auth_tkt', 'perl-Test-Inline', 'spamassassin' ) },
+			 'rpmforge'      => { map { $_ => 1 } ( 'dovecot', 'mod_auth_tkt', 'perl-Test-Inline', 'perl-libwww-perl', 'spamassassin' ) },
 			 'atrpms'        => { map { $_ => 1 } ( 'check4updates', 'dovecot', 'trac', 'yum' ) },
 		       },
 		'8' => { 'atrpms'        => { map { $_ => 1 } ( 'gnupg' ) },
 			 'centos'        => { map { $_ => 1 } ( 'horde', 'imp-h3', 'ingo-h3', 'turba-h3' ) },
-			 'epel'          => { map { $_ => 1 } ( 'clamav', 'horde', 'libtalloc', 'libtdb', 'oidentd', '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', 'smolt' ) },
+			 'epel'          => { map { $_ => 1 } ( 'clamav', 'fping', 'html2ps', 'horde', 'libtalloc', 'libtdb', 'oidentd', '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', 'smolt' ) },
 			 'rpmforge'      => { map { $_ => 1 } ( 'dovecot', 'libtalloc', 'mod_auth_tkt', 'perl-Test-Inline', 'spamassassin' ) },
 		       },
 	      };