--- rpms/smeserver-kronolith/contribs7/smeserver-kronolith.spec	2008/11/25 16:20:24	1.8
+++ rpms/smeserver-kronolith/contribs7/smeserver-kronolith.spec	2010/06/28 04:16:56	1.14
@@ -1,4 +1,4 @@
-# $Id: smeserver-kronolith.spec,v 1.6 2008/06/26 18:09:38 slords Exp $
+# $Id: smeserver-kronolith.spec,v 1.13 2010/05/13 03:08:37 mrjhb3 Exp $
 # Authority: mrjhb3
 # Name: John H. Bennett III
 
@@ -6,15 +6,20 @@ Summary: SME Server specific Kronolith c
 %define name smeserver-kronolith
 Name: %{name}
 %define version 2.2
-%define release 1
+%define release 11
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
+Patch1: kronolith-2.3.patch
+Patch2: kronolith-2.3.sql.patch
+Patch3: smeserver-kronolith_reminders_agendas.patch
+Patch4: kronolith-2.3.2.patch
+Patch5: kronolith-2.3.3.patch
+Patch6: smeserver-kronolith_reminders_agendas_owner.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
-Requires: imp-h3 >= 4.2
 Requires: e-smith-base >= 4.15.1
 Requires: e-smith-apache >= 1.1.0-18
 Requires: e-smith-lib >= 1.15.1-16
@@ -33,6 +38,44 @@ Obsoletes: pear-net_url >= 1.0.14
 
 
 %changelog
+* Sun Jun 27 2010 John H. Bennett III <bennettj@johnbennettservices.com> 2.2-11
+- Remove changes for -8, -9, -10 so that rpm can be installed on SME 7.x.
+  Will re-add appropriate patches for SME8 when it is released.  [SME: 6080]
+
+* Thu Apr 22 2010 John H. Bennett III <bennettj@johnbennettservices.com> 2.2-10
+- Added removal of user's calFBURL from LDAP smeserver-kronolith is uninstalled
+
+* Thu Apr 22 2010 John H. Bennett III <bennettj@johnbennettservices.com> 2.2-9
+- Added migrate fragment to remove FreeBusy db entry from accounts since this
+  information is now saved directly to LDAP on SME8.
+
+* Thu Apr 22 2010 John H. Bennett III <bennettj@johnbennettservices.com> 2.2-8
+- Added saving of user's calFBURL to LDAP for use with SME8. [SME: 5708]
+
+* Sun Jan 24 2010 John H. Bennett III <bennettj@johnbennettservices.com> 2.2-7
+- Update to change owner of alarm and reminder cron jobs from root to www [SME: 4851]
+
+* Mon Dec 28 2009 John H. Bennett III <bennettj@johnbennettservices.com> 2.2-6
+- Updated templates to reflect Kronolith 2.3.3
+
+* Fri Oct 9 2009 John H. Bennett III <bennettj@johnbennettservices.com> 2.2-5
+- Updated templates to reflect Kronolith 2.3.2
+
+* Sun Dec 14 2008 John H. Bennett III <bennettj@johnbennettservices.com> 2.2-4
+- Patch to add more functionality to Kronolith for calendar reminders and daily agenda email
+- config setprop horde reminders enabled - default is enabled and this is set to run every 5 minutes.
+- The above sends calendar email alarms/reminders.
+- config setprop horde remindertime x - will change the frequency, value in minutes.
+- config setprop horde agendas enabled  - default is disabled set to run everyday at 5 am when enabled.
+- The above sends daily calendar agenda emails.
+- config setprop horde agenda time x - will change the frequency, value needs to be 0 - 24.
+
+* Fri Dec 05 2008 John H. Bennett III <bennettj@johnbennettservices.com> 2.2-3
+- Patch to add forgotten changes from kronolith upgrade sql script
+
+* Fri Dec 05 2008 John H. Bennett III <bennettj@johnbennettservices.com> 2.2-2
+- Updated templates to reflect Kronolith 2.3
+
 * Sun Jun 22 2008 John H. Bennett III <bennettj@johnbennettservices.com> 2.2-1
 - Initial production build
 - Jump in package name to reflect new version of kronolith
@@ -48,6 +91,13 @@ so that Kronolith will work properly on
 %prep
 %setup
 
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+
 %build
 perl createlinks
 
@@ -60,5 +110,11 @@ echo "%doc COPYING"          >> %{name}-
 %clean 
 rm -rf $RPM_BUILD_ROOT
 
+%preun
+
+%post
+
+%postun
+
 %files -f %{name}-%{version}-filelist
 %defattr(-,root,root)