--- builds_bin/build_installer	2005/11/23 20:15:08	1.3
+++ builds_bin/build_installer	2006/06/30 00:18:36	1.4
@@ -27,6 +27,7 @@ done
 
 distname='SME Server'
 distvers=$(basename $(pwd))
+distarch=i386
 
 for img in product updates
 do
@@ -41,7 +42,7 @@ PYTHONPATH=/usr/lib/anaconda/ /usr/lib/a
 
 PYTHONPATH=/usr/lib/anaconda/ /usr/lib/anaconda-runtime/pkgorder \
 	$(pwd)/cdrom.image \
-	i386 > pkgorder
+	$distarch > pkgorder
 
 PACKAGES="acl anaconda anaconda-help anaconda-images anaconda-runtime ash
 	  atk attr audiofile audit-libs bash beecrypt bitmap-fonts-cjk bogl
@@ -74,29 +75,35 @@ PACKAGES="acl anaconda anaconda-help ana
 	  xorg-x11-ISO8859-9-75dpi-fonts xorg-x11-KOI8-R xorg-x11-KOI8-R-75dpi-fonts
 	  xorg-x11-libs xorg-x11-libs-data xorg-x11-xfs zlib"
 
-for PKG in $PACKAGES;
+for PKG in $PACKAGES
 do
-    PACKAGEFILE=$(rpm --qf "%{NAME} %{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}.rpm\n" --nodigest --nosignature -qp /mirrors/centos/4.2/updates/i386/RPMS/$PKG*{i386,noarch}.rpm | egrep "^$PKG " | sed 's/.* //')
-    if [ -n "$PACKAGEFILE" ];
+    PACKAGEFILES=$(rpm --qf "%{NAME} %{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}.rpm\n" --nodigest --nosignature -qp /mirrors/centos/4/updates/$distarch/RPMS/$PKG*.rpm | grep "^$PKG " | sed 's/.* //')
+    if [ -n "$PACKAGEFILES" ];
     then 
-	if [ ! -f $(pwd)/cdrom.image/CentOS/RPMS/$PACKAGEFILE ];
-	then 
-	    ln -sf /mirrors/centos/4.2/updates/i386/RPMS/$PACKAGEFILE $(pwd)/cdrom.image/CentOS/RPMS/$PACKAGEFILE
-	fi
-    else
-	PACKAGEFILE=$(rpm --qf "%{NAME} %{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}.rpm\n" --nodigest --nosignature -qp /mirrors/centos/4.2/os/i386/CentOS/RPMS/$PKG*{i386,noarch}.rpm | egrep "^$PKG " | sed 's/.* //')
-	if [ -n "$PACKAGEFILE" ];
-	then 
-	    if [ ! -f $(pwd)/cdrom.image/CentOS/RPMS/$PACKAGEFILE ];
+	for PKGFILE in $PACKAGEFILES
+	do
+	    if [ ! -f $(pwd)/cdrom.image/CentOS/RPMS/$PKGFILE ];
 	    then 
-		ln -sf /mirrors/centos/4.2/os/i386/CentOS/RPMS/$PACKAGEFILE $(pwd)/cdrom.image/CentOS/RPMS/$PACKAGEFILE
+		ln -sf /mirrors/centos/4/updates/$distarch/RPMS/$PKGFILE $(pwd)/cdrom.image/CentOS/RPMS/$PKGFILE
 	    fi
+	done
+    else
+	PACKAGEFILES=$(rpm --qf "%{NAME} %{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}.rpm\n" --nodigest --nosignature -qp /mirrors/centos/4/os/$distarch/CentOS/RPMS/$PKG*.rpm | grep "^$PKG " | sed 's/.* //')
+	if [ -n "$PACKAGEFILES" ];
+	then 
+	    for PKGFILE in $PACKAGEFILES
+	    do
+		if [ ! -f $(pwd)/cdrom.image/CentOS/RPMS/$PKGFILE ];
+		then 
+		    ln -sf /mirrors/centos/4/os/$distarch/CentOS/RPMS/$PKGFILE $(pwd)/cdrom.image/CentOS/RPMS/$PKGFILE
+		fi
+	    done
 	fi
     fi
 done
 
 PYTHONPATH=/usr/lib/anaconda/ sudo /usr/lib/anaconda-runtime/buildinstall \
-	--comp dist-4.1 \
+	--comp dist-4.3 \
 	--pkgorder pkgorder \
 	--release "$distname" \
 	--product "$distname" \