--- rpms/e-smith-samba/sme8/e-smith-samba.spec 2010/11/10 18:51:10 1.56 +++ rpms/e-smith-samba/sme8/e-smith-samba.spec 2011/12/23 21:28:16 1.68 @@ -1,10 +1,10 @@ -# $Id: e-smith-samba.spec,v 1.55 2010/11/05 19:06:46 slords Exp $ +# $Id: e-smith-samba.spec,v 1.67 2011/03/17 21:00:11 snetram Exp $ Summary: e-smith specific Samba configuration files and templates %define name e-smith-samba Name: %{name} %define version 2.2.0 -%define release 37 +%define release 46 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -38,6 +38,11 @@ Patch25: e-smith-samba-2.2.0-better-ldap Patch26: e-smith-samba-2.2.0-store_ldap_pw.patch Patch27: e-smith-samba-2.2.0-usergroup-mapping.patch Patch28: e-smith-samba-2.2.0-fixe_create_machine_accounts.patch +Patch29: e-smith-samba-2.2.0-force_uid_gid.patch +Patch30: e-smith-samba-2.2.0-migrate_machine_uid.patch +Patch31: e-smith-samba-2.2.0-create_samba_data_in_event.patch +Patch32: e-smith-samba-2.2.0-FixVFS_ExcludeSyntax.patch +Patch34: e-smith-samba-2.2.0-fix-separator.patch Obsoletes: e-smith-netlogon BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch @@ -54,17 +59,56 @@ Obsoletes: samba-common <= 3.1.0 Obsoletes: samba = 3.4.3-1.1.el5.sme Obsoletes: samba-client = 3.4.3-1.1.el5.sme Obsoletes: samba-common = 3.4.3-1.1.el5.sme +# Obsolete SerNet packages +Obsoletes: ldb-tools = 3.5.11-44.el4 +Obsoletes: libsmbclient-devel = 3.5.11-44.el4 +Obsoletes: libsmbclient0 = 3.5.11-44.el4 +Obsoletes: libwbclient-devel = 3.5.11-44.el4 +Obsoletes: libwbclient0 = 3.5.11-44.el4 +Obsoletes: samba3 = 3.5.11-44.el4 +Obsoletes: samba3-cifsmount = 3.5.11-44.el4 +Obsoletes: samba3-client = 3.5.11-44.el4 +Obsoletes: samba3-doc = 3.5.11-44.el4 +Obsoletes: samba3-utils = 3.5.11-44.el4 +Obsoletes: samba3-winbind = 3.5.11-44.el4 Requires: /usr/bin/tdbbackup AutoReqProv: no %changelog +* Fri Dec 23 2011 Jonathan Martens 2.2.0-46.sme +- Obsolete SerNet samba packages [SME: 6772] + +* Thu Mar 17 2011 Jonathan Martens 2.2.0-45.sme +- Revert directory requirement from 2.2.0-43 [SME: 6571] + +* Thu Mar 17 2011 Jonathan Martens 2.2.0-44.sme +- Revert changes made in 2.2.0-42 [SME: 6432] + +* Tue Mar 15 2011 Jonathan Martens 2.2.0-43.sme +- Fix separator in general smb.conf section for recycle:exclude* [SME: 6571] + +* Tue Mar 15 2011 Jonathan Martens 2.2.0-42.sme +- recycle:exclude_dir should contain directories [SME: 6432] + +* Sat Mar 12 2011 Gavin Weight 2.2.0-41.sme +- Fix Recycle Bin VFS Excludes syntax. [SME: 6432] + +* Tue Nov 30 2010 Daniel Berteaud 2.2.0-40.sme +- Create samba account during event for machine [SME: 6418] + +* Tue Nov 30 2010 Daniel Berteaud 2.2.0-39.sme +- Migrate existing machine uid in the DB (patch from Shad Lords) [SME: 6415] + +* Tue Nov 30 2010 Daniel Berteaud 2.2.0-38.sme +- Force uid/gid on machine accounts creation [SME: 6415] + * Wed Nov 10 2010 Daniel Berteaud 2.2.0-37.sme - Fix create-machine-accounts script [SME: 6358] -* Fri Nov 5 2010 Shad L. Lords 2.2.0-36.sme - Call samba-group-mapping after user events too [SME: 6339] -* Wed Nov 3 2010 Shad L. Lords 2.2.0-35.sme - Fix cpu critical patch missing ' [SME: 6330] * Wed Nov 3 2010 Daniel Berteaud 2.2.0-34.sme @@ -73,10 +117,10 @@ AutoReqProv: no * Wed Nov 3 2010 Daniel Berteaud 2.2.0-33.sme - Store the ldap admin pw early in the bootstrap-ldap-save event [SME: 6332] -* Wed Nov 3 2010 Shad L. Lords 2.2.0-32.sme - Make cpu calls critical only with ldap{Auth} is enabled [SME: 6330] -* Tue Nov 2 2010 Shad L. Lords 2.2.0-31.sme - Always use cpu, do unix if ldap{Auth} is disabled [SME: 6321] * Tue Nov 2 2010 Daniel Berteaud 2.2.0-30.sme @@ -1160,6 +1204,11 @@ Configuration files and templates for th %patch26 -p1 %patch27 -p1 %patch28 -p1 +%patch29 -p1 +%patch30 -p1 +%patch31 -p1 +%patch32 -p1 +%patch34 -p1 %build mkdir -p root/etc/e-smith/tests