--- rpms/smeserver-yum/sme7/smeserver-yum.spec	2008/07/04 21:59:40	1.19
+++ rpms/smeserver-yum/sme7/smeserver-yum.spec	2008/10/07 14:06:41	1.24
@@ -6,7 +6,7 @@
 Summary: YUM, an rpm updaterdefine name smeserver-yum
 Name: %{name}
 %define version 1.2.0
-%define release 55
+%define release 58
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -56,9 +56,12 @@ Patch40: smeserver-yum-1.2.0-tags2genera
 Patch41: smeserver-yum-1.2.0-cleanyum.patch
 Patch42: smeserver-yum-1.2.0-deletedungog.patch
 Patch43: smeserver-yum-1.2.0-add2general.patch
+Patch44: smeserver-yum-1.2.0-crontab.patch
+Patch45: smeserver-yum-1.2.0-smeextras.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-formmagick >= 1.4.0-12
+Requires: e-smith-base
 Requires: perl(CGI::FormMagick) >= 0.91-26
 Requires: rpm-python >= 4.0.4-7x.18
 Requires: yum >= 1.0.3-1_73 
@@ -82,11 +85,19 @@ AutoReqProv: no
 %name is an implementation of http://linux.duke.edu/projects/yum on SME Server
 
 %changelog
-* Fri Jul 4 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.2.0-55
+* Tue Oct 7 2008 Shad L. Lords <slords@mail.com> 1.2.0-58
+- Fix mirrorlist for sme8 [SME: 4508]
+
+* Fri Sep 19 2008 Shad L. Lords <slords@mail.com> 1.2.0-57
+- Add smeextras repo database and information [SME: 4585]
+
+* Sun Aug 10 2008 Shad L. Lords <slords@mail.com> 1.2.0-56
+- Remove links to crontab in bootstrap-console-save [SME: 4494]
+
+* Sat Jul 5 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.2.0-55
 - Add common <base> tags to e-smith-formmagick's general [SME: 4279]
 
-* Sun Apr 27 2008 Jonathan Martens 
-<smeserver-contribs@snetram.nl> 1.2.0-54
+* Sun Apr 27 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.2.0-54
 - Add common <base> tags to e-smith-formmagick's general [SME: 4290]
 
 * Mon Mar 31 2008 Shad L. Lords <slords@mail.com> 1.2.0-53
@@ -876,6 +887,8 @@ rm root/usr/lib/perl5/site_perl/esmith/F
 %patch41 -p1
 %patch42 -p1
 %patch43 -p1
+%patch44 -p1
+%patch45 -p1
 
 %build
 perl createlinks
@@ -889,16 +902,23 @@ mkdir -p root/var/log/yum
 
 mkdir -p root/etc/e-smith/db/yum_{available,installed,updates}
 
+%if "%{?rhel}" == "5"
+# TODO: Remove testing when released
+ver=testing/8
+%else
+ver=7
+%endif
+
 mkdir -p root/etc/yum.repos.d/
-for repo in smeaddons smedev smeos smetest smeupdates smeupdates-testing smecontribs
+for repo in smeaddons smecontribs smedev smeextras smeos smetest smeupdates smeupdates-testing
 do
     cat > root/etc/yum.repos.d/mirrors-$repo <<END_OF_HERE
-http://distro.ibiblio.org/pub/linux/distributions/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
+http://distro.ibiblio.org/pub/linux/distributions/smeserver/releases/$ver/$repo/\$basearch
+http://sme-mirror.voxteneo.com/releases/$ver/$repo/\$basearch
+http://smemirror.fullnet.co.uk/releases/$ver/$repo/\$basearch
+http://ftp.nluug.nl/os/Linux/distr/smeserver/releases/$ver/$repo/\$basearch
+http://ftp.surfnet.nl/ftp/pub/os/Linux/distr/smeserver/releases/$ver/$repo/\$basearch
+http://mirror.pacific.net.au/linux/smeserver/releases/$ver/$repo/\$basearch
 END_OF_HERE
 
 done