3 files changed, 49 insertions, 10 deletions
diff --git a/network/smb4k/doinst.sh b/network/smb4k/doinst.sh
index 1f8ff67ded..2b64e899f9 100644
--- a/network/smb4k/doinst.sh
+++ b/network/smb4k/doinst.sh
@@ -1,3 +1,18 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/dbus-1/system.d/de.berlios.smb4k.mounthelper.conf.new
+
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
@@ -8,3 +23,8 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
   fi
 fi
 
+# Reload messagebus service
+if [ -x etc/rc.d/rc.messagebus ]; then
+  chroot . /etc/rc.d/rc.messagebus reload
+fi
+
diff --git a/network/smb4k/smb4k.SlackBuild b/network/smb4k/smb4k.SlackBuild
index e328f2fd44..f03a890622 100644
--- a/network/smb4k/smb4k.SlackBuild
+++ b/network/smb4k/smb4k.SlackBuild
@@ -1,12 +1,30 @@
 #!/bin/sh
 
 # Slackware build script for smb4k
-# Project Homepage: http://smb4k.sourceforge.net/
 
-# Written by Roberto Neri <rneri@libero.it>
+# Copyright 2008-2012 Roberto Neri, Palermo, Italy
+#
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=smb4k
-VERSION=${VERSION:-0.10.12}
+VERSION=${VERSION:-1.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -52,7 +70,6 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-rm -rf build
 mkdir build
 cd build
   cmake \
@@ -61,7 +78,7 @@ cd build
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DMAN_INSTALL_DIR=/usr/man \
-    -DSYSCONF_INSTALL_DIR=/etc/kde \
+    -DSYSCONF_INSTALL_DIR=/etc \
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
     ..
   make
@@ -71,11 +88,13 @@ cd ..
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+mv $PKG/etc/dbus-1/system.d/de.berlios.smb4k.mounthelper.conf \
+  $PKG/etc/dbus-1/system.d/de.berlios.smb4k.mounthelper.conf.new
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS BUGS ChangeLog COPYING FAQ README TODO \
+  AUTHORS BUGS ChangeLog COPYING README TODO \
   $PKG/usr/doc/$PRGNAM-$VERSION
-( cd $PKG/usr/doc/$PRGNAM-$VERSION ; chmod 644 * )
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/smb4k/smb4k.info b/network/smb4k/smb4k.info
index bff67b3e60..5635206a39 100644
--- a/network/smb4k/smb4k.info
+++ b/network/smb4k/smb4k.info
@@ -1,8 +1,8 @@
 PRGNAM="smb4k"
-VERSION="0.10.12"
+VERSION="1.0.0"
 HOMEPAGE="http://smb4k.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/smb4k/smb4k-0.10.12.tar.bz2"
-MD5SUM="26205c779461d1e0ec07b310a6cbabf1"
+DOWNLOAD="http://downloads.sourceforge.net/smb4k/smb4k-1.0.0.tar.bz2"
+MD5SUM="d00b71aac63aa9c68e68e5980c07a01b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Roberto Neri"