--- rpms/smeserver-support/sme8/smeserver-support.spec	2008/10/07 14:48:33	1.18
+++ rpms/smeserver-support/sme8/smeserver-support.spec	2009/08/03 17:23:28	1.26
@@ -1,10 +1,10 @@
-# $Id: smeserver-support.spec,v 1.17 2008/10/07 14:06:43 slords Exp $
+# $Id: smeserver-support.spec,v 1.25 2009/05/27 14:39:50 slords Exp $
 
 Summary: SME Server module to display support and licensing information
 %define name smeserver-support
 Name: %{name}
 %define version 2.2.0
-%define release 1
+%define release 7
 
 # 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
@@ -40,6 +40,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
@@ -68,7 +72,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
@@ -100,22 +103,27 @@ Obsoletes: e-smith-samba = 2.1.0-10gjz
 Requires: e-smith-samba
 
 # Pull in locales so we have a smooth language upgrade [SF: 1309520]
-#Requires: smeserver-locale-ca
 Requires: smeserver-locale-bg
 Requires: smeserver-locale-da
 Requires: smeserver-locale-de
 Requires: smeserver-locale-el
 Requires: smeserver-locale-es
+Requires: smeserver-locale-et
 Requires: smeserver-locale-fr
 Requires: smeserver-locale-hu
 Requires: smeserver-locale-id
 Requires: smeserver-locale-it
+Requires: smeserver-locale-ja
+Requires: smeserver-locale-nb
 Requires: smeserver-locale-nl
 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-tr
+Requires: smeserver-locale-zh_CN
 
 # These should be re-pulled by other e-smith packages.
 Obsoletes: perl-File-MMagic = 1.22-1
@@ -234,7 +242,30 @@ Conflicts: dungog-ssl
 Conflicts: dungog-deletedoublebounce
 Conflicts: dungog-mailblocking
 
+# Remove rkhunter
+Obsoletes: rkhunter <= 1.3.4-7.el5.sme
+
 %changelog
+* 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]
+
+* Tue Mar 3 2009 Shad L. Lords <slords@mail.com> 2.2.0-3.sme
+- Add support for Norwegian Bokmal (nb) [SME: 5002 ]
+- Add support for Russian (ru) [SME: 5002]
+- Add support for Chinese China (zh_CN) [SME: 5002]
+
+* Mon Oct 13 2008 Shad L. Lords <slords@mail.com> 2.2.0-2.sme
+- Add support for Japanese (ja) [SME: 4637]
+
 * 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]