--- rpms/smeserver-support/sme8/smeserver-support.spec	2009/04/29 16:42:52	1.23
+++ rpms/smeserver-support/sme8/smeserver-support.spec	2010/05/17 19:15:50	1.32
@@ -1,12 +1,12 @@
-# $Id: smeserver-support.spec,v 1.22 2009/04/29 16:40:34 bytegw Exp $
+# $Id: smeserver-support.spec,v 1.31 2010/05/17 18:45:54 snetram Exp $
 
 Summary: SME Server module to display support and licensing information
 %define name smeserver-support
 Name: %{name}
 %define version 2.2.0
-%define release 4
+%define release 13
 
-# These packages come from CentOS, but wee need to use care when 
+# 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
 # prior to taking the update
 
@@ -20,6 +20,7 @@ Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
 Source1: smeserver_logo.jpg
 Source2: smeserver_logo.gif
+Patch0: smeserver-support.bug5656.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools >= 1.7.5
 BuildArchitectures: noarch
@@ -40,6 +41,10 @@ Obsoletes: kmod-slip
 Obsoletes: kmod-slip-smp
 Obsoletes: kmod-slip-xenU
 
+# remove old kernel modules that prevent upgrades 
+Obsoletes: kernel-module-appletalk
+Obsoletes: kernel-smp-module-appletalk
+
 # Old dependencies from outdated atrpms/rpmforge packages
 Obsoletes: libghttp
 Obsoletes: perl-HTTP-GHTTP
@@ -48,9 +53,11 @@ Obsoletes: pythonabi
 
 # Remove packages no longer needed or provided in COS5
 Obsoletes: comps
+Obsoletes: fonts-xorg-base
 Obsoletes: pine
 Obsoletes: system-config-keyboard
 Obsoletes: system-config-mouse
+Obsoletes: VFlib2
 Obsoletes: xorg-x11-Mesa-libGL
 
 # remove netatalk and modules
@@ -68,7 +75,6 @@ Requires: audit-libs
 
 # New features that we want to pull in on upgrades
 Requires: smolt
-Requires: rkhunter
 Requires: screen
 Requires: smeserver-yum
 Obsoletes: yum = 1.0.3-6.0.7.x.esmith
@@ -113,11 +119,14 @@ Requires: smeserver-locale-it
 Requires: smeserver-locale-ja
 Requires: smeserver-locale-nb
 Requires: smeserver-locale-nl
+Requires: smeserver-locale-pl
 Requires: smeserver-locale-pt
 Requires: smeserver-locale-pt_BR
+Requires: smeserver-locale-ro
 Requires: smeserver-locale-ru
 Requires: smeserver-locale-sl
 Requires: smeserver-locale-sv
+Requires: smeserver-locale-th
 Requires: smeserver-locale-tr
 Requires: smeserver-locale-zh_CN
 
@@ -238,7 +247,39 @@ Conflicts: dungog-ssl
 Conflicts: dungog-deletedoublebounce
 Conflicts: dungog-mailblocking
 
+# Remove rkhunter
+Obsoletes: rkhunter <= 1.3.4-7.el5.sme
+
 %changelog
+* Mon May 17 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-13.sme
+- Reverting previous change [SME: 5962]
+
+* Mon May 17 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-12.sme
+- Migrate CentOS Exclude property default values to smeserver-yum [SME: 5962]
+
+* Wed Dec  9 2009 Charlie Brady <charlieb@budge.apana.org.au> 2.2.0-11.sme
+- Fix css validation errors. [SME: 5656]
+
+* Tue Oct 27 2009 Shad L. Lords <slords@mail.com> 2.2.0-10.sme
+- Add support for Polish (pl). [SME: 5434]
+- Add support for Thai (th). [SME: 5466]
+
+* Mon Oct 26 2009 Shad L. Lords <slords@mail.com> 2.2.0-9.sme
+- obsoletes fonts-xorg-base to prevent dragging in unneeded
+  packages [SME: 5535]
+
+* Mon Oct 26 2009 Shad L. Lords <slords@mail.com> 2.2.0-8.sme
+- add VFlib2 to obsoletes list so upgrades work [SME: 5532]
+
+* Mon Aug 03 2009 Gavin Weight <gweight@gmail.com> 2.2.0-7.sme
+- Add Obsoletes for kernel modules. [SME: 5386]
+
+* Wed May 27 2009 Shad L. Lords <slords@mail.com> 2.2.0-6.sme
+- Add support for Romanian (ro). [SME: 5268]
+
+* Wed May 13 2009 Filippo Carletti <filippo.carletti@gmail.com> 2.2.0-5
+- Obsoletes: rkhunter to remove from default install [SME: 5172]
+
 * Wed Apr 29 2009 Gavin Weight <gweight@gmail.com> 2.2.0-4.sme
 - Add support for Estonian (et). [SME: 5203]
 
@@ -853,6 +894,7 @@ SME Server module to display support and
 
 %prep
 %setup
+%patch0 -p1
 cp %{SOURCE1} root/etc/e-smith/web/common
 cp %{SOURCE2} root/etc/e-smith/web/common