--- rpms/smeserver-yum/sme7/smeserver-yum.spec	2009/04/10 14:46:31	1.32
+++ rpms/smeserver-yum/sme7/smeserver-yum.spec	2012/08/31 20:08:13	1.43
@@ -1,10 +1,10 @@
-# $Id: smeserver-yum.spec,v 1.31 2008/11/24 16:16:18 slords Exp $
+# $Id: smeserver-yum.spec,v 1.42 2012/03/22 22:48:36 slords Exp $
 
 %define name smeserver-yum
 Summary: YUM, an rpm updater
 Name: %{name}
 %define version 2.0.0
-%define release 6
+%define release 17
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -15,6 +15,14 @@ Patch2: smeserver-yum-2.0.0-repodir.patc
 Patch3: smeserver-yum-2.0.0-buffer.patch
 Patch4: smeserver-yum-2.0.0-yumremove.patch
 Patch5: smeserver-yum-2.0.0-protected.patch
+Patch6: smeserver-yum-2.0.0-mirrorlist.patch
+Patch7: smeserver-yum-2.0.0-updatetoggle.patch
+Patch8: smeserver-yum-2.0.0-nosemi.patch
+Patch9: smeserver-yum-2.0.0-unsavedchanges.patch
+Patch10: smeserver-yum-2.0.0-fixremove.patch
+Patch11: smeserver-yum-2.0.0-add-wait-timer.patch
+Patch12: smeserver-yum-2.0.0-CentOS.patch
+Patch13: smeserver-yum-2.0.0-mirrorlist2.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-formmagick >= 1.4.0-12
@@ -36,6 +44,44 @@ AutoReqProv: no
 %name is an implementation of http://linux.duke.edu/projects/yum on SME Server
 
 %changelog
+* Fri Aug 31 2012 Shad L. Lords <slords@mail.com> 2.0.0-17.sme
+- Point mirrorlist to mirrorlist.contribs.org [SME: 7086]
+
+* Thu Mar 22 2012 Shad L. Lords <slords@mail.com> 2.0.0-16.sme
+- Fix removal of default MirrorList files (missed in last patch) [SME: 6873]
+
+* Thu Mar 22 2012 Shad L. Lords <slords@mail.com> 2.0.0-15.sme
+- Point BaseURL to vault only if we find MirrorList property [SME: 6873]
+- Don't adjust visible or enabled on CentOS repos
+
+* Wed Mar 21 2012 Ian Wells <esmith@wellsi.com> 2.0.0-14.sme
+- Enable CentOS repos using BaseURL pointing to the vault [SME: 6873]
+
+* Wed Mar 14 2012 Ian Wells <esmith@wellsi.com> 2.0.0-13.sme
+- Disable CentOS base and updates repos [SME: 6868]
+
+* Tue Mar 1 2011 Jonathan Martens <smeserver-contribs@snetram.nl> 2.0.0-12.sme
+- Add random wait timer for check4updates script to distribute load on ibiblio [SME: 6489]
+
+* Thu Nov 5 2009 Shad L. Lords <slords@mail.com> 2.0.0-11.sme
+- only unlink file if we created it [SME: 4169]
+
+* Tue Sep 15 2009 Shad L. Lords <slords@mail.com> 2.0.0-10.sme
+- set unsaved changes in yum event [SME: 2081]
+- move yum warming to sme yum plugin [SME: 5472]
+- ensure file exists before unlinking [SME: 4169]
+- remove semicolons from yum plugin
+
+* Tue Sep 15 2009 Shad L. Lords <slords@mail.com> 2.0.0-9.sme
+- Add frequency of updates toggle [SME: 5473]
+- remove stray file
+
+* Sat May 30 2009 Shad L. Lords <slords@mail.com> 2.0.0-8.sme
+- Add /etc/yum.smerepos.d to package [SME: 5306]
+
+* Mon May 18 2009 Shad L. Lords <slords@mail.com> 2.0.0-7.sme
+- Change SME mirrorlists to point to ibiblio [SME: 5242]
+
 * Fri Apr 10 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 2.0.0-6.sme
 - Require mailx [SME: 5131]
 
@@ -814,6 +860,14 @@ AutoReqProv: no
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
 
 %build
 perl createlinks
@@ -824,25 +878,10 @@ mkdir -p root/var/service/yum/supervise
 touch root/var/service/yum/down
 mkdir -p root/var/service/yum/log/supervise
 mkdir -p root/var/log/yum
+mkdir -p root/etc/yum.smerepos.d
 
 mkdir -p root/etc/e-smith/db/yum_{available,installed,updates}
 
-ver=7
-
-mkdir -p root/etc/yum.repos.d/ root/etc/yum.smerepos.d/
-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/$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
-
 %install
 /bin/rm -rf $RPM_BUILD_ROOT
 (cd root   ; /usr/bin/find . -depth -print | /bin/cpio -dump $RPM_BUILD_ROOT)