--- rpms/smeserver-yum/sme7/smeserver-yum.spec 2008/01/09 22:23:28 1.9 +++ rpms/smeserver-yum/sme7/smeserver-yum.spec 2008/03/14 18:02:36 1.14 @@ -1,10 +1,8 @@ -%define _unpackaged_files_terminate_build 0 - -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 46 +%define release 51 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -48,16 +46,21 @@ Patch34: smeserver-yum-1.2.0-yumlocal.pa 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 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch -Requires: e-smith-formmagick +Requires: e-smith-formmagick >= 1.4.0-9 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: check4updates Obsoletes: yum-plugin-fastestmirror Requires: yum-fastestmirror %else @@ -71,7 +74,22 @@ AutoReqProv: no %name is an implementation of http://linux.duke.edu/projects/yum on SME Server %changelog -* Wed Jan 09 2008 Stephen Noble 1.2.0-46 +* Fri Mar 14 2008 Shad L. Lords 1.2.0-51 +- Clean up "rpm -qa" warnings in yum wrapper [SME: 4052] + +* Wed Feb 13 2008 Stephen Noble 1.2.0-50 +- Remove tags now in general [SME: 3914] + +* Sun Feb 10 2008 Stephen Noble 1.2.0-49 +- Remove duplicate entries [SME: 3889] + +* Fri Jan 11 2008 Shad L. Lords 1.2.0-48 +- Put check4updates obsoletes & provides in the right place [SME: 3250] + +* Fri Jan 11 2008 Shad L. Lords 1.2.0-47 +- Add check4update script, make cronjob run same as scheduled dirs [SME: 3250] + +* Wed Jan 09 2008 Stephen Noble 1.2.0-46 - Add server is up to date message on panel [SME: 2512] * Mon Jan 7 2008 Stephen Noble 1.2.0-45 @@ -831,6 +849,10 @@ rm root/usr/lib/perl5/site_perl/esmith/F %patch35 -p1 %patch36 -p1 %patch37 -p1 +%patch38 -p1 +%patch39 -p1 +%patch40 -p1 +%patch41 -p1 %build perl createlinks @@ -865,6 +887,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)' \