--- rpms/smeserver-yum/sme8/smeserver-yum.spec	2009/09/15 16:43:50	1.38
+++ rpms/smeserver-yum/sme8/smeserver-yum.spec	2010/05/17 18:45:54	1.41
@@ -1,10 +1,18 @@
-# $Id: smeserver-yum.spec,v 1.37 2009/09/12 08:52:19 dungog Exp $
+# $Id: smeserver-yum.spec,v 1.40 2009/11/05 18:43:13 slords Exp $
 
 %define name smeserver-yum
 Summary: YUM, an rpm updater
 Name: %{name}
 %define version 2.2.0
-%define release 10
+%define release 13
+
+# 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
+
+# TODO: check mkinitrd,mdadm to see if needed
+%define centos_excludes initscripts
+
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -18,6 +26,8 @@ Patch5: smeserver-yum-2.2.0-mirrorlist.p
 Patch6: smeserver-yum-2.2.0-updatetoggle.patch
 Patch7: smeserver-yum-2.2.0-nosemi.patch
 Patch8: smeserver-yum-2.2.0-unsavedchanges.patch
+Patch9: smeserver-yum-2.2.0-import-keys.patch
+Patch10: smeserver-yum-2.2.0-fixremove.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-formmagick >= 1.4.0-12
@@ -41,6 +51,15 @@ AutoReqProv: no
 %name is an implementation of http://linux.duke.edu/projects/yum on SME Server
 
 %changelog
+* Mon May 17 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-13.sme
+- Migrate CentOS Exclude property default values to smeserver-yum [SME: 5962]
+
+* Thu Nov 5 2009 Shad L. Lords <slords@mail.com> 2.2.0-12.sme
+- only unlink file if we created it [SME: 5476]
+
+* Wed Oct 14 2009 Filipo Carletti <filippo.carletti@gmail.com> 2.2.0-11.sme
+- Import only keys not already imported [SME: 5507]
+
 * Tue Sep 15 2009 Shad L. Lords <slords@mail.com> 2.2.0-10.sme
 - set unsaved changes in yum event [SME: 5475]
 - move yum warming to sme yum plugin [SME: 5474]
@@ -841,6 +860,8 @@ AutoReqProv: no
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
+%patch10 -p1
 
 %build
 perl createlinks
@@ -855,6 +876,13 @@ mkdir -p root/etc/yum.smerepos.d
 
 mkdir -p root/etc/e-smith/db/yum_{available,installed,updates}
 
+YUM_REPOS=root/etc/e-smith/db/yum_repositories/
+for dir in base updates
+do
+    mkdir -p $YUM_REPOS/defaults/$dir
+    echo %{centos_excludes} > $YUM_REPOS/defaults/$dir/Exclude
+done
+
 %install
 /bin/rm -rf $RPM_BUILD_ROOT
 (cd root   ; /usr/bin/find . -depth -print | /bin/cpio -dump $RPM_BUILD_ROOT)