--- rpms/e-smith-base+ldap/sme7/e-smith-base+ldap.spec	2008/04/03 02:22:41	1.5
+++ rpms/e-smith-base+ldap/sme7/e-smith-base+ldap.spec	2008/04/28 23:47:59	1.12
@@ -2,7 +2,7 @@ Summary: e-smith server and gateway - ba
 %define name e-smith-base+ldap
 Name: %{name}
 %define version 4.19.1
-%define release 8
+%define release 14
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -15,11 +15,17 @@ Patch4: e-smith-base-4.18.1-frames.patch
 Patch5: e-smith-base+ldap-4.19.1-convert_ldap-init-accounts_to_template.patch
 Patch6: e-smith-base+ldap-4.19.1-nss_policy-post_install-ssl_fix.patch
 Patch7: e-smith-base-4.18.1-quitconsole.patch
+Patch8: e-smith-base-4.18.1-freebusy.patch2
+Patch9: e-smith-base+ldap-4.19.1-ldap_fixes.patch
+Patch10: e-smith-base+ldap-4.19.1-import_fixes.patch
+Patch11: e-smith-base-4.18.1-dateManip.patch
+Patch12: e-smith-base-4.18.1-ethernetlist.patch
+Patch13: e-smith-base-4.18.1-add2general.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: mod_auth_external
 Requires: e-smith-lib >= 1.18.0-19
 Requires: server-manager-images, server-manager
-Requires: e-smith-formmagick >= 1.4.0-9
+Requires: e-smith-formmagick >= 1.4.0-12
 Requires: initscripts >= 6.67-1es17
 Requires: e-smith-daemontools >= 1.7.1-04
 Requires: perl(Locale::gettext)
@@ -71,6 +77,31 @@ AutoReqProv: no
 e-smith server and gateway software - base module.
 
 %changelog
+* Mon Apr 28 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.19.1-14
+- Add common <base> tags to e-smith-formmagick's general [SME: 4279]
+
+* Wed Apr 23 2008 Shad L. Lords <slords@mail.com> 4.19.1-13
+- Fix for > 5 nics detected [SME: 4232]
+
+* Tue Apr 22 2008 Shad L. Lords <slords@mail.com> 4.19.1-12
+- Remove use of Date::Manip from ssl.crt [SME: 3155]
+
+* Tue Apr 22 2008 Daniel B. <daniel@firewall-services.com> 4.19.1-11
+- Import samba information in ldap (for users)
+- Import samba machine accounts
+
+* Tue Apr 22 2008 Daniel B. <daniel@firewall-services.com> 4.19.1-10
+- Updated samba.schema (necessary for substr search on sambaSID)
+- configured salpd to use md5crypt as hash
+- configure ldap.conf to use exop as hash (negociated with ldap server => md5crypt)
+- ACL for sambaLMPassword and sambaNTPassword
+- Allow unix account lookup in ou=Computers (for machine accounts)
+- Remove warnings in ldap.conf template
+
+* Sat Apr 19 2008 Shad L. Lords <slords@mail.com> 4.19.1-9
+- Fix FreeBusy param when disabled [SME: 1806]
+- Remove .orig file [SME: 4228]
+
 * Wed Apr 2 2008 Shad L. Lords <slords@mail.com> 4.19.1-8
 - Remove quitConsole from menu [SME: 4154]
 
@@ -1108,6 +1139,12 @@ e-smith server and gateway software - ba
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
 
 %pre
 if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ]