packaging updates from Buchan

(This used to be commit b67929cc3e2339e0865f2924b930f1d834c20ed9)

diff --git a/packaging/Mandrake/samba2.spec.tmpl b/packaging/Mandrake/samba2.spec.tmpl
index cff54d146b63e07619dbcb35796730ddae7eabb8..127aee48d8e49d0d5850c463aa9b8e0ed2b76edd 100644 (file)
--- a/packaging/Mandrake/samba2.spec.tmpl
+++ b/packaging/Mandrake/samba2.spec.tmpl
@@ -14,11 +14,12 @@
 
 %define pkg_name       samba
 %define ver            3.0.1pre3
-%define rel            3mdk
+%define rel            5mdk
 %define vscanver       0.3.3beta1
 %define libsmbmajor    0
 
-%{!?mklibname: %define mklibname %lib%{1}%{?2:%{2}}%{?3:_%{3}}%{-s:-static}%{-d:-devel}}
+%{!?lib: %global lib lib}
+%{!?mklibname: %global mklibname(ds) %lib%{1}%{?2:%{2}}%{?3:_%{3}}%{-s:-static}%{-d:-devel}}
 
 %define libname %mklibname smbclient %libsmbmajor
 
@@ -1647,7 +1648,13 @@ update-alternatives --auto smbclient
 %exclude %{_mandir}/man1/smbsh*.1*
 
 %changelog
-* Sun Nov 16 2003 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.1-0.rpe3.3mdk
+* Fri Dec 05 2003 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.1-0.pre3.5mdk
+- Allow winbind to start if old winbind ranges are used (ease upgrades)
+
+* Tue Nov 18 2003 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.1-0.pre3.4mdk
+- Fix build as system on 8.2 (and probably earlier)
+
+* Sun Nov 16 2003 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.1-0.pre3.3mdk
 - Ensure printer drivers keep permissions by default (setgid and inherit perms)
 
 * Fri Nov 14 2003 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.1-0.pre3.2mdk

diff --git a/packaging/Mandrake/winbind.init b/packaging/Mandrake/winbind.init
index e5bc9adcbfef62ffdc0c3f31ee775e9f504b6e9d..06e5b375d0c23443153f645cb448389bdc063ef7 100644 (file)
--- a/packaging/Mandrake/winbind.init
+++ b/packaging/Mandrake/winbind.init
@@ -28,7 +28,7 @@ RETVAL=0
 start() {
        echo -n "Starting Winbind services: "
        RETVAL=1
-       if [ "`grep -i 'idmap uid' /etc/samba/smb.conf | egrep -v [\#\;]`" -a "`grep -i 'idmap gid' /etc/samba/smb.conf | egrep -v [\#\;]`" ]; then
+       if [ "`grep -i -E '(idmap|winbind) uid' /etc/samba/smb.conf | egrep -v [\#\;]`" -a "`grep -i -E '(idmap|winbind) gid' /etc/samba/smb.conf | egrep -v [\#\;]`" ]; then
                daemon winbindd
                RETVAL=$?
        else