--- rpms/smeserver-yum/sme8/smeserver-yum.spec	2008/10/13 03:12:24	1.27
+++ rpms/smeserver-yum/sme8/smeserver-yum.spec	2009/05/18 14:16:47	1.33
@@ -1,20 +1,25 @@
-# $Id: smeserver-yum.spec,v 1.26 2008/10/13 01:13:20 slords Exp $
+# $Id: smeserver-yum.spec,v 1.32 2009/04/10 14:48:51 snetram Exp $
 
 %define name smeserver-yum
 Summary: YUM, an rpm updater
 Name: %{name}
 %define version 2.2.0
-%define release 2
+%define release 7
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: SMEServer/addon
 Source: %{name}-%{version}.tar.gz
 Patch1: smeserver-yum-2.2.0-extras.patch
+Patch2: smeserver-yum-2.2.0-repodir.patch
+Patch3: smeserver-yum-2.2.0-buffer.patch
+Patch4: smeserver-yum-2.2.0-protected.patch
+Patch5: smeserver-yum-2.0.0-mirrorlist.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-formmagick >= 1.4.0-12
 Requires: e-smith-base
+Requires: yum-protect-packages
 Requires: perl(CGI::FormMagick) >= 0.91-26
 Requires: rpm-python >= 4.0.4-7x.18
 Requires: yum >= 1.0.3-1_73 
@@ -25,6 +30,7 @@ Obsoletes: rpmdb-CentOS
 Obsoletes: yum-plugin-fastestmirror
 Obsoletes: yum-plugin-installonlyn
 Requires: yum-fastestmirror
+Requires: mailx
 BuildRequires: e-smith-devtools >= 1.13.1-03
 Conflicts: centos-yumconf
 AutoReqProv: no
@@ -32,6 +38,22 @@ AutoReqProv: no
 %name is an implementation of http://linux.duke.edu/projects/yum on SME Server
 
 %changelog
+* Mon May 18 2009 Shad L. Lords <slords@mail.com> 2.2.0-7.sme
+- Change SME mirrorlists to point to ibiblio [SME: 5242]
+
+* Fri Apr 10 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-6.sme
+- Require mailx [SME: 5131]
+
+* Mon Nov 24 2008 Shad L. Lords <slords@mail.com> 2.2.0-5.sme
+- Add yum-protect-packages support to prevent removal of 
+  needed pacakges [SME: 3133]
+
+* Tue Oct 28 2008 Shad L. Lords <slords@mail.com> 2.2.0-4.sme
+- Make yum update unbuffered for web interface [SME: 4726]
+
+* Mon Oct 13 2008 Shad L. Lords <slords@mail.com> 2.2.0-3.sme
+- Move repos to repodir to fix yum bug [SME: 3676]
+
 * Sun Oct 12 2008 Shad L. Lords <slords@mail.com> 2.2.0-2.sme
 - Fix name for smeextras [SME: 4585]
 
@@ -796,6 +818,10 @@ AutoReqProv: no
 %prep
 %setup
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 perl createlinks
@@ -809,23 +835,6 @@ mkdir -p root/var/log/yum
 
 mkdir -p root/etc/e-smith/db/yum_{available,installed,updates}
 
-# TODO: Remove testing when released
-ver=testing/8
-
-mkdir -p root/etc/yum.repos.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)