--- rpms/e-smith-turba/sme7/e-smith-turba.spec	2008/06/26 05:10:21	1.4
+++ rpms/e-smith-turba/sme7/e-smith-turba.spec	2009/01/04 18:14:00	1.10
@@ -1,16 +1,17 @@
-# $Id: e-smith-turba.spec,v 1.3 2008/04/09 13:51:48 slords Exp $
+# $Id: e-smith-turba.spec,v 1.9 2009/01/04 18:06:50 snetram 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.0.0
+%define release 5
 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
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools
 BuildArchitectures: noarch
@@ -21,6 +22,24 @@ Obsoletes: dcb-e-smith-turba
 Obsoletes: smeserver-turba-menuarray
 
 %changelog
+* Sun Jan 4 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 3.0.0-5
+- Fix date in previous changelog entry [SME: 4910]
+
+* Sun Jan 4 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 3.0.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.0.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.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
+
 * Fri Jun 20 2008 John H. Bennett III <bennettj@johnbennettservices.com> 2.2-2
 - Upgrade patch for Turba 2.2.1
 
@@ -43,6 +62,7 @@ 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