--- rpms/smeserver-yum/sme8/smeserver-yum.spec	2008/10/13 01:13:20	1.26
+++ rpms/smeserver-yum/sme8/smeserver-yum.spec	2009/04/10 14:46:31	1.31
@@ -1,20 +1,24 @@
-# $Id: smeserver-yum.spec,v 1.25 2008/10/07 14:47:51 slords Exp $
+# $Id: smeserver-yum.spec,v 1.30 2008/11/24 16:16:18 slords Exp $
 
 %define name smeserver-yum
-Summary: YUM, an rpm updaterdefine name smeserver-yum
+Summary: YUM, an rpm updater
 Name: %{name}
 %define version 2.2.0
-%define release 2
+%define release 6
 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
 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 +29,7 @@ Obsoletes: rpmdb-CentOS
 Obsoletes: yum-plugin-fastestmirror
 Obsoletes: yum-plugin-installonlyn
 Requires: yum-fastestmirror
+Requries: mailx
 BuildRequires: e-smith-devtools >= 1.13.1-03
 Conflicts: centos-yumconf
 AutoReqProv: no
@@ -32,6 +37,19 @@ AutoReqProv: no
 %name is an implementation of http://linux.duke.edu/projects/yum on SME Server
 
 %changelog
+* 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 +814,9 @@ AutoReqProv: no
 %prep
 %setup
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 perl createlinks
@@ -812,7 +833,7 @@ mkdir -p root/etc/e-smith/db/yum_{availa
 # TODO: Remove testing when released
 ver=testing/8
 
-mkdir -p root/etc/yum.repos.d/
+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