Added the remainder of Buchan Milne's patches.

(This used to be commit 7415c2446934902894253d08e4c7f8ec78073482)

diff --git a/packaging/Mandrake/makerpms-cvs.sh b/packaging/Mandrake/makerpms-cvs.sh
index 0faaf4d0ba1030db660dcc87d2ff177413ff00cc..72c75b772b57120a0b484ee64e4eb4d422492bc9 100644 (file)
--- a/packaging/Mandrake/makerpms-cvs.sh
+++ b/packaging/Mandrake/makerpms-cvs.sh
@@ -5,8 +5,8 @@
 
 [ $# -lt 1 ] &&  echo "Usage: $0 <Samba version>" && exit 1
 
-VERSION=$1cvs
-RELEASE=`date +%Y%m%d`
+VERSION=$1
+RELEASE=0.`date +%Y%m%d`
 shift
 
 # Replace PRELEASE and PVERSION with release number in all files ending with

diff --git a/packaging/Mandrake/winbind.init b/packaging/Mandrake/winbind.init
index 13ddb392d7c05a33c688ab5bc7d3b42853805a62..b7b452eb0b9e080c7720ae8274d945babfe74a3d 100644 (file)
--- a/packaging/Mandrake/winbind.init
+++ b/packaging/Mandrake/winbind.init
@@ -83,7 +83,7 @@ case "$1" in
        mdkstatus
        ;;
   condrestart)
-       [ -f /var/lock/subsys/winbind ] && restart || :
+       [ -f /var/lock/subsys/winbindd ] && restart || :
        ;;
   *)
        echo "Usage: $0 {start|stop|restart|status|condrestart}"