1 files changed, 69 insertions, 21 deletions
diff --git a/code/unix/setup/setup.xml b/code/unix/setup/setup.xml
index 085ff42..115dbe1 100644
--- a/code/unix/setup/setup.xml
+++ b/code/unix/setup/setup.xml
@@ -3,34 +3,82 @@
 	desc="ioquake3"
 	version="@VERSION@"
 	update_url="http://www.icculus.org/quake3/updates.txt"
-	promptbinaries="yes">
+	promptbinaries="yes"
+	reinstall="yes"
+	nopromptoverwrite="yes">
   <readme>
     README
   </readme>
-<!--
   <eula>
-   COPYING
+    id_patch_pk3s_Q3A_EULA.txt
   </eula>
--->
-  <component name="Default" version="@VERSION@" default="yes">
-   <option install="true" required="true">
-    Quake 3
 
-    <binary arch="any" libc="any" symlink="ioquake3" icon="quake3.png" play="yes"
-	    name="ioquake3">
-      ioquake3
-    </binary>
-    <files>
-      ioquake3.tar
-      quake3.png
-    </files>
+  <component name="Quake3 Arena gamedata" version="@VERSION@" showname="no" default="yes">
+   <option install="true" size="457M">
+     <help>
+       If you don't select this, you must make sure to copy pak0.pk3 to the
+       baseq3 directory manually.
+     </help>
+     Quake3 Arena gamedata
+     <files cdromid="CD 1" path="baseq3" size="457M">
+       Quake3/baseq3/pak0.pk3
+     </files>
    </option>
-   <option install="false" required="false">
-    Quake 3 Demo start script
-    <binary arch="any" libc="any" symlink="ioq3demo" icon="quake3.png" play="no"
-	    name="ioquake3 (Demo)">
-      ioq3demo
-    </binary>
+   <option required="true" install="true" show="false">
+     <files path="baseq3">
+       idpatchpk3s.tar
+     </files>
+     <files path="">
+       COPYING
+     </files>
    </option>
   </component>
+
+  <component name="Quake3 Team Arena gamedata" version="@VERSION@" showname="no" default="yes">
+   <option install="true" size="457M">
+     <help>
+       If you don't select this, you must make sure to copy the TA pak0.pk3 to the
+       missionpack directory manually.
+     </help>
+     Quake3 Team Arena gamedata
+     <files cdromid="CD 2" path="missionpack" size="457M">
+       Setup/missionpack/pak0.pk3
+     </files>
+   </option>
+  </component>
+  <component arch="x86_64" name="x86_64" version="@VERSION@" showname="no">
+    <option arch="x86_64" install="true">
+     64 bit binaries
+     <binary arch="any" libc="any" symlink="ioquake3" icon="quake3.png"
+             menu="." name="ioquake3">
+       ioquake3
+     </binary>
+     <files>
+       ioquake3.x86_64.tar
+       quake3.png
+     </files>
+    </option>
+  </component>
+
+  <component if="|(x86,x86_64)" name="i386" version="@VERSION@" showname="no">
+    <option arch="x86_64" install="true">
+     32 bit binaries
+     <binary arch="any" libc="any" symlink="ioquake3" icon="quake3.png"
+             menu="." name="ioquake3">
+       ioquake3
+     </binary>
+     <files>
+       ioquake3.i386.tar
+       quake3.png
+     </files>
+    </option>
+  </component>
+
+  <cdrom id="CD 1" name="Quake 3 Arena installation CD">
+    Setup/BaseEF/pak0.pk3
+  </cdrom>
+  <cdrom id="CD 2" name="Quake 3 Team Arena installation CD">
+    Setup/missionpack/pak0.pk3
+  </cdrom>
+
 </install>