--- rpms/e-smith-samba/sme8/e-smith-samba.spec 2011/03/12 17:40:12 1.62 +++ rpms/e-smith-samba/sme8/e-smith-samba.spec 2013/03/18 04:09:16 1.74 @@ -1,10 +1,10 @@ -# $Id: e-smith-samba.spec,v 1.61 2010/11/30 22:09:40 vip-ire Exp $ +# $Id: e-smith-samba.spec,v 1.73 2013/02/13 05:04:07 wellsi Exp $ Summary: e-smith specific Samba configuration files and templates %define name e-smith-samba Name: %{name} %define version 2.2.0 -%define release 41 +%define release 52 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -42,6 +42,11 @@ Patch29: e-smith-samba-2.2.0-force_uid_g 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 +Patch35: e-smith-samba-2.2.0-tdbbackup12.patch +Patch36: e-smith-samba-2.2.0-samba_audit.patch +Patch37: e-smith-samba-2.2.0-samba_audit_log.patch +Patch38: e-smith-samba-2.2.0-WaitForNetwork.patch Obsoletes: e-smith-netlogon BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch @@ -58,17 +63,59 @@ 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 -Requires: /usr/bin/tdbbackup +# Obsolete SerNet packages +Obsoletes: libsmbclient0 +Obsoletes: libwbclient0 +Obsoletes: samba3 +Obsoletes: samba3-cifsmount +Obsoletes: samba3-client +Obsoletes: samba3-doc +Obsoletes: samba3-utils +Obsoletes: samba3-winbind +Requires: /usr/bin/tdbbackup12 AutoReqProv: no %changelog -* Sat Mar 12 2011 Gavin Weight 2.2-0-41.sme +* Tue Feb 12 2013 Ian Wells 2.2.0-52.sme +- Add ability to configure waiting for network Win7 registry option [SME: 7332] + +* Tue Feb 12 2013 Ian Wells 2.2.0-51.sme +- Remove samba_audit specific loglotate configuration [SME: 7335] + +* Mon Jan 21 2013 Ian Wells 2.2.0-50.sme +- Enable smb auditing per ibay [SME: 6176] + +* Thu Jan 17 2013 Shad L. Lords 2.2.0-49.sme +- Update dependency to /usr/bin/tdbbackup12 [SME: 7210] + +* Sun Jan 29 2012 Ian Wells 2.2.0-48.sme +- Obsolete only SerNet samba packages [SME: 6772] + +* Sat Jan 21 2012 Ian Wells 2.2.0-47.sme +- Obsolete SerNet samba packages, again [SME: 6772] + +* 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 +* 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 +* 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 @@ -1180,6 +1227,11 @@ Configuration files and templates for th %patch30 -p1 %patch31 -p1 %patch32 -p1 +%patch34 -p1 +%patch35 -p1 +%patch36 -p1 +%patch37 -p1 +%patch38 -p1 %build mkdir -p root/etc/e-smith/tests @@ -1242,6 +1294,9 @@ then rmdir /home/netlogon || echo "Couldn't rmdir /home/netlogon" fi +# Remove logrotate configuration for samba_audit +rm -f /etc/logrotate.d/samba_audit + # Revert to canonical place for smb.conf if [ -f /etc/smb.conf ] then