--- rpms/e-smith-samba/sme8/e-smith-samba.spec 2008/10/28 23:12:19 1.20 +++ rpms/e-smith-samba/sme8/e-smith-samba.spec 2010/09/23 15:39:18 1.39 @@ -1,16 +1,30 @@ -# $Id: e-smith-samba.spec,v 1.19 2008/10/13 21:50:37 slords Exp $ +# $Id: e-smith-samba.spec,v 1.38 2010/07/08 19:12:07 slords Exp $ Summary: e-smith specific Samba configuration files and templates %define name e-smith-samba Name: %{name} %define version 2.2.0 -%define release 3 +%define release 19 Version: %{version} Release: %{release}%{?dist} License: GPL Group: Networking/Daemons Source: %{name}-%{version}.tar.gz Patch1: e-smith-samba-2.2.0-sambaRole.patch +Patch2: e-smith-samba-2.2.0-migratefix.patch +Patch3: e-smith-samba-2.2.0-fixwarnings.patch +Patch4: e-smith-samba-2.2.0-win7samba.patch +Patch5: e-smith-samba-2.2.0-recylebin_perms.patch +Patch6: e-smith-samba-2.2.0-enable-bind-interfaces.patch +Patch7: e-smith-samba-2.2.0-profilev2.patch +Patch8: e-smith-samba-2.2.0-refactor-profilev2.patch +Patch9: e-smith-samba-2.2.0-quote-manually.patch +Patch10: e-smith-samba-2.2.0-fail-silently-on-non-existent-folder.patch +Patch11: e-smith-samba-2.2.0-tdb_backup.patch +Patch12: e-smith-samba-2.2.0-private_dir.patch +Patch13: e-smith-samba-2.2.0-backup-all-tdb-files.patch +Patch14: e-smith-samba-2.2.0-strongkey.patch +Patch15: e-smith-samba-2.2.0-slapd_support.patch Obsoletes: e-smith-netlogon BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch @@ -18,12 +32,70 @@ BuildRequires: e-smith-devtools >= 1.13. Obsoletes: e-smith-regedit Requires: e-smith-lib >= 2.2.0-2 Requires: e-smith-formmagick >= 1.4.0-9 -Requires: samba >= 3.0.25b -Requires: samba-client >= 3.0.25b -Requires: samba-common >= 3.0.25b +Requires: samba3x >= 3.3.8 +Requires: samba3x-client >= 3.3.8 +Requires: samba3x-common >= 3.3.8 +Obsoletes: samba <= 3.1.0 +Obsoletes: samba-client <= 3.1.0 +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 AutoReqProv: no %changelog +* Thu Sep 23 2010 Daniel Berteaud 2.2.0-19.sme +- Add slapd support [SME: 6228] + +* Wed Jul 08 2010 Shad L. Lords 2.2.0-18.sme +- Remove require strong key part of regedit file [SME: 6119] + +* Wed Jun 23 2010 Shad L. Lords 2.2.0-17.sme +- Use samba3x package for windows 7 compatibility [SME: 5964] + +* Mon Jun 14 2010 Federico Simoncelli 2.2.0-16.sme +- Backup all the tdb files (thanks Daniel) [SME: 5856] +- Post scriptlet fix [SME: 6057] + +* Tue Mar 30 2010 Filippo Carletti 2.2.0-15.sme +- Explicitly declare samba private dir [SME: 5857] + +* Fri Mar 26 2010 Filippo Carletti 2.2.0-14.sme +- Fix tdb file paths to backup in run script [SME: 5856] + +* Wed Mar 17 2010 Jonathan Martens 2.2.0-13.sme +- Add dependency /usr/bin/tdbbackup [SME: 5851] + +* Sat Mar 6 2010 Jonathan Martens 2.2.0-12.sme +- Add missing comma in previous patch [SME: 5821] +- Silently skip non-existent profile folder [SME: 5821] + +* Sat Mar 6 2010 Jonathan Martens 2.2.0-11.sme +- Properly quote the profile folders manually [SME: 5821] + +* Sat Mar 6 2010 Jonathan Martens 2.2.0-10.sme +- Rework V2 profile patch to fix error on user-delete event [SME: 5821] + +* Sun Feb 7 2010 Shad L. Lords 2.2.0-9.sme +- Create/remove V2 profile directories [SME: 3666] + +* Sun Jan 31 2010 Jonathan Martens 2.2.0-8.sme +- Enable bindinterfaces by default [SME: 3325] + +* Sun Jan 31 2010 Stephen Noble 2.2.0-7.sme +- Set recyle bin permissions [SME: 1734] + +* Sat Dec 26 2009 Jonathan Martens 2.2.0-6.sme +- Add registry file to server-resources to allow windows 7 to + join Samba 3.x domains [SME: 5425] + +* Tue Jun 2 2009 Shad L. Lords 2.2.0-5.sme +- Fix warnings in template expansion [SME: 5309] + +* Sun Nov 23 2008 Shad L. Lords 2.2.0-4.sme +- Fix migrate fragments for samba [SME: 4777] + * Tue Oct 28 2008 Shad L. Lords 2.2.0-3.sme - Fix oslevel fragment for server roles [SME: 4730] @@ -994,6 +1066,20 @@ Configuration files and templates for th %prep %setup %patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 +%patch15 -p1 %build mkdir -p root/etc/e-smith/tests @@ -1075,6 +1161,8 @@ then /bin/chown admin.root /etc/samba/smbpasswd fi chown -R smelog.smelog /var/log/{smbd,nmbd} +# Move back secrets.tdb to private dir +[ -f /var/lib/samba/private/secrets.tdb ] && mv -f /var/lib/samba/private/secrets.tdb /etc/samba || : %files -f %{name}-%{version}-filelist %defattr(-,root,root)