--- splitdistro.org	2003-06-03 15:24:02.000000000 +0900
+++ splitdistro	2003-06-03 15:32:02.000000000 +0900
@@ -5,8 +5,8 @@
 
 # These files appear on all binary CDs
 jointfiles = [ "beta_eula.txt", "RPM-GPG-KEY", "README", "GPL", "EULA"] 
-
-targetSize = 648 * 1024.0 * 1024.0
+cdsize = 698
+targetSize = cdsize * 1024.0 * 1024.0
 
 # Leave about 1.2MB of space on the disc
 fudgeFactor = 1.2 * 1024 * 1024
@@ -160,8 +160,6 @@
 disc2Dir = distDir + "-disc2"
 disc3Dir = distDir + "-disc3"
 disc1SrcDir = distDir + "-disc3"
-disc2SrcDir = distDir + "-disc4"
-disc3SrcDir = distDir + "-disc5"
 
 id = 0
 
@@ -199,11 +197,9 @@
 
 disc1used = totalsize - rpmsize - dirsize - srpmsize
 
-os.system("rm -rf %s %s %s %s" % ( disc1Dir, disc2Dir, disc1SrcDir,
-				   disc2SrcDir))
-os.system("mkdir -p %s %s/SRPMS %s/SRPMS %s/RedHat/RPMS %s/RedHat/RPMS %s/SRPMS" % 
-	    (disc1Dir, disc1SrcDir, disc2SrcDir, disc2Dir, 
-             disc3Dir, disc3SrcDir))
+os.system("rm -rf %s %s %s" % ( disc1Dir, disc2Dir, disc1SrcDir))
+os.system("mkdir -p %s %s/SRPMS %s/RedHat/RPMS %s/RedHat/RPMS" % 
+	    (disc1Dir, disc1SrcDir, disc2Dir, disc3Dir))
 
 print "Creating disc1..."
 
@@ -211,7 +207,7 @@
 stamp(disc1Dir, releasestr, "1", arch, startedAt, dirInfo)
 
 # remove the srpms dir from disc1 since it shouldn't be there
-os.system("rm -rf %s/SRPMS" % (disc1Dir,))
+os.system("rm -rf %s/SRPMS %s/rh??upd %s/rh??old" % (disc1Dir,disc1Dir,disc1Dir))
 
 print "Creating disc2..."
 stamp(disc2Dir, releasestr, "2", arch, startedAt, dirInfo)
@@ -247,35 +243,11 @@
 	  disc3pkgs);
 disc3used = spaceUsed(disc3Dir)
 
-print "Creating first source disc..."
-os.system("cp -al %s %s" % (srcDir, disc1SrcDir))
-
-print "Creating second source disc..."
-stamp(disc2SrcDir, releasestr, "4", arch, startedAt, dirInfo)
-
-srcPkgList = os.listdir("%s/SRPMS" % disc1SrcDir)
-srcPkgList.sort()
-srcPkgList.reverse()
-disc2pkgs = excessFiles(srcDir, srcPkgList,
-			targetSize - disc3used - fudgeFactor)
-print "first src pkg to move to 2nd src cd is", disc2pkgs[0]
-moveFiles("%s/SRPMS" % disc1SrcDir, 
-	  "%s/SRPMS" % disc2SrcDir, 
-	  disc2pkgs);
-srcDisc1Size = spaceUsed(disc1SrcDir)
-
-print "Dropping remainder of sources on third disc..."
-stamp(disc3SrcDir, releasestr, "5", arch, startedAt, dirInfo)
-disc3pkgs = excessFiles(srcDir, srcPkgList,
-                        srcDisc1Size - disc3used + targetSize - fudgeFactor)
-print "first src pkg to move to 3rd src cd is", disc3pkgs[0]
-moveFiles("%s/SRPMS" % disc2SrcDir,
-          "%s/SRPMS" % disc3SrcDir,
-          disc3pkgs)
+#print "Creating first source disc..."
+#os.system("cp -al %s %s" % (srcDir, disc1SrcDir))
 
 #sys.exit(0)
 
 sys.stdout.flush()
 
-os.system("du -sh %s %s %s %s %s" % (disc1Dir, disc2Dir, disc3Dir,
-                                     disc2SrcDir, disc3SrcDir))
+os.system("du -sh %s %s %s" % (disc1Dir, disc2Dir, disc3Dir))