--- rpms/smeserver-kronolith/contribs7/smeserver-kronolith.spec	2010/05/13 03:08:37	1.13
+++ 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.12 2010/01/22 03:08:33 mrjhb3 Exp $
+# $Id: smeserver-kronolith.spec,v 1.13 2010/05/13 03:08:37 mrjhb3 Exp $
 # Authority: mrjhb3
 # Name: John H. Bennett III
 
@@ -6,7 +6,7 @@ Summary: SME Server specific Kronolith c
 %define name smeserver-kronolith
 Name: %{name}
 %define version 2.2
-%define release 10
+%define release 11
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -18,12 +18,8 @@ Patch3: smeserver-kronolith_reminders_ag
 Patch4: kronolith-2.3.2.patch
 Patch5: kronolith-2.3.3.patch
 Patch6: smeserver-kronolith_reminders_agendas_owner.patch
-Patch7: smeserver-kronolith_fburl.patch
-Patch8: smeserver-kronolith_remove_freebusy_db.patch
-Patch9: smeserver-kronolith_remove_calFBURL.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
-Requires: imp-h3 >= 4.3.7
 Requires: e-smith-base >= 4.15.1
 Requires: e-smith-apache >= 1.1.0-18
 Requires: e-smith-lib >= 1.15.1-16
@@ -42,6 +38,10 @@ 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
 
@@ -97,9 +97,6 @@ so that Kronolith will work properly on
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
 
 %build
 perl createlinks
@@ -114,21 +111,10 @@ echo "%doc COPYING"          >> %{name}-
 rm -rf $RPM_BUILD_ROOT
 
 %preun
-if [ $1 = 0 ] ; then
-   /etc/e-smith/events/actions/ldap-delete-fburl ldap-update
-fi
 
 %post
-/sbin/e-smith/expand-template /etc/openldap/slapd.conf
-/etc/rc7.d/S80ldap restart
-sleep 5
-/etc/e-smith/events/actions/ldap-add-fburl ldap-update
 
 %postun
-if [ $1 = 0 ] ; then
-   /sbin/e-smith/expand-template /etc/openldap/slapd.conf
-   /etc/rc7.d/S80ldap restart
-fi
 
 %files -f %{name}-%{version}-filelist
 %defattr(-,root,root)