--- builds_bin/build_ISO	2009/11/03 22:35:28	1.29
+++ builds_bin/build_ISO	2010/07/24 15:28:38	1.33
@@ -15,6 +15,19 @@ then
     exit 1
 fi
 
+# remove package that are no longer in the distro
+if [ "$distrel" == "8" ]
+then
+    find -name 'samba-*.sme.*' -print0 -o \
+         -name 'libsmbclient-*.sme.*' -print0 -o \
+         -name 'libtalloc-*.sme.*' -print0 -o \
+         -name 'libtdb-*.sme.*' -print0 -o \
+         -name 'tdb-tools-*.sme.*' -print0 \
+         -name 'libtdb-*.sme.*' -print0 \
+    | xargs -r0 rm
+fi
+
+
 for img in product updates
 do
     if [ "$distrel" == "7" ]
@@ -53,7 +66,7 @@ then
 	$(pwd)/$distarch/
 fi
 
-rm -f ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso ../iso/$distrel/$distarch/$disttag.iso
+rm -f ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso* ../iso/$distrel/$distarch/$disttag-$distarch.iso
 rm -f ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.jigdo ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.template
 
 if [ "$distrel" == "7" ]
@@ -85,8 +98,8 @@ dd if=/dev/zero bs=2048 count=150 >> ../
 md5sum ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso | sed 's,\.\..*/,,' > ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso.md5sum
 sha1sum ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso | sed 's,\.\..*/,,' > ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso.sha1sum
 zsyncmake -u $disttag-$distvers-$distarch.iso -o ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso.zsync ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso
-mv ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso ../iso/$distrel/$distarch/$disttag.iso
-ln -sf $disttag.iso ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso
+mv ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso ../iso/$distrel/$distarch/$disttag-$distarch.iso
+ln -sf $disttag-$distarch.iso ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso
 
 rsync -a --delete --delete-excluded \
     --exclude 'repodata/' --exclude 'product/' --exclude 'updates/' --exclude 'repoview/' \
@@ -103,7 +116,7 @@ rm -rf $distarch.jigdo/
 
 if [ -d SRPMS -a "$distarch" == "i386" ]
 then
-    rm -f ../iso/$distrel/source/$disttag-$distvers-SRPMS.iso ../iso/$distrel/source/$disttag-SRPMS.iso
+    rm -f ../iso/$distrel/source/$disttag-$distvers-SRPMS.iso* ../iso/$distrel/source/$disttag-SRPMS.iso
 
     mkisofs $mkisopts \
 	-V "$distname $distvers SRPMS" \