--- rpms/smeserver-yum/sme8/smeserver-yum.spec	2010/05/17 18:45:54	1.41
+++ rpms/smeserver-yum/sme8/smeserver-yum.spec	2010/06/02 17:11:34	1.45
@@ -1,18 +1,10 @@
-# $Id: smeserver-yum.spec,v 1.40 2009/11/05 18:43:13 slords Exp $
+# $Id: smeserver-yum.spec,v 1.44 2010/06/02 17:10:51 slords Exp $
 
 %define name smeserver-yum
 Summary: YUM, an rpm updater
 Name: %{name}
 %define version 2.2.0
-%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
-
+%define release 16
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -28,6 +20,7 @@ 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
+Patch11: smeserver-yum-2.2.0-migratelist.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-formmagick >= 1.4.0-12
@@ -51,6 +44,17 @@ AutoReqProv: no
 %name is an implementation of http://linux.duke.edu/projects/yum on SME Server
 
 %changelog
+* Wed Jun 02 2010 Shad L. Lords <slords@mail.com> 2.2.0-16.sme
+- Fix yum database removal (missing one) [SME: 5705]
+
+* Wed Jun 02 2010 Shad L. Lords <slords@mail.com> 2.2.0-15.sme
+- Migrate MirrorList properties to sme8 repos [SME: 5705]
+- Remove BaseURL properties if migrating to sme8 repos [SME: 5949]
+- Remove yum databases and repodata if migrating to sme8 repos [SME: 5998]
+
+* Mon May 17 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-14.sme
+- Revert previous change [SME: 5962]
+
 * 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]
 
@@ -862,6 +866,7 @@ AutoReqProv: no
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 %build
 perl createlinks
@@ -876,13 +881,6 @@ 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)