--- rpms/e-smith-base+ldap/sme7/e-smith-base+ldap.spec	2008/03/31 17:41:30	1.1
+++ rpms/e-smith-base+ldap/sme7/e-smith-base+ldap.spec	2008/04/19 15:16:48	1.6
@@ -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 1
+%define release 9
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -10,6 +10,12 @@ Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
 Patch1: e-smith-base+ldap-4.19.1-ldap.patch
 Patch2: e-smith-base-4.18.1-insertmode.patch
+Patch3: e-smith-base+ldap-4.19.1-freebusy.patch
+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
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: mod_auth_external
 Requires: e-smith-lib >= 1.18.0-19
@@ -43,9 +49,9 @@ Obsoletes: e-smith-serial-console
 Obsoletes: sshell
 Obsoletes: e-smith-rp-pppoe
 Obsoletes: e-smith-base
-Provides: e-smith-base = 4.18.1-4
+Provides: e-smith-base = 4.18.1-5
 Obsoletes: e-smith-ldap
-Provides: e-smith-ldap
+Provides: e-smith-ldap = 4.12.0-9
 Requires: nss_ldap
 Requires: e-smith-samba+ldap
 Requires: cpu
@@ -66,6 +72,40 @@ AutoReqProv: no
 e-smith server and gateway software - base module.
 
 %changelog
+* 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]
+
+* Wed Apr 2 2008 Sebastien F. <sebast@firewall-services.com> 4.19.1-7
+- Really fix free/busy in usermanager [SME: 4157]
+
+* Wed Apr 2 2008 Sebastien F. <sebast@firewall-services.com> 4.19.1-6
+- Set nss "bind_policy" to "soft" to be able to access to
+  /etc/{passwd,groups,shadow} informations when ldap is down.
+- Set /etc/openldap/ldap.conf host to "localhost" and remove unnecessary
+  use of SSL. [SME: 1543].
+- Cleanly handle need of ldap directory generation after e-smith-base+ldap
+  package: add prop "generateDb" to ldap key and modify /var/service/ldap/run.
+
+* Wed Apr 2 2008 Sebastien F. <sebast@firewall-services.com> 4.19.1-5
+- Convert ldap-init-accounts action to /home/e-smith/db/ldap/ldif template
+  [SME: 3439].
+- New template is able to import after package install sme accounts from
+  /etc/{passwd,group,shadow} files to ldap directory.
+
+* Wed Apr 2 2008 Shad L. Lords <slords@mail.com> 4.19.1-4
+- Use frames in elinks [SME: 4156]
+- Set homepage for elinks [SME: 4160]
+
+* Wed Apr 2 2008 Shad L. Lords <slords@mail.com> 4.19.1-3
+- Fix free/busy field in useraccounts [SME: 4157]
+
+* Tue Apr 1 2008 Shad L. Lords <slords@mail.com> 4.19.1-2
+- Add free/busy URL entry to help kronolith contribs [SME: 1806]
+
 * Mon Mar 31 2008 Shad L. Lords <slords@mail.com> 4.19.1-1
 - Re-base off of e-smith-base-1.18.1 & e-smith-ldap-4.12.0
 - Roll to development stream numbering
@@ -1068,6 +1108,12 @@ e-smith server and gateway software - ba
 %if "%{?rhel}" == "5"
 %patch2 -p1
 %endif
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
 
 %pre
 if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ]