Author: hawk                         Date: Tue May  4 18:47:15 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- for Titanium revert default passdb backend to smbpasswd, we won't change
  long lasting default breaking current samba configurations

---- Files affected:
packages/samba:
   samba.spec (1.484 -> 1.485) 

---- Diffs:

================================================================
Index: packages/samba/samba.spec
diff -u packages/samba/samba.spec:1.484 packages/samba/samba.spec:1.485
--- packages/samba/samba.spec:1.484     Mon Apr 12 14:23:39 2010
+++ packages/samba/samba.spec   Tue May  4 20:47:09 2010
@@ -54,7 +54,7 @@
 Summary(zh_CN.UTF-8):  Samba 客户端和服务器
 Name:          samba
 Version:       3.5.2
-Release:       2
+Release:       3
 Epoch:         1
 License:       GPL v3
 Group:         Networking/Daemons
@@ -76,6 +76,7 @@
 Patch2:                %{name}-pthread.patch
 Patch3:                %{name}-nscd.patch
 Patch4:                %{name}-lprng-no-dot-printers.patch
+Patch5:                %{name}-passdb-smbpasswd.patch
 URL:           http://www.samba.org/
 BuildRequires: acl-devel
 BuildRequires: autoconf
@@ -1034,6 +1035,9 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%if "%{pld_release}" == "ti"
+%patch5 -p1
+%endif
 
 %{__sed} -i 's#%SAMBAVERSION%#%{version}#' docs/htmldocs/index.html
 
@@ -1238,6 +1242,7 @@
        /sbin/chkconfig --add smb
 fi
 
+%if "%{pld_release}" != "ti"
 %triggerpostun -- samba < 3.4.0
 %banner %{name} << EOF
 !!! WARNING !!! The default passdb backend has been changed to 'tdbsam'!
@@ -1245,6 +1250,7 @@
 Please use 'passdb backend = smbpasswd' if you would like to stick to the 
'smbpasswd'
 backend or convert your smbpasswd entries using e.g. 'pdbedit -i smbpasswd -e 
tdbsam'.
 EOF
+%endif
 
 %files
 %defattr(644,root,root,755)
@@ -1697,6 +1703,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.485  2010/05/04 18:47:09  hawk
+- for Titanium revert default passdb backend to smbpasswd, we won't change
+  long lasting default breaking current samba configurations
+
 Revision 1.484  2010/04/12 12:23:39  baggins
 - rel 2
 
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/samba/samba.spec?r1=1.484&r2=1.485&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to