--- rpms/e-smith-turba/sme8/e-smith-turba.spec	2008/06/26 05:10:05	1.4
+++ rpms/e-smith-turba/sme8/e-smith-turba.spec	2010/02/13 15:13:38	1.15
@@ -1,16 +1,21 @@
-# $Id: e-smith-turba.spec,v 1.3 2008/04/09 13:51:48 slords Exp $
+# $Id: e-smith-turba.spec,v 1.14 2010/02/13 15:10:05 mrjhb3 Exp $
 
 Summary: e-smith module to configure Turba 1.0
 %define name e-smith-turba
 Name: %{name}
-%define version 2.2
-%define release 2
+%define version 3.2.0
+%define release 10
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
-Patch1: e-smith-turba-2.2.1-header.patch
+Patch1: e-smith-turba-2.3.patch
+Patch2: e-smith-turba-2.3.1.patch
+Patch3: e-smith-turba_remove_sql_schema.patch
+Patch4: e-smith-turba-2.3.2.patch
+Patch5: e-smith-turba-2.3.3.patch
+Patch6: e-smith-turba-3.2.0-ldap_scope.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools
 BuildArchitectures: noarch
@@ -21,6 +26,40 @@ Obsoletes: dcb-e-smith-turba
 Obsoletes: smeserver-turba-menuarray
 
 %changelog
+* Sat Feb 13 2010 John H. Bennett III <bennettj@johnbennettservices.com> 3.2.0-10
+- Update LDAP for changed scope [SME: 2939]
+
+* Sat Feb 13 2010 John H. Bennett III <bennettj@johnbennettservices.com> 3.2.0-9
+- Updated template files to reflect changes in Turba 2.3.3 [SME: 5778]
+- Remove previous patch.  Will add new partial patch for bug 2939
+
+* Sat Feb 13 2010 Stephen Noble <support@dungog.net> 3.2.0-8
+- Update LDAP for changed schema [SME: 2939]
+
+* Tue Oct 13 2009 John H. Bennett III <bennettj@johnbennettservices.com> 3.2.0-7   
+- Updated template files to reflect changes in Turba 2.3.2 [SME: 5512]
+
+* Wed Apr 8 2009 John H. Bennett III <bennettj@johnbennettservices.com> 3.2.0-6
+- Remove redundant 49turba_migrate_contacts template fragments [SME: 5148]
+
+* Sun Jan 4 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 3.2.0-5
+- Fix date in previous changelog entry [SME: 4910]
+
+* Sun Jan 4 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 3.2.0-4
+- Fix turba.sql patch to prevent creating a .orig file [SME: 4910]
+
+* Fri Jan 2 2009 John H. Bennett III <bennettj@johnbennettservices.com> 3.2.0-3       
+- Updated template files to reflect changes in Turba 2.3.1
+
+* Sat Dec 06 2008 John H. Bennett III <bennettj@johnbennettservices.com> 3.2.0-2       
+- Updated template files to reflect changes in Turba 2.3 [SME: 4833]
+
+* Tue Oct 7 2008 Shad L. Lords <slords@mail.com> 3.2.0-1.sme
+- Roll new stream to separate sme7/sme8 trees [SME: 4633]
+
+* Fri Jul 11 2008 John H. Bennett III <bennettj@johnbennettservices.com> 2.2-3
+- Patch to fix 49turba_migrate_contacts to not run on post-install
+
 * Fri Jun 20 2008 John H. Bennett III <bennettj@johnbennettservices.com> 2.2-2
 - Upgrade patch for Turba 2.2.1
 
@@ -43,6 +82,11 @@ so that Turba will work properly on SME
 %setup
 
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 for i in bootstrap-console-save post-install post-upgrade email-update