--- rpms/smeserver-yum/sme7/smeserver-yum.spec	2007/12/11 23:40:36	1.5
+++ rpms/smeserver-yum/sme7/smeserver-yum.spec	2008/01/08 20:30:13	1.8
@@ -4,7 +4,7 @@ Summary: YUM, an rpm updater
 %define name smeserver-yum
 Name: %{name}
 %define version 1.2.0
-%define release 40 
+%define release 45
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -41,6 +41,12 @@ Patch27: smeserver-yum-1.2.0-restrictAva
 Patch28: smeserver-yum-1.2.0-gpgkeys.patch
 Patch29: smeserver-yum-1.2.0-FixUninitializedValue.patch
 Patch30: smeserver-yum-1.2.0-FixEnableGroups.patch
+Patch31: smeserver-yum-1.2.0-smecontribs.patch
+Patch32: smeserver-yum-1.2.0-importkeys-update.patch
+Patch33: smeserver-yum-1.2.0-check4updates.patch
+Patch34: smeserver-yum-1.2.0-yumlocal.patch 
+Patch35: smeserver-yum-1.2.0-removeSMEBaseURLs.patch
+Patch36: smeserver-yum-1.2.0-removeBaseURLs.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-formmagick
@@ -50,6 +56,7 @@ Requires: yum >= 1.0.3-1_73
 Provides: yumconf
 %if "%{?rhel}" == "5"
 Obsoletes: rpmdb-CentOS
+Obsoletes: check4updates
 Obsoletes: yum-plugin-fastestmirror
 Requires: yum-fastestmirror
 %else
@@ -63,6 +70,21 @@ AutoReqProv: no
 %name is an implementation of http://linux.duke.edu/projects/yum on SME Server
 
 %changelog
+* Mon Jan 7 2008 Stephen Noble <support@dungog.net> 1.2.0-45
+- remove BaseURL property for repos with mirrorlists [SME: 3275]
+
+* Mon Jan 7 2008 Stephen Noble <support@dungog.net> 1.2.0-44
+- safesymlink yum into local [SME: 3238]
+
+* Mon Jan 7 2008 Stephen Noble <support@dungog.net> 1.2.0-43
+- add check4updates cronjob, obsolete check4updates rpm [SME: 3250]
+
+* Mon Jan 7 2008 Stephen Noble <support@dungog.net> 1.2.0-42
+- yum-import-keys action to yum-update event [SME: 3196]
+
+* Mon  Dec 24 2007 Stephen Noble <support@dungog.net> 1.2.0-41
+- add smecontribs repo [SME: 3551]
+
 * Tue Dec 11 2007 Gavin Weight <gweight@gmail.com> 1.2.0-40
 - Remove bad mirror and add two new mirrors. [SME: 3636]
 
@@ -798,6 +820,12 @@ rm root/usr/lib/perl5/site_perl/esmith/F
 %patch28 -p1
 %patch29 -p1
 %patch30 -p1
+%patch31 -p1
+%patch32 -p1
+%patch33 -p1
+%patch34 -p1
+%patch35 -p1
+%patch36 -p1
 
 %build
 perl createlinks
@@ -812,7 +840,7 @@ mkdir -p root/var/log/yum
 mkdir -p root/etc/e-smith/db/yum_{available,installed,updates}
 
 mkdir -p root/etc/yum.repos.d/
-for repo in smeaddons smedev smeos smetest smeupdates smeupdates-testing
+for repo in smeaddons smedev smeos smetest smeupdates smeupdates-testing smecontribs
 do
     cat > root/etc/yum.repos.d/mirrors-$repo <<END_OF_HERE
 http://distro.ibiblio.org/pub/linux/distributions/smeserver/releases/7/$repo/\$basearch