--- rpms/e-smith-ibays/sme8/e-smith-ibays.spec	2008/10/07 18:29:00	1.9
+++ rpms/e-smith-ibays/sme8/e-smith-ibays.spec	2011/12/23 22:13:36	1.19
@@ -1,15 +1,20 @@
-# $Id$
+# $Id: e-smith-ibays.spec,v 1.18 2011/10/27 09:07:36 vip-ire Exp $
 
 Summary: e-smith server and gateway - ibays module
 %define name e-smith-ibays
 Name: %{name}
 %define version 2.2.0
-%define release 1
+%define release 11
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
+Patch1: e-smith-ibays-2.2.0-maxLength.patch
+Patch2: e-smith-ibays-2.2.0-enable-cpu.patch
+Patch3: e-smith-ibays-2.2.0-better-ldap.patch
+Patch4: e-smith-ibays-2.2.0-dont_modify_primary.patch
+Patch5: e-smith-ibays-2.2.0-revert-locale-string-password-change.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base >= 4.13.15-76
@@ -25,6 +30,36 @@ AutoReqProv: no
 e-smith server and gateway software - ibays module.
 
 %changelog
+* Fri Dec 23 2011 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-11.sme
+- Fix non-translated locale in ibays panel [SME: 6718]
+
+* Thu Oct 27 2011 Daniel B. <daniel@firewall-services.com>  2.2.0-10.sme
+- Don't try to modify Primary unix/ldap account [SME:6770]
+
+* Thu Nov 4 2010 Shad L. Lords <slords@mail.com> 2.2.0-9.sme
+- All ibay account commands as system accounts in LDAP [SME: 6326]
+
+* Thu Nov 4 2010 Daniel Berteaud <daniel@firewall-services.com> 2.2.0-8.sme
+- Create ibay accounts as system accounts in LDAP [SME: 6326]
+
+* Thu Nov 4 2010 Shad L. Lords <slords@mail.com> 2.2.0-7.sme
+- Fix cpu critical patch missing ) [SME: 6330]
+
+* Wed Nov 3 2010 Shad L. Lords <slords@mail.com> 2.2.0-6.sme
+- Fix cpu critical patch missing ' [SME: 6330]
+
+* Wed Nov 3 2010 Shad L. Lords <slords@mail.com> 2.2.0-5.sme
+- Make cpu calls critical only with ldap{Auth} is enabled [SME: 6330]
+
+* Tue Nov 2 2010 Shad L. Lords <slords@mail.com> 2.2.0-4.sme
+- Always use cpu, do unix if ldap{Auth} is disabled [SME: 6326]
+
+* Mon Nov 1 2010 Shad L. Lords <slords@mail.com> 2.2.0-3.sme
+- Switch to cpu commands if ldap is master [SME: 6326]
+
+* Mon Oct 13 2008 Shad L. Lords <slords@mail.com> 2.2.0-2.sme
+- Fix maxIbayNameLength logic [SME: 4457]
+
 * Tue Oct 7 2008 Shad L. Lords <slords@mail.com> 2.2.0-1.sme
 - Roll new stream to separate sme7/sme8 trees [SME: 4633]
 
@@ -247,6 +282,11 @@ e-smith server and gateway software - ib
 
 %prep
 %setup
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %pre
 %post