Update to 0.15.0

1 files changed, 11 insertions, 13 deletions

diff --git a/qemu-kvm/build/qemu-kvm.SlackBuild b/qemu-kvm/build/qemu-kvm.SlackBuild
index b0241b49..ccf96300 100755
--- a/qemu-kvm/build/qemu-kvm.SlackBuild
+++ b/qemu-kvm/build/qemu-kvm.SlackBuild
@@ -34,6 +34,8 @@
 #             * Initial build.
 # 0.14.0-1:   28/mar/2011 by Eric Hameleers <alien@slackware.com>
 #             * Update.
+# 0.15.0-1:   14/aug/2011 by Eric Hameleers <alien@slackware.com>
+#             * Update.
 # 
 # Run 'sh qemu-kvm.SlackBuild' to build a Slackware package.
 # The package (.tgz) and .txt file as well as build logs are created in /tmp .
@@ -44,7 +46,7 @@
 # Set initial variables:
 
 PRGNAM=qemu-kvm
-VERSION=${VERSION:-0.14.0}
+VERSION=${VERSION:-0.15.0}
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:" -j4 "}
 TAG=${TAG:-alien}
@@ -146,8 +148,10 @@ tar -xvf ${SOURCE}
 cd ${PRGNAM}-${VERSION}
 
 # Fix for build error (0.14.0 only):
-cat $SRCDIR/qemu-kvm.nopci.patch | patch -p1 --verbose 2>&1 \
-  | tee $OUTPUT/patch-$PRGNAM.log
+if [ "${VERSION}" = "0.14.0" ]; then
+  cat $SRCDIR/qemu-kvm.nopci.patch | patch -p1 --verbose 2>&1 \
+    | tee $OUTPUT/patch-$PRGNAM.log
+fi
 
 chown -R root:root .
 chmod -R u+w,go+r-w,a+X-s .
@@ -182,15 +186,13 @@ make DESTDIR=$PKG install 2>&1 | tee $OUTPUT/install-${PRGNAM}.log
 install -m0775 kvm/kvm_stat $PKG/usr/bin/kvm_stat
 
 # Preserve user modifications of this config file:
-# (note: this package *will* install the new .conf file, but first
-#        the existing .conf file will be backed up as .conf.orig)
 mv -i $PKG/etc/qemu/target-x86_64.conf{,.new}
 
 # Add this to the doinst.sh:
 mkdir -p $PKG/install
 cat <<EOINS >> $PKG/install/doinst.sh
 # Handle the incoming configuration files:
-config2() {
+config() {
   for infile in \$1; do
     NEW="\$infile"
     OLD="\`dirname \$NEW\`/\`basename \$NEW .new\`"
@@ -200,19 +202,15 @@ config2() {
     elif [ "\`cat \$OLD | md5sum\`" = "\`cat \$NEW | md5sum\`" ]; then
       # toss the redundant copy
       rm \$NEW
-    else
-      # Otherwise, move the existing file to an .orig extension,
-      # and let the new file take its place:
-      mv \$OLD \$OLD.orig
-      mv \$NEW \$OLD
     fi
+    # Otherwise, we leave the .new copy for the admin to consider...
   done
 }
 
-config2 etc/qemu/target-x86_64.conf.new
+config etc/qemu/target-x86_64.conf.new
 
 # We installed a UDEV rule, so let's reload the ruleset:
-if [ -x etc/rc.d/rc.udev reload ]; then
+if [ -x etc/rc.d/rc.udev ]; then
   chroot . /etc/rc.d/rc.udev reload
 fi
 EOINS