--- rpms/e-smith-ldap/sme7/e-smith-ldap.spec	2008/04/01 16:59:05	1.4
+++ rpms/e-smith-ldap/sme7/e-smith-ldap.spec	2008/10/07 18:40:10	1.10
@@ -1,20 +1,15 @@
+# $Id$
+
 Summary: e-smith server and gateway - LDAP module
 %define name e-smith-ldap
 Name: %{name}
-%define version 4.12.0
-%define release 9
+%define version 5.0.0
+%define release 1
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
-Patch0: e-smith-ldap-4.12.0-noipv6.patch
-Patch1: e-smith-ldap-4.12.0-slapd.conf.perms.patch
-Patch2: e-smith-ldap-4.12.0-success.patch
-Patch3: e-smith-ldap-4.12.0-pid_args_files.patch
-Patch4: e-smith-ldap-4.12.0-objectClass.patch
-Patch5: e-smith-ldap-4.12.0-tags2general.patch
-Patch6: e-smith-ldap-4.12.0-freebusy.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base
@@ -28,10 +23,19 @@ AutoReqProv: no
 e-smith server and gateway software - LDAP module.
 
 %changelog
+* Tue Oct 7 2008 Shad L. Lords <slords@mail.com> 5.0.0-1.sme
+- Roll new stream to separate sme7/sme8 trees [SME: 4633]
+
+* Fri Jul 25 2008 Shad L. Lords <slords@mail.com> 4.12.0-11
+- Separate template to avoid breaking schema [SME: 4171]
+
+* Sat Jul 5 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.12.0-10
+- Add common <base> tags to e-smith-formmagick's general [SME: 4279]
+
 * Tue Apr 1 2008 Shad L. Lords <slords@mail.com> 4.12.0-9
 - Add free/busy URL entry to help kronolith contribs [SME: 1806]
 
-* Wed Feb 13 2008 Stephen Noble <support@dungog.net> 1.12.0-8
+* Wed Feb 13 2008 Stephen Noble <support@dungog.net> 4.12.0-8
 - Remove <base> tags now in general [SME: 3919]
 
 * Tue Jun 26 2007 Charlie Brady <charlie_brady@mitel.com>
@@ -666,13 +670,6 @@ e-smith server and gateway software - LD
 
 %prep
 %setup
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
 
 %build
 mkdir -p root/etc/e-smith/tests