--- rpms/e-smith-turba/sme7/e-smith-turba.spec	2008/07/12 03:50:53	1.5
+++ rpms/e-smith-turba/sme7/e-smith-turba.spec	2008/12/06 21:35:31	1.7
@@ -1,17 +1,16 @@
-# $Id: e-smith-turba.spec,v 1.4 2008/06/26 05:10:21 slords Exp $
+# $Id: e-smith-turba.spec,v 1.6 2008/10/07 19:24:32 slords Exp $
 
 Summary: e-smith module to configure Turba 1.0
 %define name e-smith-turba
 Name: %{name}
-%define version 2.2
-%define release 3
+%define version 3.0.0
+%define release 2
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
-Patch1: e-smith-turba-2.2.1-header.patch
-Patch2: e-smith-turba-2.2-migrate_turba_contacts.patch
+Patch1: e-smith-turba-2.3.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools
 BuildArchitectures: noarch
@@ -22,6 +21,12 @@ Obsoletes: dcb-e-smith-turba
 Obsoletes: smeserver-turba-menuarray
 
 %changelog
+* Sat Dec 06 2008 John H. Bennett III <bennettj@johnbennettservices.com> 3.0.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.0.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
 
@@ -47,7 +52,6 @@ so that Turba will work properly on SME
 %setup
 
 %patch1 -p1
-%patch2 -p1
 
 %build
 for i in bootstrap-console-save post-install post-upgrade email-update