--- rpms/smeserver-yum/sme7/smeserver-yum.spec	2007/12/11 23:40:36	1.5
+++ rpms/smeserver-yum/sme7/smeserver-yum.spec	2008/07/22 20:47:12	1.21
@@ -1,10 +1,12 @@
-%define _unpackaged_files_terminate_build 0
+%if "%{?rhel}" == "5"
+%define _unpackaged_files_terminate_build 0 
+%endif
 
-Summary: YUM, an rpm updater
 %define name smeserver-yum
+Summary: YUM, an rpm updaterdefine name smeserver-yum
 Name: %{name}
 %define version 1.2.0
-%define release 40 
+%define release 55
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -41,20 +43,37 @@ Patch27: smeserver-yum-1.2.0-restrictAva
 Patch28: smeserver-yum-1.2.0-gpgkeys.patch
 Patch29: smeserver-yum-1.2.0-FixUninitializedValue.patch
 Patch30: smeserver-yum-1.2.0-FixEnableGroups.patch
+Patch31: smeserver-yum-1.2.0-smecontribs.patch
+Patch32: smeserver-yum-1.2.0-importkeys-update.patch
+Patch33: smeserver-yum-1.2.0-check4updates.patch
+Patch34: smeserver-yum-1.2.0-yumlocal.patch 
+Patch35: smeserver-yum-1.2.0-removeSMEBaseURLs.patch
+Patch36: smeserver-yum-1.2.0-removeBaseURLs.patch
+Patch37: smeserver-yum-1.2.0-uptodate.patch
+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
+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 
 Provides: yumconf
+Obsoletes: check4updates
+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
@@ -63,6 +82,51 @@ AutoReqProv: no
 %name is an implementation of http://linux.duke.edu/projects/yum on SME Server
 
 %changelog
+* 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
+- 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]
+
+* Sun Feb 10 2008 Stephen Noble <support@dungog.net> 1.2.0-49
+- Remove duplicate <base> entries [SME: 3889]
+
+* Fri Jan 11 2008 Shad L. Lords <slords@mail.com> 1.2.0-48
+- Put check4updates obsoletes & provides in the right place [SME: 3250]
+
+* Fri Jan 11 2008 Shad L. Lords <slords@mail.com> 1.2.0-47
+- Add check4update script, make cronjob run same as scheduled dirs [SME: 3250]
+
+* Wed Jan 09 2008 Stephen Noble <support@dungog.net> 1.2.0-46
+- Add server is up to date message on panel [SME: 2512]
+
+* Mon Jan 7 2008 Stephen Noble <support@dungog.net> 1.2.0-45
+- remove BaseURL property for repos with mirrorlists [SME: 3275]
+
+* Mon Jan 7 2008 Stephen Noble <support@dungog.net> 1.2.0-44
+- safesymlink yum into local [SME: 3238]
+
+* Mon Jan 7 2008 Stephen Noble <support@dungog.net> 1.2.0-43
+- add check4updates cronjob, obsolete check4updates rpm [SME: 3250]
+
+* Mon Jan 7 2008 Stephen Noble <support@dungog.net> 1.2.0-42
+- yum-import-keys action to yum-update event [SME: 3196]
+
+* Mon  Dec 24 2007 Stephen Noble <support@dungog.net> 1.2.0-41
+- add smecontribs repo [SME: 3551]
+
 * Tue Dec 11 2007 Gavin Weight <gweight@gmail.com> 1.2.0-40
 - Remove bad mirror and add two new mirrors. [SME: 3636]
 
@@ -798,6 +862,19 @@ rm root/usr/lib/perl5/site_perl/esmith/F
 %patch28 -p1
 %patch29 -p1
 %patch30 -p1
+%patch31 -p1
+%patch32 -p1
+%patch33 -p1
+%patch34 -p1
+%patch35 -p1
+%patch36 -p1
+%patch37 -p1
+%patch38 -p1
+%patch39 -p1
+%patch40 -p1
+%patch41 -p1
+%patch42 -p1
+%patch43 -p1
 
 %build
 perl createlinks
@@ -812,7 +889,7 @@ mkdir -p root/var/log/yum
 mkdir -p root/etc/e-smith/db/yum_{available,installed,updates}
 
 mkdir -p root/etc/yum.repos.d/
-for repo in smeaddons smedev smeos smetest smeupdates smeupdates-testing
+for repo in smeaddons smedev smeos smetest smeupdates smeupdates-testing smecontribs
 do
     cat > root/etc/yum.repos.d/mirrors-$repo <<END_OF_HERE
 http://distro.ibiblio.org/pub/linux/distributions/smeserver/releases/7/$repo/\$basearch
@@ -832,6 +909,7 @@ done
 /sbin/e-smith/genfilelist \
     --file '/sbin/e-smith/yum_update_dbs' 'attr(0700,root,root)' \
     --file '/sbin/e-smith/yum' 'attr(0755,root,root)' \
+    --file '/sbin/e-smith/check4updates' 'attr(0755,root,root)' \
     --file '/etc/cron.daily/smeserver-yum' 'attr(0700,root,root)' \
     --file /var/service/yum/down 'attr(0644,root,root)' \
     --file /var/service/yum/run 'attr(0755,root,root)' \