--- rpms/e-smith-samba/sme8/e-smith-samba.spec 2011/12/23 21:28:16 1.68 +++ rpms/e-smith-samba/sme8/e-smith-samba.spec 2013/01/17 18:14:26 1.71 @@ -1,10 +1,10 @@ -# $Id: e-smith-samba.spec,v 1.67 2011/03/17 21:00:11 snetram Exp $ +# $Id: e-smith-samba.spec,v 1.70 2012/01/29 15:58:17 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 46 +%define release 49 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -43,6 +43,7 @@ Patch30: e-smith-samba-2.2.0-migrate_mac 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 Obsoletes: e-smith-netlogon BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch @@ -60,21 +61,27 @@ 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 +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 +* 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] @@ -1209,6 +1216,7 @@ Configuration files and templates for th %patch31 -p1 %patch32 -p1 %patch34 -p1 +%patch35 -p1 %build mkdir -p root/etc/e-smith/tests