--- rpms/smeserver-yum/sme7/smeserver-yum.spec	2008/02/13 22:51:47	1.13
+++ rpms/smeserver-yum/sme7/smeserver-yum.spec	2008/04/28 19:14:50	1.18
@@ -1,8 +1,12 @@
+%if "%{?rhel}" == "5"
+%define _unpackaged_files_terminate_build 0 
+%endif
+
 %define name smeserver-yum
 Summary: YUM, an rpm updaterdefine name smeserver-yum
 Name: %{name}
 %define version 1.2.0
-%define release 50
+%define release 54
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -49,9 +53,12 @@ Patch37: smeserver-yum-1.2.0-uptodate.pa
 Patch38: smeserver-yum-1.2.0-check4updates.patch2
 Patch39: smeserver-yum-1.2.0-rmFormTitle2.patch
 Patch40: smeserver-yum-1.2.0-tags2general.patch
+Patch41: smeserver-yum-1.2.0-cleanyum.patch
+Patch42: smeserver-yum-1.2.0-deletedungog.patch
+Patch43: smeserver-yum-1.2.0-add2general.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
-Requires: e-smith-formmagick >= 1.4.0-9
+Requires: e-smith-formmagick >= 1.4.0-12
 Requires: perl(CGI::FormMagick) >= 0.91-26
 Requires: rpm-python >= 4.0.4-7x.18
 Requires: yum >= 1.0.3-1_73 
@@ -61,10 +68,12 @@ Provides: check4updates
 %if "%{?rhel}" == "5"
 Obsoletes: rpmdb-CentOS
 Obsoletes: yum-plugin-fastestmirror
+Obsoletes: yum-plugin-installonlyn
 Requires: yum-fastestmirror
 %else
 Requires: rpmdb-CentOS
 Requires: yum-plugin-fastestmirror
+Requires: yum-plugin-installonlyn
 %endif
 BuildRequires: e-smith-devtools >= 1.13.1-03
 Conflicts: centos-yumconf
@@ -73,6 +82,18 @@ AutoReqProv: no
 %name is an implementation of http://linux.duke.edu/projects/yum on SME Server
 
 %changelog
+* 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
+- Include installonlyn plugin to manage kernels [SME: 2101]
+
+* Mon Mar 31 2008 Stephen Noble <support@dungog.net> 1.2.0-52
+- Delete dungog repository, reworked [SME: 4097]
+
+* Fri Mar 14 2008 Shad L. Lords <slords@mail.com> 1.2.0-51
+- Clean up "rpm -qa" warnings in yum wrapper [SME: 4052]
+
 * Wed Feb 13 2008 Stephen Noble <support@dungog.net> 1.2.0-50
 - Remove <base> tags now in general [SME: 3914]
 
@@ -848,6 +869,9 @@ rm root/usr/lib/perl5/site_perl/esmith/F
 %patch38 -p1
 %patch39 -p1
 %patch40 -p1
+%patch41 -p1
+%patch42 -p1
+%patch43 -p1
 
 %build
 perl createlinks