--- a/create-pkgbuild	Sun Jul 17 03:06:02 2011 +0100
+++ b/create-pkgbuild	Tue Jul 19 20:26:39 2011 +0100
@@ -1,6 +1,7 @@
 #!/usr/bin/bash
 pfexec pkg set-publisher --enable oi-extras
-echo 'Installing pkgbuild from oi-extras...'
+
+echo 'Installing pkgbuild from oi-extras ...'
 pfexec pkg install pkgbuild
 pushd /usr/lib/pkgbuild-1.3.104
 sed 's/`uname -v`/"oi_151"/' rpm_package.pm > /var/tmp/pkgbuild-herzen/rpm_package.pm
@@ -8,14 +9,16 @@
 sed 's/-ba/-bb/' pkgtool.pl > /var/tmp/pkgbuild-herzen/pkgtool.pl
 pfexec mv /var/tmp/pkgbuild-herzen/pkgtool.pl .
 popd
+
 echo 'Building SFEperl-xml-parser and perl/SFEperl-xml-xpath...'
 mkdir -p ../logs/$1
-# Might as well build xz now, so as not to disturb the ordering in packages.xml
-pkgtool build --update --logdir=/export/home/herzen/logs/$1 perl/SFEperl-xml-parser.spec perl/SFEperl-xml-xpath.spec SFExz.spec
-echo 'Building pkgbuild...'
+pkgtool build --update --logdir=/export/home/herzen/logs/$1 SFEperl-xml-parser.spec SFEperl-xml-xpath.spec
+
+echo 'Building pkgbuild ...'
 pkgtool build-only --logdir=/export/home/herzen/logs/$1 --patches=/export/home/herzen/spec-files-extra-oi/pkgbuild/patches ../spec-files-extra-oi/pkgbuild/pkgbuild.spec
-echo 'Unistalling oi-extras' pkgbuild and xz and installing our pkgbuild
-pfexec pkg uninstall pkgbuild xz
+
+echo 'Unistalling oi-extras' pkgbuild and installing our pkgbuild
+pfexec pkg uninstall pkgbuild
 pfexec pkg set-publisher --disable oi-extras
 pfexec pkg install pkgbuild
 pushd /usr/lib/pkgbuild-1.3.103
@@ -23,3 +26,9 @@
 pfexec mv /var/tmp/pkgbuild-herzen/rpm_package.pm .
 pfexec chown root:bin rpm_package.pm
 popd
+
+# Might as well build xz now, so as not to disturb the ordering in packages.xml
+echo 'Building SFExz ...'
+pkgtool build-only --logdir=/export/home/herzen/logs/$1 SFExz.spec
+pfexec pkg uninstall SFExz
+pfexec pkg install xz