--- rpms/smeserver-support/sme8/smeserver-support.spec	2007/06/12 21:11:40	1.1
+++ rpms/smeserver-support/sme8/smeserver-support.spec	2008/02/13 22:51:46	1.8
@@ -2,7 +2,7 @@ Summary: SME Server module to display su
 %define name smeserver-support
 Name: %{name}
 %define version 1.6.0
-%define release 38
+%define release 45
 
 # These packages come from CentOS, but wee need to use care when 
 # updating them - either we've patched them, or we need to do something
@@ -30,6 +30,8 @@ Patch10: smeserver-support-1.6.0-initial
 Patch11: smeserver-support-1.6.0-cssStyling.patch
 Patch12: smeserver-support-1.6.0-redhat-release.patch
 Patch13: smeserver-support-1.6.0-smolt.patch
+Patch14: smeserver-support-1.6.0-supportlexicon.patch
+Patch15: smeserver-support-1.6.0-tags2general.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools >= 1.7.5
 BuildArchitectures: noarch
@@ -55,7 +57,6 @@ Obsoletes: kmod-slip-xenU
 # Old dependencies from outdated atrpms/rpmforge packages
 Obsoletes: libghttp
 Obsoletes: perl-HTTP-GHTTP
-Obsoletes: perl-Net-SSLeay
 Obsoletes: perl-Net_SSLeay.pm
 Obsoletes: pythonabi
 
@@ -65,6 +66,7 @@ Obsoletes: pine
 Obsoletes: system-config-keyboard
 Obsoletes: system-config-mouse
 Obsoletes: xorg-x11-Mesa-libGL
+Obsoletes: yum-metadata-parser
 
 # remove netatalk and modules
 Obsoletes: e-smith-netatalk
@@ -114,6 +116,7 @@ Obsoletes: yum = 1.0.3-6.0.7.x.esmith
 Requires: smeserver-clamav
 Requires: e-smith-spamassassin
 Requires: smeserver-audittools
+Requires: e-smith-formmagick >= 1.4.0-9
 
 # These packages weren't in 5.x, or were split from e-smith-base since then
 Requires: e-smith-domains
@@ -136,7 +139,6 @@ Obsoletes: kernel-module-st
 Obsoletes: e-smith-loginscript = 0.2-2
 Obsoletes: e-smith-samba = 2.1.0-10gjz
 Requires: e-smith-samba
-Requires: check4updates
 
 # Pull in locales so we have a smooth language upgrade [SF: 1309520]
 Requires: smeserver-locale-de
@@ -263,6 +265,27 @@ Conflicts: dungog-deletedoublebounce
 Conflicts: dungog-mailblocking
 
 %changelog
+* Wed Feb 13 2008 Stephen Noble <support@dungog.net> 1.6.0-45
+- Remove <base> tags now in general [SME: 3928]
+
+* Sat Feb 09 2008 Stephen Noble <support@dungog.net> 1.6.0-44
+- move support lexicon  [SME: 3878]
+
+* Fri Jan 11 2008 Shad L. Lords <slords@mail.com> 1.6.0-43
+- Revert obsoletes check4updates, should be in smeserver-yum [SME: 3250]
+
+* Fri Jan 11 2008 Stephen Noble <support@dungog.net> 1.6.0-42
+- Add Obsolete check4updates   [SME: 3250]
+
+* Mon Jan 7 2008 Gavin Weight <gweight@gmail.com> 1.6.0-41
+- Remove check4updates requires line. [SME: 3250]
+
+* Fri Sep 7 2007 Shad L. Lords <slords@mail.com> 1.6.0-40
+- Update obsoletes for sme8 [SME: 2437]
+
+* Tue Jul 3 2007 Shad L. Lords <slords@mail.com> 1.6.0-39
+- Remove yum-metadata-parser under sme8.
+
 * Wed Jun 6 2007 Shad L. Lords <slords@mail.com> 1.6.0-38
 - Add smolt service for hardware profiling.
 
@@ -841,6 +864,8 @@ cp %{SOURCE2} root/etc/e-smith/web/commo
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
+%patch15 -p1
 
 %build
 perl createlinks