--- builds_bin/build_installer	2008/10/09 19:02:27	1.17
+++ builds_bin/build_installer	2011/06/14 18:20:44	1.22
@@ -39,7 +39,7 @@ then
 
     PYTHONPATH=/usr/lib/anaconda/ sudo /usr/lib/anaconda-runtime/buildinstall \
 	--product "$distname" \
-	--version "$distrel.0" \
+	--version "${distvers/[^0-9.]*/}" \
 	--release "$distname" \
 	--prodpath SME \
 	--pkgorder pkgorder.$distarch \
@@ -56,19 +56,21 @@ else
 	fi
     done
 
-    sed '/^cat .*pluginconf.d\/fedorakmod.conf.*<<.*EOF/,/^EOF$/s@^enabled.*@enabled = 0@' \
-        /usr/lib/anaconda-runtime/upd-instroot > upd-instroot
+    sed -e "/installforallkernels/ised -i 's|\\\\(enabled\\\\) = 1|\\\\1 = 0|' \$DEST/etc/yum/pluginconf.d/kmod.conf" \
+        -e 's|^usr/\(.*/libz.*\)|&\n\1|' /usr/lib/anaconda-runtime/upd-instroot > upd-instroot
     chmod 755 upd-instroot
     sudo chown root:root upd-instroot
 
     PYTHONPATH=/usr/lib/anaconda/ sudo /usr/lib/anaconda-runtime/buildinstall \
 	--product "$distname" \
-	--version "$distrel.0" \
+	--version "${distvers/[^0-9.]*/}" \
 	--release "$distname" \
 	--prodpath SME \
 	--bugurl http://bugs.contribs.org/ \
 	$(pwd)/$distarch/
+    sed -i 's/ALL/1/' $distarch/.discinfo
 
+    rm -rf $distarch/buildinstall.tree.*/
     sudo rm upd-instroot
 fi