--- rpms/e-smith-ldap/sme8/e-smith-ldap.spec	2007/06/26 18:35:58	1.2
+++ rpms/e-smith-ldap/sme8/e-smith-ldap.spec	2008/07/04 21:59:39	1.5
@@ -2,7 +2,7 @@ Summary: e-smith server and gateway - LD
 %define name e-smith-ldap
 Name: %{name}
 %define version 4.12.0
-%define release 7
+%define release 10
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -13,11 +13,15 @@ Patch1: e-smith-ldap-4.12.0-slapd.conf.p
 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
+Patch7: e-smith-ldap-4.12.0-add2general.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base
 Requires: e-smith-lib >= 1.15.1-16
 Requires: openldap >= 2.0.0, perl(Net::LDAP)
+Requires: e-smith-formmagick >= 1.4.0-9
 BuildRequires: e-smith-devtools >= 1.13.1-03
 AutoReqProv: no
 
@@ -25,6 +29,16 @@ AutoReqProv: no
 e-smith server and gateway software - LDAP module.
 
 %changelog
+* Fri Jul 4 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.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
+- Remove <base> tags now in general [SME: 3919]
+
 * Tue Jun 26 2007 Charlie Brady <charlie_brady@mitel.com>
 - Fix format error in ldif template. [SME: 3107]
 
@@ -662,6 +676,9 @@ e-smith server and gateway software - LD
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
 mkdir -p root/etc/e-smith/tests