--- splitdistro	Tue Feb 27 00:49:39 2007
+++ splitdistro.orig	Fri Mar  2 18:51:24 2007
@@ -1,12 +1,16 @@
 #!/usr/bin/python
+#
+# Modified By Pochi_ken
+#
 
 # These dirs, along with RPMS, make up disc 2
 disc2dirs = [ "preview" ]
 
 # These files appear on all binary CDs
-jointfiles = [ "beta_eula.txt", "RPM-GPG-KEY", "README", "autorun" ]
+jointfiles = [ "EULA", "RPM-GPG-KEY", "README", "autorun" ]
 
-targetSize = 640 * 1024.0 * 1024.0
+cdSize = 690
+targetSize = cdSize * 1024.0 * 1024.0
 
 # Leave about 1.2MB of space on the disc
 fudgeFactor = 1.2 * 1024 * 1024
@@ -110,23 +114,14 @@
 
 arch = extra[1]
 distDir = os.path.normpath(extra[0] + "/" + arch)
-srcDir = os.path.normpath(extra[0] + "/SRPMS")
 
 if not os.path.isdir(distDir):
     print "error: %s is not a directory" % distDir
     sys.exit(1)
 
-if not os.path.isdir(srcDir):
-    print "error: %s is not a directory" % srcDir
-    sys.exit(1)
-
 disc1Dir = distDir + "-disc1"
 disc2Dir = distDir + "-disc2"
 disc3Dir = distDir + "-disc3"
-disc1SrcDir = distDir + "-disc4"
-disc2SrcDir = distDir + "-disc5"
-# we have leftover space on the third disc to use for sources
-disc3SrcDir = distDir + "-disc3"
 
 id = 0
 
@@ -163,11 +158,9 @@
 
 disc1used = totalsize - rpmsize - dirsize
 
-os.system("rm -rf %s %s %s %s" % ( disc1Dir, disc2Dir, disc1SrcDir,
-				   disc2SrcDir))
-os.system("mkdir -p %s %s %s/SRPMS %s/RedHat/RPMS %s/RedHat/RPMS %s/SRPMS" % 
-	    (disc1Dir, disc1SrcDir, disc2SrcDir, disc2Dir, 
-             disc3Dir, disc3SrcDir))
+os.system("rm -rf %s %s" % ( disc1Dir, disc2Dir))
+os.system("mkdir -p %s %s/RedHat/RPMS %s/RedHat/RPMS" % 
+	    (disc1Dir, disc2Dir,disc3Dir)) 
 
 print "Creating disc1..."
 
@@ -211,32 +204,8 @@
 	  "%s/RedHat/RPMS" % disc3Dir, 
 	  disc3pkgs);
 
-print "Creating first source disc..."
-os.system("cp -al %s/. %s" % (srcDir, disc1SrcDir))
-stamp(disc1SrcDir, releasestr, "disc4", arch, startedAt)
-
-print "Creating second source disc..."
-stamp(disc2SrcDir, releasestr, "disc5", arch, startedAt)
-
-srcPkgList = os.listdir("%s/SRPMS" % disc1SrcDir)
-srcPkgList.sort()
-disc2pkgs = excessFiles(srcDir + "/SRPMS", srcPkgList,
-			targetSize - fudgeFactor)
-moveFiles("%s/SRPMS" % disc1SrcDir, 
-	  "%s/SRPMS" % disc2SrcDir, 
-	  disc2pkgs);
-srcDisc1Size = spaceUsed(disc1SrcDir)
-
-print "Dropping remainder of sources on third disc..."
-disc3pkgs = excessFiles(srcDir + "/SRPMS", srcPkgList,
-                        srcDisc1Size + targetSize - fudgeFactor)
-moveFiles("%s/SRPMS" % disc2SrcDir,
-          "%s/SRPMS" % disc3SrcDir,
-          disc3pkgs)
-
 #sys.exit(0)
 
 sys.stdout.flush()
 
-os.system("du -sh %s %s %s %s %s" % (disc1Dir, disc2Dir, disc3Dir,
-                                     disc1SrcDir, disc2SrcDir))
+os.system("du -sh %s %s %s" % (disc1Dir, disc2Dir, disc3Dir))