--- rpms/smeserver-yum/sme7/smeserver-yum.spec	2007/11/30 16:06:39	1.4
+++ rpms/smeserver-yum/sme7/smeserver-yum.spec	2008/02/10 12:17:48	1.12
@@ -4,7 +4,7 @@ Summary: YUM, an rpm updater
 %define name smeserver-yum
 Name: %{name}
 %define version 1.2.0
-%define release 39
+%define release 49
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -41,6 +41,15 @@ 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
+Patch37: smeserver-yum-1.2.0-uptodate.patch
+Patch38: smeserver-yum-1.2.0-check4updates.patch2
+Patch39: smeserver-yum-1.2.0-rmFormTitle2.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-formmagick
@@ -48,6 +57,8 @@ Requires: perl(CGI::FormMagick) >= 0.91-
 Requires: rpm-python >= 4.0.4-7x.18
 Requires: yum >= 1.0.3-1_73 
 Provides: yumconf
+Obsoletes: check4updates
+Provides: check4updates
 %if "%{?rhel}" == "5"
 Obsoletes: rpmdb-CentOS
 Obsoletes: yum-plugin-fastestmirror
@@ -63,6 +74,36 @@ AutoReqProv: no
 %name is an implementation of http://linux.duke.edu/projects/yum on SME Server
 
 %changelog
+* Sun Feb 10 2008 Stephen Noble <support@dungog.net> 1.2.0-49
+- Remove duplicate <base> entries [SME: 3889]
+
+* Fri Jan 11 2008 Shad L. Lords <slords@mail.com> 1.2.0-48
+- Put check4updates obsoletes & provides in the right place [SME: 3250]
+
+* Fri Jan 11 2008 Shad L. Lords <slords@mail.com> 1.2.0-47
+- Add check4update script, make cronjob run same as scheduled dirs [SME: 3250]
+
+* Wed Jan 09 2008 Stephen Noble <support@dungog.net> 1.2.0-46
+- Add server is up to date message on panel [SME: 2512]
+
+* 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]
+
 * Fri Nov 30 2007 Gavin Weight <gweight@gmail.com> 1.2.0-39
 - Change EnableGroups value to no/yes instead of 0/1. [SME: 3607]
 
@@ -795,6 +836,15 @@ 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
+%patch37 -p1
+%patch38 -p1
+%patch39 -p1
 
 %build
 perl createlinks
@@ -809,11 +859,12 @@ 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
-ftp://ftp.planetmirror.com/pub/smeserver/releases/7/$repo/\$basearch
+http://sme-mirror.voxteneo.com/releases/7/$repo/\$basearch
+http://smemirror.fullnet.co.uk/releases/7/$repo/\$basearch
 http://ftp.nluug.nl/os/Linux/distr/smeserver/releases/7/$repo/\$basearch
 http://ftp.surfnet.nl/ftp/pub/os/Linux/distr/smeserver/releases/7/$repo/\$basearch
 http://mirror.pacific.net.au/linux/smeserver/releases/7/$repo/\$basearch
@@ -828,6 +879,7 @@ done
 /sbin/e-smith/genfilelist \
     --file '/sbin/e-smith/yum_update_dbs' 'attr(0700,root,root)' \
     --file '/sbin/e-smith/yum' 'attr(0755,root,root)' \
+    --file '/sbin/e-smith/check4updates' 'attr(0755,root,root)' \
     --file '/etc/cron.daily/smeserver-yum' 'attr(0700,root,root)' \
     --file /var/service/yum/down 'attr(0644,root,root)' \
     --file /var/service/yum/run 'attr(0755,root,root)' \